changeset 4208:da30c4977c43

[gaim-migrate @ 4445] (18:14:14) faceprint: http://faceprint.com/code/gaim/fix-tabs.20030105.1729.diff <-- fixes the tabs + incoming IM focus problem, and gives the right-click menu for the tabs meaningful names committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 05 Jan 2003 23:21:50 +0000
parents bda7855fa32f
children 814023d5d0b3
files configure.ac configure.in po/bg.po po/cs.po po/da.po po/de.po po/es.po po/fi.po po/fr.po po/hu.po po/it.po po/ja.po po/ko.po po/nl.po po/pl.po po/ro.po po/ru.po po/sk.po po/sv.po po/zh_CN.po po/zh_TW.po src/conversation.c
diffstat 22 files changed, 38292 insertions(+), 24786 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Sun Jan 05 12:09:34 2003 +0000
+++ b/configure.ac	Sun Jan 05 23:21:50 2003 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.60cvs])
+AM_INIT_AUTOMAKE([gaim], [20030105-1])
 
 AC_PREREQ([2.50])
 
--- a/configure.in	Sun Jan 05 12:09:34 2003 +0000
+++ b/configure.in	Sun Jan 05 23:21:50 2003 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.60cvs])
+AM_INIT_AUTOMAKE([gaim], [20030105-1])
 
 
 
--- a/po/bg.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/bg.po	Sun Jan 05 23:21:50 2003 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.60\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\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,359 +14,532 @@
 "Content-Type: text/plain; charset=Windows-1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr ""
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr ""
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+#, fuzzy
+msgid "Auto-login"
+msgstr " "
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr ""
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr ""
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr " Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "  Gaim"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim -  - "
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr ""
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr ""
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 #, fuzzy
 msgid "Gaim Chat"
 msgstr "Gaim - "
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr ""
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 #, fuzzy
 msgid "Chat Rooms"
 msgstr ""
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr ""
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr ""
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr ""
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr ""
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr ""
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr ""
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr ""
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr ""
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 #, fuzzy
 msgid "(No"
 msgstr ""
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 #, fuzzy
 msgid "Change"
 msgstr ":"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "     %s"
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "%s ."
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "  "
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "   "
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "  "
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "  "
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "    "
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr ""
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "      "
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 #, fuzzy
 msgid "Available"
 msgstr ""
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr ""
-
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 #, fuzzy
 msgid "Invisible"
 msgstr ""
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr ""
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "     ."
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "      ."
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "   ."
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "    socket."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 msgid "Error while writing to socket."
 msgstr "    socket."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 msgid "Authentication failed."
 msgstr " ."
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "   ."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr ":"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu "
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "     socket"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "    ."
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "? ?"
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "    GG\n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "    "
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "  "
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr "  GG "
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr " Gadu-Gadu UIN"
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "  %s "
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "    "
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "  "
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr "  GG "
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr " Gadu-Gadu UIN"
+
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "      Gadu-Gadu UIN!"
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "      "
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "  Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr ""
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr ""
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr ""
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr " "
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr ""
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr ""
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr ""
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "    . !"
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "      "
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "      "
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "      "
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "     "
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "      "
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "     "
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "     socket"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "  "
 
@@ -374,799 +547,1174 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "     %s"
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr ":"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu "
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "    "
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr ""
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "  Gaim"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCC   %s "
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "  "
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s   : %s</B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "    "
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "  IRC"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "  /"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "  IRC"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "  "
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
 msgstr "   "
 
-#: src/protocols/irc/irc.c:976
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 msgid ""
-"%s has requested a DCC chat.  Would you like to establish the direct "
-"connection?"
-msgstr "%s  DCC chat.       "
-
-#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "   "
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "   %s: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "  %s: %s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr " %s"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "?IRC ?"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr ":"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC "
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr ":"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "     socket"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "     socket"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber "
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "   ."
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr " %d      "
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "   "
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 msgid "Jabber Error"
 msgstr "Jabber "
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr ":"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "??:"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 #, fuzzy
 msgid "Chats"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 #, fuzzy
 msgid "View Error Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr " away "
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "??"
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr " "
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "-"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
-msgstr "  -  .    "
-
-#: src/protocols/jabber/jabber.c:3329
+msgstr ""
+"  -  .    "
+
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim -   Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "   !"
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr " "
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 #, fuzzy
 msgid "Invalid User"
 msgstr " "
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr ""
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 #, fuzzy
 msgid "Invalid Username"
 msgstr " "
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 #, fuzzy
 msgid "Invalid Friendly Name"
 msgstr " "
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 #, fuzzy
 msgid "Not on list"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 #, fuzzy
 msgid "Not logged in"
 msgstr "%s ."
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 #, fuzzy
 msgid "Internal server error"
 msgstr " "
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 #, fuzzy
 msgid "File operation error"
 msgstr "   \n"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "   \n"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 #, fuzzy
 msgid "Server busy"
 msgstr ":"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 #, fuzzy
 msgid "Server unavailable"
 msgstr ""
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 #, fuzzy
 msgid "Database connect error"
 msgstr "   \n"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 #, fuzzy
 msgid "Error creating connection"
 msgstr "g003:     .\n"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 #, fuzzy
 msgid "Too many sessions"
 msgstr "  ."
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 #, fuzzy
 msgid "Authentication failed"
 msgstr " ."
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 #, fuzzy
 msgid "Not allowed when offline"
 msgstr "    "
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 #, fuzzy
 msgid "Unknown Error Code"
 msgstr "   ."
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim     "
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "AOL "
+
+#: src/protocols/msn/msn.c:1143
 #, 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:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "      ."
+
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1179
+#: src/protocols/msn/msn.c:1401
 msgid "You have been disconnected. You have signed on from another location."
 msgstr " .     ."
 
-#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 #, fuzzy
 msgid "Error reading from server"
 msgstr "    socket."
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "      ."
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "      ."
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "  "
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "     "
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "    AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "    :  "
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 #, fuzzy
 msgid "Unable to send password"
 msgstr "     socket"
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 #, fuzzy
 msgid "Password sent"
 msgstr ":"
 
-#: src/protocols/msn/msn.c:1752
-#, fuzzy
-msgid "Unable to write to server"
-msgstr "      ."
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "   "
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "    :  "
+
+#: src/protocols/msn/msn.c:1974
 #, fuzzy
 msgid "Synching with server"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 #, fuzzy
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 #, fuzzy
 msgid "Hidden"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+msgid "Be right back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2430
+msgid "Away from the computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2432
+msgid "On the phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2434
+msgid "Out to lunch"
+msgstr ""
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr ":"
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr " "
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr ":"
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "  :"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr " "
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr " "
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Dir service  ."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "   (rend)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "   \n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr " ."
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "      %s."
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "-   "
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "    "
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr " ,   \n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "   \n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "    AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr ": %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr ".\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "    "
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 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:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "   ."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "    ."
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "   ."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "     .  ."
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim     "
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim     "
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+msgid "Transfer timed out"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "       %s."
+
+#: src/protocols/oscar/oscar.c:1632
+msgid "File transfer aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr " %d      "
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+msgid "No reason given."
+msgstr "   ."
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Gaim -   "
+
+#: src/protocols/oscar/oscar.c:2127
 #, fuzzy, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1176,736 +1724,819 @@
 " %d       :\n"
 "\n"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-msgid "No reason given."
-msgstr "   ."
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 #, fuzzy
 msgid "ICQ authorization denied."
 msgstr "Gaim -   "
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, 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:1587
-#, c-format
-msgid "You missed %d message from %s because it was invalid."
-msgstr " %d   %s,   ."
-
-#: src/protocols/oscar/oscar.c:1588
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
-msgstr " %d    %s,   ."
-
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:2141
 #, c-format
-msgid "You missed %d message from %s because it was too large."
-msgstr " %d   %s,    ."
-
-#: src/protocols/oscar/oscar.c:1598
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
-msgstr " %d   %s,    ."
-
-#: src/protocols/oscar/oscar.c:1607
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
-msgstr " %d   %s,      ."
-
-#: src/protocols/oscar/oscar.c:1608
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
 #, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
-msgstr " %d   %s,      ."
-
-#: src/protocols/oscar/oscar.c:1617
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
-msgstr " %d   %s,     ."
-
-#: src/protocols/oscar/oscar.c:1618
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
-msgid "You missed %d messages from %s because they are too evil."
-msgstr " %d   %s,    ."
-
-#: src/protocols/oscar/oscar.c:1627
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"      ?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgstr " %d   %s,   ."
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr " %d    %s,   ."
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgstr " %d   %s,    ."
+
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
+msgstr " %d   %s,    ."
+
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgstr " %d   %s,      ."
+
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
+msgid ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr " %d   %s,      ."
+
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr " %d   %s,     ."
+
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
+msgstr " %d   %s,     ."
+
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
 msgstr " %d   %s,     ."
 
-#: src/protocols/oscar/oscar.c:1628
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr " %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1636
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr " %d   %s   ."
 
-#: src/protocols/oscar/oscar.c:1637
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr " %d   %s   ."
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2342
+#, c-format
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1707
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1736
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC  : %s\n"
 
-#: src/protocols/oscar/oscar.c:1755
-#, c-format
-msgid "Your message to %s did not get sent: %s"
-msgstr "  %s   : %s"
-
-#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "   "
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "   ."
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "  %s   : %s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "   %s : %s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "IM "
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr " "
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "AP "
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "  ICQ Server"
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ "
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr " Trillian"
 
-#: src/protocols/oscar/oscar.c:1886
+#: src/protocols/oscar/oscar.c:2655
 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 "<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\\\"> : ActiveBuddy   <br> <IMG SRC=\\\"wireless_icon.gif\\\"> :    <br>\""
-
-#: src/protocols/oscar/oscar.c:1914
-#, c-format
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 " :<B>%s</B. %s <BR>\n"
 "  :<B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>    </i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "  :"
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>  </i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "    ."
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
-msgstr "         .   10 ."
-
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "Gaim -   "
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "Gaim -   "
-
-#: src/protocols/oscar/oscar.c:2791
+msgstr ""
+"         . "
+"  10 ."
+
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "g003:     .\n"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "     %s"
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim     "
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, 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:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "     "
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4621
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
 #, 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:3586
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4642
 #, 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:3593
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3618
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4667
 #, fuzzy
 msgid "Get Status Msg"
 msgstr " away "
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr " "
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "     %s"
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "     %s"
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "  ,  %s  "
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s    "
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "  %s ."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "  ,      ."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "  %s  "
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "     %s."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "   %s -   ."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "   %s -    ."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "  ."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "   ."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "Dir service  ."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "   ."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "   ."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "  ."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "    ."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "   ."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr " : %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "   ."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "         ."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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    .    ,      ."
-
-#: src/protocols/toc/toc.c:471
+msgstr ""
+"   .  10    .  "
+"  ,      ."
+
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "   : %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr " , %d. : %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr " "
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "  ..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC    .    . "
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "   "
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 #, fuzzy
 msgid ""
 "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   PAUSE.   , TOC            . Gaim       .   ,    "
-
-#: src/protocols/toc/toc.c:1225
+msgstr ""
+"TOC   PAUSE.   , TOC    "
+"        . Gaim     "
+"  .   ,    "
+
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "    "
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "      !"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "      !"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "      !"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim -  ..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, 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:1963
+#: src/protocols/toc/toc.c:1980
 #, 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:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s     "
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "   ."
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr ":"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr " Gaim %s"
 
-#: src/about.c:135
+#: src/about.c:112
 #, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim    AOL Instant Messenger. \n"
 "     GTK+     GPL.\n"
 "\n"
 "URL: "
 
-#: src/about.c:137
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
-msgstr ""
-
-#: src/about.c:147
+#: src/about.c:122
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-msgstr ""
-" \n"
-"Rob Flynn () [ rob@marko.net ]\n"
-"Sean Egan ()      [ bj91704@binghamton.edu ]\n"
-"\n"
-"   \n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"  \n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer ( )   [ markster@marko.net ]"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr " "
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr ""
-
-#: src/aim.c:162
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr ""
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "   "
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - "
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr ":"
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr ":"
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "  Gaim"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr ""
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr ""
-
-#: src/aim.c:354
-msgid "About"
-msgstr ""
-
-#: src/aim.c:355
-msgid "Options"
-msgstr ""
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr ""
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr ""
-
-#: src/aim.c:841 src/multi.c:1481
-#, fuzzy
-msgid "Auto-login"
-msgstr " "
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - !"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr " !"
 
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr ""
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "   "
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "   "
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr " -> "
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr ""
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr ""
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr ""
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr ""
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr ""
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "  "
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 )"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[]"
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr ": %d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1916,986 +2547,926 @@
 ": %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr ":"
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s ."
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s ."
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr ""
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr " "
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr ""
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "    "
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - "
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr ""
 
-#: src/buddy.c:2667
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr ""
 
-#: src/buddy.c:2669
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr "  "
 
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr " "
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "   "
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr ""
 
-#: src/buddy.c:2678
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "  "
 
-#: src/buddy.c:2696
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "  "
+
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2706
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr ""
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr ""
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "  "
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr ""
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr " "
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr " "
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "  "
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr " "
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 #, fuzzy
 msgid "Online Help"
 msgstr ""
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 #, fuzzy
 msgid "Debug Window"
 msgstr " Debug "
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr " Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr ""
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr ""
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr " "
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "  "
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr ""
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - "
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "  "
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "   :"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr ""
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr ""
 
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr ""
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim -     "
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "-"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr ""
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s  "
 
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s   "
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s   "
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s    %s"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s   (%s)."
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s  ."
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim -  "
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr ":"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0   "
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr ""
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
-msgid "Block"
-msgstr ""
-
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr ""
 
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim -   "
-
-#: src/conversation.c:492
+#: src/buddy_chat.c:1592 src/conversation.c:2925
+msgid "Block"
+msgstr ""
+
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim -   "
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "    :  "
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "    :  "
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr "   %d,"
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "  %d\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr ""
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr ""
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr ""
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr ""
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr ""
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr ""
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr "  "
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr ""
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "  "
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr ""
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "   "
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr ""
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr "  "
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr ""
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "  "
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr ""
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "  "
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr ""
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr " "
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "  "
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "  "
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr ""
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr "  "
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "  "
-
-#: src/conversation.c:2272
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "  "
 
-#: src/conversation.c:2272
-msgid "Image"
-msgstr ""
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr ""
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr ""
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "  e"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr ""
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr "  "
-
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr ""
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
-msgstr ""
-
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr ""
-
-#: src/conversation.c:2782
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "  "
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr " :"
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim -   "
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "  "
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "  "
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "  "
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "   ..."
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "   ?"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "     %s?"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr " ?"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "   -."
 
-#: src/dialogs.c:471
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "  '%s'  .\n"
 
-#: src/dialogs.c:496
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim -   %s?"
-
-#: src/dialogs.c:509
-msgid "Remove Buddy"
-msgstr ""
-
-#: src/dialogs.c:519
-#, c-format
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr ":"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
+msgstr ""
+
+#: src/dialogs.c:804
 msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
-msgstr ""
-"  '%s'  .\n"
-"  ?"
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr ""
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim -   "
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr " :"
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr ":"
-
-#: src/dialogs.c:816
-#, fuzzy
-msgid "Account:"
-msgstr ""
-
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr ""
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr " "
-
-#: src/dialogs.c:1004
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr ""
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr " "
-
-#: src/dialogs.c:1110
-msgid "Contact"
-msgstr ""
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr ":"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr " "
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - !"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
-msgstr ""
-
-#: src/dialogs.c:1451
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr " :"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "o "
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "    "
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "    "
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr " "
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr " "
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "  -"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr " "
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "   "
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim -  "
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr " "
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr ""
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr " "
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "  "
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "    "
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "    "
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "    "
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "   "
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "  "
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "  "
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr ""
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "    "
 
-#: src/dialogs.c:1971
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr ""
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr ""
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "    "
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "  "
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "P        ."
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr ""
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr " "
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr " "
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr " "
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr ""
 
-#: src/dialogs.c:2126
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr ""
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "  "
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "  "
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr " "
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr " "
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "  ()"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "OK"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "  "
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr ""
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr ""
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim -   Email"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "  "
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr " "
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "  "
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr " :"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim -   "
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "      "
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "     "
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim -    "
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "   "
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "  "
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "  "
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "  "
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr ""
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "    "
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim -    "
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "       %s."
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "  -?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr ""
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr ""
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
-msgid "New name:"
-msgstr " :"
-
-#: src/dialogs.c:4484
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:4494
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr ""
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr " :"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim -   Perl "
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "       %s."
 
-#: src/html.c:183
+#: src/html.c:185
 #, c-format
 msgid "Received: '%s'\n"
 msgstr ": '%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003:     .\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim     "
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr ":"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr ":"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim -   "
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "  :"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr ""
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr ""
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr ":"
 
-#: src/multi.c:559
+#: src/multi.c:653
 #, fuzzy
 msgid "Alias:"
 msgstr ""
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr ":"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "  "
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr " "
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "   "
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr ""
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "   "
+
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr ""
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "  "
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim -   "
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr ""
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr ""
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr ""
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "  "
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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:987
+msgstr ""
+"      .    ,    "
+"  "
+
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "      %s?"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr ""
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim -   "
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr ""
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr "  "
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "o"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr ""
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "/"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr ""
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr " "
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr ": %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim -   "
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr ""
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -2904,533 +3475,555 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s    "
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "  "
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s "
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr "  "
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim -  "
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - "
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-msgid "Loaded Plugins"
-msgstr " "
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr ""
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr ":"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr ""
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "    "
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr ""
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "  "
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr ""
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "  "
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr ""
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "  "
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "  "
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr ""
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr " Debug "
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "  "
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr ""
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr ""
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr ""
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr ""
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr "  "
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr ""
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "  "
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "  "
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr ""
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "  "
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr " "
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr " - "
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr " "
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "   "
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr " URL  "
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "  "
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr " "
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr " "
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "   "
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr " TiK  "
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "Enter  "
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl-Enter  "
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "  "
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "Esc  "
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "Esc  "
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Ctrl-{B/I/U/S}  HTML "
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "Ctrl-()  "
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr ""
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr " // "
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr " / "
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "  "
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr " /  "
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "   "
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr ""
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "    "
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "   "
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr " - "
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 #, fuzzy
 msgid "Show buddy type _icons"
 msgstr "  "
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "   "
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "   "
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 #, fuzzy
 msgid "Grey i_dle buddies"
 msgstr "  "
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "  "
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr " :"
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr ""
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr ""
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "  "
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "  "
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "  "
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "    "
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "   "
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "    "
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr ""
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "  "
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "   "
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "   "
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr "  "
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "   "
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr " "
 
-#: src/prefs.c:505
-#, fuzzy
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "Tab -  "
 
-#: src/prefs.c:506
-#, fuzzy
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "    "
 
-#: src/prefs.c:509
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr " /    "
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "  :"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr ""
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr ""
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "-     "
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 #, fuzzy
 msgid "Show a_liases in tabs/titles"
 msgstr "   /"
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr ""
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "-     "
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "-     "
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr ""
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr " Proxy"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr " Proxy"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr " "
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Proxy "
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr ""
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr ""
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr ""
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr ""
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr ""
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr ""
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr ""
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "    "
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr ""
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr " "
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "  "
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr " HTML  "
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr " "
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "   /"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "   /"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "    /"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "  //"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "       "
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr ""
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "    "
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "  "
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr " "
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr " "
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr " "
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3439,154 +4032,225 @@
 " \n"
 "(%s  )"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "  "
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "    "
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "    "
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "  -"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "  -"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "-   "
 
-#: src/prefs.c:828
-#, fuzzy
-msgid "Idle"
-msgstr ":"
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "  -"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr " "
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "  Gaim"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "  X"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "  "
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr ""
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "  "
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim -  - "
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 msgid "Test"
 msgstr ""
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "..."
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr ""
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 #, fuzzy
 msgid "Interface"
 msgstr ":"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr ""
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "  "
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "   "
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr ""
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr ""
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "  "
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "  "
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr ""
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Gaim debug"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
-msgstr ""
-
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"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:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr " Debug "
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3594,33 +4258,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s  %s   . %s  ."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "?Gaim - ?"
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim -  "
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "? ?"
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, 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:590
+#: src/prpl.c:634
 msgid ""
 "\n"
 "\n"
@@ -3630,93 +4289,403 @@
 "\n"
 "      ?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "         ."
 
-#: src/prpl.c:670
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr "Gaim - "
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 msgid "Register"
 msgstr "??"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "  "
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d )"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 )"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr ""
 
-#: src/server.c:1101
+#: src/server.c:1163
 msgid "More Info"
 msgstr " "
 
-#: src/sound.c:63
+#: src/sound.c:68
 #, fuzzy
 msgid "Buddy logs in"
 msgstr ""
 
-#: src/sound.c:64
+#: src/sound.c:69
 #, fuzzy
 msgid "Buddy logs out"
 msgstr ""
 
-#: src/sound.c:65
+#: src/sound.c:70
 #, fuzzy
 msgid "Message received"
 msgstr "  "
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr ""
 
-#: src/sound.c:67
+#: src/sound.c:72
 #, fuzzy
 msgid "Message sent"
 msgstr ""
 
-#: src/sound.c:68
+#: src/sound.c:73
 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 "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:75
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:76
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid ""
+#~ "%s has requested a DCC chat.  Would you like to establish the direct "
+#~ "connection?"
+#~ msgstr "%s  DCC chat.       "
+
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr " %d   %s,    ."
+
+#~ 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 ""
+#~ "<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\\"
+#~ "\"> : ActiveBuddy   <br> <IMG SRC=\\\"wireless_icon.gif\\"
+#~ "\"> :    <br>\""
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Gaim -   "
+
+#~ 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-"
+#~ " .     .    ."
+
+#~ msgid ""
+#~ "Active Developers\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Crazy Patch Writers\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Retired Developers\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+#~ msgstr ""
+#~ " \n"
+#~ "Rob Flynn () [ rob@marko.net ]\n"
+#~ "Sean Egan ()      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "   \n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "  \n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer ( )   [ markster@marko.net ]"
+
+#~ msgid "Web Site"
+#~ msgstr " "
+
+#~ msgid "Password: "
+#~ msgstr ":"
+
+#~ msgid "About"
+#~ msgstr ""
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr " "
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "  "
+
+#~ msgid "List Scripts"
+#~ msgstr " "
+
+#~ msgid "Whisper"
+#~ msgstr ""
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim -   "
+
+#~ msgid "Currently at %d, "
+#~ msgstr "   %d,"
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "  %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr ""
+
+#~ msgid "Bold"
+#~ msgstr ""
+
+#~ msgid "Italics Text"
+#~ msgstr ""
+
+#~ msgid "Italics"
+#~ msgstr ""
+
+#~ msgid "Underline Text"
+#~ msgstr ""
+
+#~ msgid "Underline"
+#~ msgstr ""
+
+#~ msgid "Strike through Text"
+#~ msgstr "  "
+
+#~ msgid "Strike"
+#~ msgstr ""
+
+#~ msgid "Decrease font size"
+#~ msgstr "  "
+
+#~ msgid "Small"
+#~ msgstr ""
+
+#~ msgid "Normal font size"
+#~ msgstr "   "
+
+#~ msgid "Normal"
+#~ msgstr ""
+
+#~ msgid "Increase font size"
+#~ msgstr "  "
+
+#~ msgid "Big"
+#~ msgstr ""
+
+#~ msgid "Font"
+#~ msgstr ""
+
+#~ msgid "Text Color"
+#~ msgstr "  "
+
+#~ msgid "Background Color"
+#~ msgstr " "
+
+#~ msgid "Link"
+#~ msgstr ""
+
+#~ msgid "Insert smiley face"
+#~ msgstr "  "
+
+#~ msgid "Smiley"
+#~ msgstr "  "
+
+#~ msgid "Image"
+#~ msgstr ""
+
+#~ msgid "Sound"
+#~ msgstr ""
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "   ?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "     %s?"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim -   %s?"
+
+#~ msgid "Remove Buddy"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "  '%s'  .\n"
+#~ "  ?"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim -   "
+
+#~ msgid "IM who:"
+#~ msgstr " :"
+
+#~ msgid "User:"
+#~ msgstr ":"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr ""
+
+#~ msgid "Add Group"
+#~ msgstr " "
+
+#~ msgid "Add Buddy"
+#~ msgstr " "
+
+#~ msgid "Contact"
+#~ msgstr ""
+
+#~ msgid "Allow List"
+#~ msgstr " "
+
+#~ msgid "Block List"
+#~ msgstr " "
+
+#~ msgid "Alias Buddy"
+#~ msgstr ""
+
+#~ msgid "Rename Group"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim     "
+
+#~ msgid "Select All"
+#~ msgstr ""
+
+#~ msgid "Select Autos"
+#~ msgstr "  "
+
+#~ msgid "Select None"
+#~ msgstr "o"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "/"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim -  "
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - "
+
+#~ msgid "Loaded Plugins"
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr ""
+
+#~ msgid "Filepath:"
+#~ msgstr ":"
+
+#~ msgid "Load"
+#~ msgstr ""
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "    "
+
+#~ msgid "Configure"
+#~ msgstr ""
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "  "
+
+#~ msgid "Reload"
+#~ msgstr ""
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "  "
+
+#~ msgid "Unload"
+#~ msgstr ""
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "  "
+
+#~ msgid "Close this window"
+#~ msgstr "  "
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "  "
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr " TiK  "
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "   "
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Gaim debug"
+
+#~ 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 ""
+#~ "            "
+#~ ".  !"
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s  %s   . %s  ."
+
+#~ msgid "Accept?"
+#~ msgstr "?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Gaim-Gadu "
 
@@ -3741,18 +4710,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "    (%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "  /"
-
-#~ msgid "IRC Error"
-#~ msgstr "  IRC"
-
-#~ msgid "No such server"
-#~ msgstr "  "
-
-#~ msgid "IRC Part"
-#~ msgstr "?IRC ?"
-
 #, fuzzy
 #~ msgid "Password Change Error!"
 #~ msgstr "Gaim -   "
@@ -3768,9 +4725,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "  MSN"
 
-#~ msgid "Invalid name"
-#~ msgstr " "
-
 #~ msgid "Chat Error!"
 #~ msgstr "  -!"
 
@@ -3786,9 +4740,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr " "
 
-#~ msgid "AOL error"
-#~ msgstr "AOL "
-
 #~ msgid "Error"
 #~ msgstr ""
 
@@ -3891,15 +4842,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "   "
 
-#~ msgid "None"
-#~ msgstr " "
-
-#~ msgid "Gaim Use"
-#~ msgstr "  Gaim"
-
-#~ msgid "X Use"
-#~ msgstr "  X"
-
 #~ msgid "Opera"
 #~ msgstr "Opera"
 
@@ -3919,9 +4861,6 @@
 #~ "      !\n"
 #~ " README   ."
 
-#~ msgid "No Proxy"
-#~ msgstr " "
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -3934,12 +4873,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr " "
 
-#~ msgid "Tab Placement:"
-#~ msgstr "  :"
-
-#~ msgid "Top"
-#~ msgstr ""
-
 #~ msgid "Conversation Options"
 #~ msgstr ""
 
@@ -3955,42 +4888,18 @@
 #~ msgid "IM Options"
 #~ msgstr "?  ?"
 
-#~ msgid "Show buttons as: "
-#~ msgstr " :"
-
-#~ msgid "Pictures And Text"
-#~ msgstr "  "
-
-#~ msgid "Pictures"
-#~ msgstr ""
-
-#~ msgid "Text"
-#~ msgstr ""
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "      "
-
 #~ msgid "Window Sizes"
 #~ msgstr "  "
 
 #~ msgid "Tab Placement"
 #~ msgstr "  "
 
-#~ msgid "Left"
-#~ msgstr ""
-
-#~ msgid "Right"
-#~ msgstr ""
-
 #~ msgid "Chat Options"
 #~ msgstr ""
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "     "
 
-#~ msgid "Font Options"
-#~ msgstr ""
-
 #~ msgid "Italic Text"
 #~ msgstr " "
 
@@ -4024,11 +4933,5 @@
 #~ msgid "Conversations"
 #~ msgstr ""
 
-#~ msgid "Enable sounds"
-#~ msgstr "  "
-
 #~ msgid "KFM"
 #~ msgstr "KFM"
-
-#~ msgid "Manual"
-#~ msgstr ""
--- a/po/cs.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/cs.po	Sun Jan 05 23:21:50 2003 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\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,361 +13,534 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "Pry"
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "Zpt"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+#, fuzzy
+msgid "Auto-login"
+msgstr "Aotomatick pihlaovn"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "Odhlsit"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Zvuky"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "ty"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "Nastaven"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "O aplikaci Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Konec"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - Nastaven zvuku"
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "Kamardova ikona"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Chat s kamardem"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 #, fuzzy
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr "Zavt"
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 #, fuzzy
 msgid "Chat Rooms"
 msgstr "Monosti chatu"
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Pidat"
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Zruit"
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr ""
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr ""
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr ""
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr ""
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr ""
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr ""
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 #, fuzzy
 msgid "(No"
 msgstr "Ne"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 #, fuzzy
 msgid "Change"
 msgstr "Kanl:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "Nemu vytvoit soubor %s."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "%s prihlen."
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "IM okno"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "Okno skupinovho chatu"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "Zobrazit notifikaci"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "Zobrazit notifikaci"
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "Nemu se pipojit"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "Test"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "Zobraz vechny konverzace v jednom okn se zlokami"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Ptomen"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr "Ptomen jen pro ptele"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr "Pry"
-
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr "Pry jen pro ptele"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 msgid "Invisible"
 msgstr "Neviditeln"
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "Neviditeln jen pro ptele"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "Nedostupn"
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "Nemu rozpoznat jmno hostitele."
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "Nemu se pripojit na server."
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "Neznm odpov od serveru."
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "Chyba pri ten ze socketu."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 msgid "Error while writing to socket."
 msgstr "Chyba pri zpisu do socketu."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 msgid "Authentication failed."
 msgstr "Autentifikace nespn"
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr "Pezdvka:"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu Uivatel"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "Nemu se pipojit"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "Nemu st ze socketu"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "Nemu se pipojit."
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "tu data"
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr ""
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 #, fuzzy
 msgid "Reading server key"
 msgstr "ekm na kl od serveru"
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr ""
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "Kritick chyba v GG knihovn\n"
 
-#: src/protocols/gg/gg.c:521
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
+#, c-format
+msgid "Connect to %s failed"
+msgstr "Spojen na %s perueno"
+
+#: src/protocols/gg/gg.c:531
 #, fuzzy
 msgid "Unable to ping server"
 msgstr "Nemu se pipojit k serveru."
 
-#: src/protocols/gg/gg.c:533
+#: src/protocols/gg/gg.c:543
 #, fuzzy
 msgid "Send as message"
 msgstr "Poli jako zprvu"
 
-#: src/protocols/gg/gg.c:541
+#: src/protocols/gg/gg.c:551
 msgid "Looking up GG server"
 msgstr "Hledm GG server"
 
-#: src/protocols/gg/gg.c:544
+#: src/protocols/gg/gg.c:554
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Napseli jste nesprvn Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:570
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Spojen na %s perueno"
-
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:604
 #, 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:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "Nemu zskat vsledky vyhledvn"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Vyhledvac Stroj"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Aktivn"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "ano"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "ne"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "Jmno"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "Pjmen"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "Pezdvka"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "Rok narozen"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "Pohlav"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Msto"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Na serveru nen uloen dn Buddy List."
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Nemohl jsem importovat Buddy List ze serveru."
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy List byl spn nataen na server."
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Nemohl jsem nathnout Buddy List na server"
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Buddy List byl spn smazn ze serveru"
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Nemohl jsem smazat Buddy List ze serveru"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "Heslo bylo spn zmnno"
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Heslo nemohlo bt zmnno"
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "Nemohl jsem importovat Buddy List ze serveru."
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "Nemu otevt Pme IM spojen"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Nemu st ze socketu"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "Prohledvn seznamu"
 
@@ -375,169 +548,304 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Zmnit heslo"
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 #, fuzzy
 msgid "Import Buddy List from Server"
 msgstr "Importuj Buddy List"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 #, fuzzy
 msgid "Export Buddy List to Server"
 msgstr "Importuj Buddy List"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "Sma Buddy List ze serveru"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "Nemu st ze souboru %s."
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr "Pezdvka:"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu Uivatel"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "Zruit"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "Zamtnout"
+
+#: src/protocols/icq/gaim_icq.c:306
 #, 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:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Zskej Info"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Pout Gaim"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, fuzzy, c-format
 msgid "DCC Chat with %s closed"
 msgstr "Pm IM s %s zrueno"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "Spojen ztraceno"
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s zmnil tma na: %s</B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "ekm na kl od serveru"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "Chyba IRC"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "dn prezdvka/kanl"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "Chyba IRC"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "dn server"
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
 msgstr "Nenapseli jste prezdvku"
 
-#: src/protocols/irc/irc.c:976
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 msgid ""
-"%s has requested a DCC chat.  Would you like to establish the direct "
-"connection?"
-msgstr "%s si vydal pm chat. Chcete vytvoit pm spojen?"
-
-#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "Pipojen"
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Nemu zapisovat"
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "Byl jste vykopnut z %s: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "Vykopl Vs %s: %s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "Zskat informace o uivateli"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Opustil jste %s"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "st IRC"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Kanl:"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 #, fuzzy
 msgid "DCC Chat"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "Nemu st ze socketu"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "Nemu st ze socketu"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
-"The new password you entered is the same as your current passord.  Your "
+"The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr "Neznm"
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Pipojen"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr "Neruit"
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Chyba Jabberu"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -545,199 +853,195 @@
 "\n"
 "Pejete si pidat jeho nebo ji do Vaeho Buddy Listu?"
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "dn uivatel"
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Kontakty"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autentifikace"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "Neznm chyba pi pihlaovn"
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Heslo bylo spn zmnno"
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "Spojen ztraceno"
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Nemu se pipojit"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "Pipojen"
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "dm autentifikan metodu"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 #, fuzzy
 msgid "Connecting"
 msgstr "Spojuji"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 msgid "Jabber Error"
 msgstr "Chyba Jabberu"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "Mstnost:"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "Nemu se pipojit"
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Zobrazit LOG"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Zobrazit notifikaci"
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "Cel jmno"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "Jmno"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "Pjmen"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "Pezdvka"
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Ulice"
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 #, fuzzy
 msgid "Locality"
 msgstr "Lokalita"
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "PS"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Stt"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 #, fuzzy
 msgid "Telephone"
 msgstr "telefon"
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "Nzev organizace"
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Nzev"
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "Datum narozen"
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Popis"
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 #, fuzzy
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
@@ -746,399 +1050,603 @@
 "Vechny nsledujc daje jsou voliteln. Zadejte pouze ty informace kter "
 "chcete."
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Upravit Jaaber vizitku"
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 #, fuzzy
 msgid "Set User Info"
 msgstr "Zskat informace o uivateli"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 #, fuzzy
 msgid "Invalid User"
 msgstr "Nesprvne jmno"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr ""
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 #, fuzzy
 msgid "Invalid Username"
 msgstr "Nesprvne jmno"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 #, fuzzy
 msgid "Invalid Friendly Name"
 msgstr "Nesprvne jmno"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 #, fuzzy
 msgid "Not on list"
 msgstr "Spojen ztraceno"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 #, fuzzy
 msgid "Not logged in"
 msgstr "%s prihlen."
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 #, fuzzy
 msgid "Internal server error"
 msgstr "Vnitn chyba"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 #, fuzzy
 msgid "File operation error"
 msgstr "vnitn chyba spojen\n"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "vnitn chyba spojen\n"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 #, fuzzy
 msgid "Server busy"
 msgstr "Server:"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 #, fuzzy
 msgid "Server unavailable"
 msgstr "Nedostupn"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 #, fuzzy
 msgid "Database connect error"
 msgstr "vnitn chyba spojen\n"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 #, fuzzy
 msgid "Error creating connection"
 msgstr "g003: Chyba pi otvrn spojen.\n"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr ""
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autentifikace nespn"
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 #, fuzzy
 msgid "Not allowed when offline"
 msgstr "dn zvuky pi pihlen"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 #, fuzzy
 msgid "Unknown Error Code"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim nemohl odeslat zprvu"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "Chyba AOL"
+
+#: src/protocols/msn/msn.c:1143
 #, 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:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Nemu se pripojit na server."
+
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1179
+#: src/protocols/msn/msn.c:1401
 #, 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:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Chyba pri ten ze socketu."
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "Nemu se pripojit na server."
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "Nemu se pripojit na server."
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Akce protokolu"
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "Nemu otevt Pme IM spojen"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "Nemu se pihlsit do AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "Nemu poslat zprvu: moc velk"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Nemu st ze socketu"
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 #, fuzzy
 msgid "Password sent"
 msgstr "Heslo: "
 
-#: src/protocols/msn/msn.c:1752
-#, fuzzy
-msgid "Unable to write to server"
-msgstr "Nemu se pripojit na server."
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "Nemu zapisovat"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "Nemu poslat zprvu: moc velk"
+
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 #, fuzzy
 msgid "Busy"
 msgstr "Kamard"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 #, fuzzy
 msgid "Hidden"
 msgstr "Skryj ikonu"
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+msgid "Be right back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2430
+msgid "Away from the computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2432
+msgid "On the phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2434
+msgid "Out to lunch"
+msgstr ""
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr "Neinn:"
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "Poslat soubor"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Pjmen"
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "ID: "
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr "Nesprvne jmno"
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Ke kter skupin pripojit:"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "Nesprvne jmno"
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Nesprvne jmno"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Nedostupn"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Sluba je doasne nepstupn."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Pm IM s %s zrueno"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Pm IM s %s selhalo"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "chyba spojen (rend)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Odpojen."
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Byl jste odpojen z chatov mstnosti %s."
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Chat je momentln nedostupn"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Nemu se spojit s hostitelem"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 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:654
 msgid "internal connection error\n"
 msgstr "vnitn chyba spojen\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Nemu se pihlsit do AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Prihlsit: %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Odhlen.\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Nemu se pipojit"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 #, 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:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Nesprvne heslo alebo pezdvka."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 #, fuzzy
 msgid "Your account is currently suspended."
 msgstr "V et je momentln suspendovm"
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "Sluba je doasne nepstupn."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1148,47 +1656,88 @@
 "dle."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Verze klienta kterou pouvate je pli star. Nainstalujte si novou na"
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Autentifikace peruena"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Vnitn chyba"
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim nemohl odeslat zprvu"
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim nemohl odeslat zprvu"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Pam IM spojen s %s vytvoeno"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+msgid "Transfer timed out"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "Nemu otevt konfiguran soubor %s."
+
+#: src/protocols/oscar/oscar.c:1632
+msgid "File transfer aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr ""
+"\n"
+"\n"
+"Pejete si pidat jeho nebo ji do Vaeho Buddy Listu?"
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+#, fuzzy
+msgid "No reason given."
+msgstr "dn dvod."
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Gaim - ICQ Autorizace odepena"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1196,231 +1745,263 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-#, fuzzy
-msgid "No reason given."
-msgstr "dn dvod."
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 #, fuzzy
 msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ Autorizace odepena"
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1587
-#, 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:1588
-#, 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:1597
+#: src/protocols/oscar/oscar.c:2141
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
+#, c-format
+msgid ""
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
+#, c-format
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"Pejete si pidat jeho nebo ji do Vaeho Buddy Listu?"
+
+#: src/protocols/oscar/oscar.c:2254
 #, fuzzy, c-format
-msgid "You missed %d message from %s because it was too large."
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "Ztratil jste %d zprvu z %s protoe byla neplatn."
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "Ztratil jste %d zprv z %s protoe byly neplatn."
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
 msgstr "Ztratil jste %d zprvu z %s protoe byla pli velk."
 
-#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:2265
 #, fuzzy, c-format
-msgid "You missed %d messages from %s because they were too large."
+msgid "You missed %hu messages from %s because they were too large."
 msgstr "Ztratil jste %d zprv z %s protoe byly pli velk."
 
-#: src/protocols/oscar/oscar.c:1607
-#, 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:1608
+#: src/protocols/oscar/oscar.c:2274
 #, 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:1617
+"You missed %hu 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:2275
 #, 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:1618
+msgid ""
+"You missed %hu 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:2284
 #, 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:1627
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr "Ztratil jste %d zprvu z %s protoe byla velmi zl."
+
+#: src/protocols/oscar/oscar.c:2285
 #, fuzzy, c-format
-msgid "You missed %d message from %s because you are too evil."
+msgid "You missed %hu messages from %s because he/she was too evil."
+msgstr "Ztratil jste %d zprvu z %s protoe byla velmi zl."
+
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
 msgstr "Ztratil jste %d zprvu z %s pretoe jste velmi zl."
 
-#: src/protocols/oscar/oscar.c:1628
+#: src/protocols/oscar/oscar.c:2295
 #, fuzzy, c-format
-msgid "You missed %d messages from %s because you are too evil."
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr "Ztratil jste %d zprv z %s protoe jste velmi zl."
 
-#: src/protocols/oscar/oscar.c:1636
+#: src/protocols/oscar/oscar.c:2303
 #, fuzzy, c-format
-msgid "You missed %d message from %s for unknown reasons."
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Ztratil jste %d zprvu z %s z neznmch dvod."
 
-#: src/protocols/oscar/oscar.c:1637
+#: src/protocols/oscar/oscar.c:2304
 #, fuzzy, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Ztratil jste %d zprv z %s z neznmch dvod."
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2342
+#, c-format
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1707
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1736
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1755
-#, 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:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "Neznm chyba pi pihlaovn"
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "dn dvod."
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "Vaa zprva pro %s nebyla poslan: %s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "Informcie o uivateli %s nejsou pstupn: %s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "Kamardova ikona"
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Hlas"
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 #, fuzzy
 msgid "IM Image"
 msgstr "IM Obrzek"
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Zskat soubor"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr "Poslat soubor"
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Hry"
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "Poslat Buddy List"
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 #, fuzzy
 msgid "AP User"
 msgstr "AP Uivatel"
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1886
-#, fuzzy
+#: src/protocols/oscar/oscar.c:2655
 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 ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legenda:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Normln AIM uivatel<br><IMG SRC=\"aol_icon.gif\"> : AOL uivatel "
-"<br><IMG SRC=\"dt_icon.gif\"> : Zkuebn AIM uivatet <br><IMG SRC="
-"\"admin_icon.gif\"> : Administrtor"
-
-#: src/protocols/oscar/oscar.c:1914
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2677
 #, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "Uivatelsk jmno: <B>%s</B>  %s <BR>\n"
 "rove vstrahy : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 #, fuzzy
 msgid "<i>User has no away message</i>"
 msgstr "<i>Uivatel nem dnou 'Pry' zprvu</i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Monosti klienta"
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Neposkytnut dn informace</i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "Vae spojen me bt peruen."
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
@@ -1429,206 +2010,270 @@
 "Vae posledn zprva nebyla odeslna protoe u mte pes limit. "
 "Pokejteprosm 10 sekund a pokus opakujte."
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "Gaim - ICQ Autorizace odepena"
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "Gaim - ICQ autorizace pijata"
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "g003: Chyba pi otvrn spojen.\n"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "et"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "Nemu st ze souboru %s."
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim nemohl odeslat zprvu"
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, 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:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Vmna:"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Nemu otevt Pme IM spojen"
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4621
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
 #, 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:3586
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4642
 #, 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:3593
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3618
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4667
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Stav: %s"
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Pm IM"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Zskat Monosti"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Nemu vytvoit soubor %s."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Nemu st ze souboru %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, 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
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s nen v souastnosti pihlen."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Vstraha %s nen dovolena."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 #, 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
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat %s nen pstupn."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, 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
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Ztratil jste o zprvu od %s protoe byla pli dlouh."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Ztratil jste zprvu od %s protoe byla poslna pli rychle."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "Selhn."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr ""
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "Potebuji vce kvalifiktor."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr ""
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "Vyhladvn podle emailu je omezeno."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Ignorovan klov slovo."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "dn klov slovo."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr ""
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "Stt nen podporovn."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Neznm selhn: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "Sluba je doasne nepstupn."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "Vae rove vstrahy je pli vysok pro pihlen."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1637,305 +2282,292 @@
 "toznova. Jestli budete pokraovat v pipojovn, budete muset ekat jet "
 "dle."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Objevila se neznm chyba pi pihlaovn: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, fuzzy, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Objevila se, %d, neznma chyba. Informcie: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "Spojen ukonen"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "ekejte na odezvu..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Heslo bylo spn zmnn"
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid ""
 "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 ""
 
-#: src/protocols/toc/toc.c:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "Port"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "Nemu se spojit pro penos!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "Nemu se spojit pro penos!"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "Nemu se spojit pro penos!"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - Uloit jako..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1963
+#: src/protocols/toc/toc.c:1980
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr "Akceptovat"
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaa zprva nebyla odeslna."
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Tda:"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "Instance:"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "Pjemnce:"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "O aplikaci Gaim v%s"
 
-#: src/about.c:135
+#: src/about.c:112
 #, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim je klient podporujc protokol AOL Instant Messenger. Byl napsn \n"
 "za pouit Gtk+ a je licencovan pod GPL.\n"
 "\n"
 "URL: "
 
-#: src/about.c:137
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
+#: src/about.c:122
+#, fuzzy
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "\n"
 "\n"
 "IRC: #gaim na irc.openprojects.net"
 
-#: src/about.c:147
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-msgstr ""
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "Internetov strnka"
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr "Odhlsit"
-
-#: src/aim.c:162
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "Zavt"
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "Prosm zadejte svj logon"
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Pihlen"
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "ID: "
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr "Heslo: "
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "Konec"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr "ty"
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr "Pihlsit"
-
-#: src/aim.c:354
-#, fuzzy
-msgid "About"
-msgstr "O aplikaci Gaim"
-
-#: src/aim.c:355
-msgid "Options"
-msgstr "Volby"
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr ""
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr "Nastaven"
-
-#: src/aim.c:841 src/multi.c:1481
-#, fuzzy
-msgid "Auto-login"
-msgstr "Aotomatick pihlaovn"
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - Pry"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "Jsem Zpt!"
 
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr "Zpt"
-
-#: src/away.c:388
+#: src/away.c:353
 #, fuzzy
 msgid "New Away Message"
 msgstr "Nov 'Pry' zprva"
 
-#: src/away.c:408
+#: src/away.c:373
 #, fuzzy
 msgid "Remove Away Message"
 msgstr "Odstra 'Pry' zprvu"
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Nastav ve na 'Pry'"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Skupina"
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Info"
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "Zobrazit LOG"
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "Pejmenovat"
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "Zruit alias"
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 zprva)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[Klikni pro pravu]"
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Pihlen v: %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Vstrahy: %d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "monosti: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1946,966 +2578,894 @@
 "ID: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "Neinn:"
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s prihlen."
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s odhlen."
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Informace o vybranm kamardovi"
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 #, fuzzy
 msgid "Send Instant Message"
 msgstr "Poslat zprvu"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "Zat/Pripojit se k chatu s kamardem"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 #, fuzzy
 msgid "Activate Away Message"
 msgstr "Aktivuj 'Pry' sprvu"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - Buddy List"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Soubor"
 
-#: src/buddy.c:2667
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr "Pridat kamarda"
 
-#: src/buddy.c:2669
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr "Pripojit se k chatu"
 
-#: src/buddy.c:2671
-#, fuzzy
-msgid "New Instant Message"
-msgstr "Nov zprva"
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "Nov 'Pry' zprva"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr "Zskat informace o uivateli"
 
-#: src/buddy.c:2678
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "Importuj Buddy List"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "Skryj ikonu"
+
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "Nstroje"
 
-#: src/buddy.c:2706
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "ty"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Nastaven"
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Akce protokolu"
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "Soukrom"
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "Zobrazit systmov LOG"
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr "Nahrt skript"
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "Zruit vechny skripty"
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr "Seznam script"
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 #, fuzzy
 msgid "Online Help"
 msgstr "Pipojen"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 #, fuzzy
 msgid "Debug Window"
 msgstr "Zobraz ladc okno"
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "O aplikaci Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "Prida novho kamarda"
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "Pridat novou skupinu"
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "Vymazat vybranho kamarda/skupinu"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Editovat kamardy"
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - Buddy List"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Pripojit se k chatu"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Pipojit se k chatu jako:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr "Zruit"
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Pripojit"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Pozvat"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Kamard"
 
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 #, fuzzy
 msgid "Message"
 msgstr "Zprva"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Pozvat kamarda do chatovac mstnosti"
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Od-ignorovat"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s v mstnosti"
 
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s vstoupil do mstnosti."
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s vstoupil do mstnosti."
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je te znm jako %s"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, fuzzy, c-format
 msgid "%s left the room (%s)."
 msgstr "%s opustil mstnost (%s)."
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s opustil miestnost."
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Skupinov chaty"
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Tma:"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0 lid v mstnosti"
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr "eptat"
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Poslat"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
+#: src/buddy_chat.c:1586 src/conversation.c:2906
+msgid "Warn"
+msgstr "Varovat"
+
+#: src/buddy_chat.c:1592 src/conversation.c:2925
 msgid "Block"
 msgstr "Blokovat"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
-msgid "Warn"
-msgstr "Varovat"
-
-#: src/conversation.c:431
-#, fuzzy
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Ulo konverzaci"
-
-#: src/conversation.c:492
+#: src/conversation.c:443
 #, fuzzy
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Vlo Obrzek"
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "Nemu poslat zprvu: moc velk"
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "Nemu poslat zprvu: moc velk"
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr ""
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "Nastavuji pozici na %d\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr "Tun text"
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr "Tun"
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr "Kurzva"
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr "Kurzva"
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr "Podtren text"
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr "Podtren"
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr "Pekrtnut text"
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr "Pekrtnut"
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "Zmenit velikost psma"
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr "Mal"
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "Normlna vekost psma"
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr "Normln"
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr "Zvtit velikost psma"
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr "Velk"
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "Vybrat psmo"
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr "Psmo"
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "Barva textu"
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr "Barva"
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr "Barva pozad"
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "Uloit konverzaci"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "Vloit odkaz"
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr "Odkaz"
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr "Vloit smajlk"
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "Smajlk"
-
-#: src/conversation.c:2272
-#, fuzzy
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "Vloit IM obrzek"
 
-#: src/conversation.c:2272
-msgid "Image"
-msgstr ""
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "Zavt"
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "Volby"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "Povolit logovn"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr "Logovn"
-
-#: src/conversation.c:2289
-#, fuzzy
-msgid "Save Conversation"
-msgstr "Uloit konverzaci"
-
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr "Uloit"
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
-msgstr ""
-
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr "Zvuk"
-
-#: src/conversation.c:2782
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "Povolit zvuky"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konverzace"
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 #, fuzzy
 msgid "Send message as: "
 msgstr "Poslat zprvu jako: "
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Uloit ikonu"
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 #, fuzzy
 msgid "Disable Animation"
 msgstr "Zakzat animace"
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Povolit animace"
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Skryj ikonu"
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Uloit ikonu jako..."
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "Gaim - Varovat uivatele?"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "opravdu chcete varovat %s?"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "Varovat anonymn?"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "Anonymn varovn nejsou tak krut."
 
-#: src/dialogs.c:471
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Mau '%s' z buddy Listu.\n"
 
-#: src/dialogs.c:496
-#, fuzzy, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - Odstranit %s?"
-
-#: src/dialogs.c:509
-#, fuzzy
-msgid "Remove Buddy"
-msgstr "Pejmenovat kamarda"
-
-#: src/dialogs.c:519
-#, c-format
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "ID:"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
+msgstr "et"
+
+#: src/dialogs.c:804
 msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
-msgstr ""
-"Chystte se odstranit '%s' z Vaeho\n"
-"Buddy Listu. Opravdu to chcete udlat?"
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr "Akceptovat"
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - IM uivatel"
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr ""
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "Uivatel:"
-
-#: src/dialogs.c:816
-#, fuzzy
-msgid "Account:"
-msgstr "et"
-
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "Gaim - Zskat informace o uivateli"
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr "Pidat skupinu"
-
-#: src/dialogs.c:1004
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - Pidat skupinu"
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "Skupina"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Pidat kamarda"
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr "Pidat kamarda"
-
-#: src/dialogs.c:1110
-msgid "Contact"
-msgstr "Kontakt"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "ID: "
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Pidat k"
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Pry"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
-msgstr ""
-
-#: src/dialogs.c:1451
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Nastav soukrom pro:"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Povo vem uivatelm kontaktovat m"
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "Povol jen uvedenm uivatelm"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "Povol jen uvedenm uivatelm"
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr "Seznam povolench"
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Odmietnout vechny uivatele"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Blokovat uveden uivatele"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "Seznam blokovanch"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr ""
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "et"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Zvuk kdy se kamard pihls"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "Otevt IM okno"
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Zobrazit notifikaci"
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 #, fuzzy
 msgid "Send Message"
 msgstr "Poslat zprvu"
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr ""
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1971
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr "Uloit"
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "Zruit"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr ""
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Povolit Internetovm vyhladvam najt informace o Vs"
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Jmno"
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Prostedn jmno"
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Pjmen"
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Jmno za svobodna"
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Stt"
 
-#: src/dialogs.c:2126
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr "Uloit"
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Nov heslo nesouhlas"
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Vyplte vechny polka"
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Zmna hesla"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Star heslo"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Nov heslo"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Nov heslo (znova)"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "OK"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Nastavit informace o uivateli"
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Zde jsou vsledky Vaeho hledn: "
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Povolit"
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr "Zamtnout"
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Pidat povolen"
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Pidat zkaz"
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 #, fuzzy
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Loguj konverzaci"
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Njt kamarda"
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Najt kamarda podle informac"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Najt kamarda podle emailu"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "Vloit odkaz"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Pidat URL"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Vyberte barvu textu"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Vyberte barvu pozad"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "Vybrat psmo"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importuj Buddy List"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "Nemete vytvoit 'Pry' zprvu s przdnm nzvem"
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 #, fuzzy
 msgid "You cannot create an empty away message"
 msgstr "Nemete vytvoit przdnou 'Pry' zprvu"
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 #, fuzzy
 msgid "Gaim - New away message"
 msgstr "Gaim - Nov 'Pry' zprva"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 #, fuzzy
 msgid "New away message"
 msgstr "Nov 'Pry' zprva"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Nzev 'Pry': "
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "Uloit a Pout"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Pout"
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "Uloit a Pout"
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "smv"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr "Alias kamarda"
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias kamarda"
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "Nemu se spojit s hostitelem"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Uloit LOG"
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "Nemu otevt konfiguran soubor %s."
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Skuten vymazat LOG?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 #, fuzzy
 msgid "Conversation"
 msgstr "Konverzace"
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Vymazat"
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Pejmenovat skupinu"
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr "Pejmenovat skupinu"
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
+msgid "Gaim - Rename Buddy"
+msgstr "Gaim - Pejmenovat kamarda"
+
+#: src/dialogs.c:4445
+msgid "Rename Buddy"
+msgstr "Pejmenovat kamarda"
+
+#: src/dialogs.c:4452
 msgid "New name:"
 msgstr "Nov jmno"
 
-#: src/dialogs.c:4484
-msgid "Gaim - Rename Buddy"
-msgstr "Gaim - Pejmenovat kamarda"
-
-#: src/dialogs.c:4494
-msgid "Rename Buddy"
-msgstr "Pejmenovat kamarda"
-
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vyberte si Perlov skript"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nemu otevt konfiguran soubor %s."
 
-#: src/html.c:183
+#: src/html.c:185
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
 msgstr "Obdren: '%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Chyba pi otvrn spojen.\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim nemohl odeslat zprvu"
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "ID:"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "Protokol:"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Nahra ikonu kamarda"
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "Soubor s ikonami kamard:"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Prochzet"
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "Zruit"
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "Monosti psma"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "ID:"
 
-#: src/multi.c:559
+#: src/multi.c:653
 #, fuzzy
 msgid "Alias:"
 msgstr "Alias"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "Zapamatovat heslo"
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Aotomatick pihlaovn"
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "Upozorovn na nov zprvy"
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "Nastaven proxy"
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "Upozorovn na nov zprvy"
+
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Volby"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr ""
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Zmnit et"
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "Vlote heslo"
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Heslo:"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "Pihlsit"
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "Akce protokolu"
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2913,574 +3473,600 @@
 "Nemete se pihlsit na tento et, nemte nahran protokol, nebo protokol "
 "nem funkci pihlen"
 
-#: src/multi.c:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Jste si jisti, e chcete vymazat %s"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "Smazat"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor t"
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr "Vybrat ve"
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr "Vybrat automatick"
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "Vybrat dn"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "Zmnit"
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "Prihlsit/Odhlsit"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr "Smazat"
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "dne"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Prihlsit: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Editor t"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "Zruit"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nebyl schopn se pihlsit"
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "Chyba pi pihlaovn"
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s byl odhlen"
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 #, fuzzy
 msgid "Connection Error"
 msgstr "Chyba spojen"
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim - Seznam plugin"
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - Pluginy"
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-#, fuzzy
-msgid "Loaded Plugins"
-msgstr "Gaim - Pluginy"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr "Vybrat ve"
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr "Cesta k souboru:"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr "Nahrt"
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "Nahraj plugin ze souboru"
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr "Nastavit"
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "Nastaven zvolenho pluginu"
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr "Obnovit"
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "Obnovit zvolen plugin"
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr "Zruit"
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "Zruit zvolen plugin"
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "Zavi toto okno"
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr "Veobecn monosti"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "Zobraz ladc okno"
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "Pout tlatka bez okraj"
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "Stt"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr "Tun"
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr "Kurzva"
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr "Podtren"
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr "Pekrtnut text"
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr "Zruit"
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "Vloit smajlk"
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "Vloit smajlk"
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr "Barva"
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "Barva textu"
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "Barva pozad"
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr "Zobrazen kamard"
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "Zobraz grafick smajlky"
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "Zobraz asovou znaku u zprv"
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "Zobraz URL jako odkazy"
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "Zvrazni nesprvn napsan slovo"
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "Ignoruj barvy"
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "Ignoruj psmo"
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "Ignoruj velikost psma"
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "Ignoruj TiK automatick zprvy"
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "Enter pole zprvu"
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "Control-Enter pole zprvu"
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "IM okno"
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "Klvesa Escape zave okno"
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "Klvesa Control-W zatve okno"
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Control-{B/I/U/S} vlo HTML znaky"
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "Control-(slo) vlo smajlka"
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr "Dole"
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "Skryj tlatka IM/Informace/Chat"
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "Zobraz obrzky na tlatkch"
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "Okno Buddy Listu"
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "Ulo velikost/pozici okna"
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "Zvtit okno pi udlostech"
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr "Zobrazen skupin"
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "Skrt skupiny s dnmi online kamardy"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "Zobraz sla ve skupinch"
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr "Zobrazen kamard"
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 msgid "Show buddy type _icons"
 msgstr ""
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "Zobraz rove varovn"
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "Zobraz dobu neinnosti"
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 #, fuzzy
 msgid "Grey i_dle buddies"
 msgstr "Neinn kamard ed"
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "IM okno"
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "Zobraz tlatka jako:"
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "Obrzky"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "Text"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "Obrzky a text"
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "Vka novho okna:"
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "ka novho okna:"
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "Vka vstupnho oknka:"
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "Zvtit okno pi udlostech"
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "Schovat okno pi udlostech"
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "Kamardova ikona"
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "Skryj ikony kamard"
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "zakzat animace"
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "Zobrazuj pihlaovac jmna v okn"
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr "Zobrazit notifikaci"
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "Upozornit kamardy, e jim pete"
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "Tab dokon"
 
-#: src/prefs.c:505
-#, fuzzy
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "Tab-dokon pezdvku"
 
-#: src/prefs.c:506
-#, fuzzy
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "Tab dokon"
 
-#: src/prefs.c:509
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr "Zobraz pichzejc/odchzejc lidi v okne"
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Poloha tabulky:"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr "Nahoe"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "Dole"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr "Vlevo"
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "Vpravo"
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "Zobraz vechny chaty v jednom okn se zlokami"
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 #, fuzzy
 msgid "Show a_liases in tabs/titles"
 msgstr "Zobrazuj aliasy v zlokch/nadpisech"
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr "Chat"
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "Zobraz vechny chaty v jednom okn se zlokami"
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Zobraz vechny chaty v jednom okn se zlokami"
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr "Buddy List"
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "Typ proxy"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Typ proxy"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Bez proxy"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr "Hostitel"
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr "Uivatel"
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr "Heslo"
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "Prohle"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr "Nvod"
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr "Nastaven proxy"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "Standartn otevi nov okno"
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr "Zprvy"
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr "Nov zprva"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "Logovat vechny rozhovory"
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr "Vyma HTML z LOG"
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "Zobrazit systmov LOG"
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "Logovat kdy se kamardi pihls/odhls"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Logovat kdy se kamardi stanou neinnmi/innmi"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "Logovat kdy kamardi odejdou pry/vrt se"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Logovat vlastn pihlen/neinnosti/odchody pry"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Samostatn LOG pro kadho pipojenho kamarda"
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "Monosti zvuku"
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "dn zvuky pi pihlen"
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "Zvuky pi 'Pre'"
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr "Metody zvuku"
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "Metody zvuku"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "Vnitn chyba"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3489,160 +4075,227 @@
 "Pkaz na pehrvn zvukovch soubor\n"
 "(%s pro jmno souboru)"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "Posln zprv zru stav 'Pry'"
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "Kdy jsem 'Pry' nov zprvy zaa do fronty"
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "Ignoruj nov konverzace kdy jsem 'Pry'"
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "Neposlat aotumatickou odpov"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "Neposlat aotumatickou odpov"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "Poslat automatickou opov pouze pi neinnosti"
 
-#: src/prefs.c:828
-#, fuzzy
-msgid "Idle"
-msgstr "Neinn:"
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "Neposlat aotumatickou odpov"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr "dne"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Pout Gaim"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "Pout X"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "IM okno"
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr "Pry"
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "'Pry' zprvy"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Nastaven zvuku"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "Vyberte..."
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr "Edituj"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 #, fuzzy
 msgid "Interface"
 msgstr "Instance:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr "Psmo"
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr "Zprvy"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "IM okno"
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "Okno skupinovho chatu"
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "Prohle"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "Logovn"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr "Zvuky"
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Nzev 'Pry': "
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 #, fuzzy
 msgid "Away Messages"
 msgstr "'Pry' zprvy"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr ""
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - Nastaven"
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Gaim ladc vstupn okno"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
-msgstr ""
-
-#: src/prpl.c:71
-#, fuzzy
-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 ""
-"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."
-
-#: src/prpl.c:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "Zobraz ladc okno"
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3650,33 +4303,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s pouval %s, kter byl smazn. %s je te nepipojen."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "Akceptovat?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "GFaim - Dotaz"
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nov Pota"
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "Otevt potu"
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, 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:590
+#: src/prpl.c:634
 #, fuzzy
 msgid ""
 "\n"
@@ -3687,97 +4335,371 @@
 "\n"
 "Pejete si pidat jeho nebo ji do Vaeho Buddy Listu?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 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:670
+#: src/prpl.c:714
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrace"
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 #, fuzzy
 msgid "Register"
 msgstr "Registrovat"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Zadejte, prosm, Vae heslo"
 
-#: src/server.c:610
+#: src/server.c:648
 #, fuzzy, c-format
 msgid "(%d messages)"
 msgstr "(%d zprv)"
 
-#: src/server.c:616
+#: src/server.c:654
 #, fuzzy
 msgid "(1 message)"
 msgstr "(1 zprva)"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr "Ano"
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr "Ne"
 
-#: src/server.c:1101
+#: src/server.c:1163
 #, fuzzy
 msgid "More Info"
 msgstr "Vc informac"
 
-#: src/sound.c:63
+#: src/sound.c:68
 #, fuzzy
 msgid "Buddy logs in"
 msgstr "Kamardova ikona"
 
-#: src/sound.c:64
+#: src/sound.c:69
 #, fuzzy
 msgid "Buddy logs out"
 msgstr "Buddy List"
 
-#: src/sound.c:65
+#: src/sound.c:70
 msgid "Message received"
 msgstr ""
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr ""
 
-#: src/sound.c:67
+#: src/sound.c:72
 #, fuzzy
 msgid "Message sent"
 msgstr "Zprvy"
 
-#: src/sound.c:68
+#: src/sound.c:73
 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 "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:75
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:76
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid ""
+#~ "%s has requested a DCC chat.  Would you like to establish the direct "
+#~ "connection?"
+#~ msgstr "%s si vydal pm chat. Chcete vytvoit pm spojen?"
+
+#, fuzzy
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "Ztratil jste %d zprv z %s protoe byly velmi zl."
+
+#, 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>"
+#~ msgstr ""
+#~ "<br><BODY BGCOLOR=WHITE><hr><I>Legenda:</I><br><br><IMG SRC=\"free_icon."
+#~ "gif\"> : Normln AIM uivatel<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+#~ "uivatel <br><IMG SRC=\"dt_icon.gif\"> : Zkuebn AIM uivatet <br><IMG "
+#~ "SRC=\"admin_icon.gif\"> : Administrtor"
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Gaim - ICQ autorizace pijata"
+
+#~ 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?"
+
+#~ msgid "Web Site"
+#~ msgstr "Internetov strnka"
+
+#~ msgid "Password: "
+#~ msgstr "Heslo: "
+
+#, fuzzy
+#~ msgid "About"
+#~ msgstr "O aplikaci Gaim"
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr "Nahrt skript"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "Zruit vechny skripty"
+
+#~ msgid "List Scripts"
+#~ msgstr "Seznam script"
+
+#~ msgid "Whisper"
+#~ msgstr "eptat"
+
+#, fuzzy
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Ulo konverzaci"
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "Nastavuji pozici na %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr "Tun text"
+
+#~ msgid "Bold"
+#~ msgstr "Tun"
+
+#~ msgid "Italics Text"
+#~ msgstr "Kurzva"
+
+#~ msgid "Italics"
+#~ msgstr "Kurzva"
+
+#~ msgid "Underline Text"
+#~ msgstr "Podtren text"
+
+#~ msgid "Underline"
+#~ msgstr "Podtren"
+
+#~ msgid "Strike through Text"
+#~ msgstr "Pekrtnut text"
+
+#~ msgid "Strike"
+#~ msgstr "Pekrtnut"
+
+#~ msgid "Decrease font size"
+#~ msgstr "Zmenit velikost psma"
+
+#~ msgid "Small"
+#~ msgstr "Mal"
+
+#~ msgid "Normal font size"
+#~ msgstr "Normlna vekost psma"
+
+#~ msgid "Normal"
+#~ msgstr "Normln"
+
+#~ msgid "Increase font size"
+#~ msgstr "Zvtit velikost psma"
+
+#~ msgid "Big"
+#~ msgstr "Velk"
+
+#~ msgid "Font"
+#~ msgstr "Psmo"
+
+#~ msgid "Text Color"
+#~ msgstr "Barva textu"
+
+#~ msgid "Background Color"
+#~ msgstr "Barva pozad"
+
+#~ msgid "Link"
+#~ msgstr "Odkaz"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "Vloit smajlk"
+
+#~ msgid "Smiley"
+#~ msgstr "Smajlk"
+
+#~ msgid "Sound"
+#~ msgstr "Zvuk"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - Varovat uivatele?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "opravdu chcete varovat %s?"
+
+#, fuzzy
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - Odstranit %s?"
+
+#, fuzzy
+#~ msgid "Remove Buddy"
+#~ msgstr "Pejmenovat kamarda"
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "Chystte se odstranit '%s' z Vaeho\n"
+#~ "Buddy Listu. Opravdu to chcete udlat?"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - IM uivatel"
+
+#~ msgid "User:"
+#~ msgstr "Uivatel:"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim - Zskat informace o uivateli"
+
+#~ msgid "Add Group"
+#~ msgstr "Pidat skupinu"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Pidat kamarda"
+
+#~ msgid "Contact"
+#~ msgstr "Kontakt"
+
+#~ msgid "Allow List"
+#~ msgstr "Seznam povolench"
+
+#~ msgid "Block List"
+#~ msgstr "Seznam blokovanch"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "Alias kamarda"
+
+#~ msgid "Rename Group"
+#~ msgstr "Pejmenovat skupinu"
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim nemohl odeslat zprvu"
+
+#~ msgid "Select All"
+#~ msgstr "Vybrat ve"
+
+#~ msgid "Select Autos"
+#~ msgstr "Vybrat automatick"
+
+#~ msgid "Select None"
+#~ msgstr "Vybrat dn"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "Prihlsit/Odhlsit"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim - Seznam plugin"
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - Pluginy"
+
+#, fuzzy
+#~ msgid "Loaded Plugins"
+#~ msgstr "Gaim - Pluginy"
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr "Vybrat ve"
+
+#~ msgid "Filepath:"
+#~ msgstr "Cesta k souboru:"
+
+#~ msgid "Load"
+#~ msgstr "Nahrt"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "Nahraj plugin ze souboru"
+
+#~ msgid "Configure"
+#~ msgstr "Nastavit"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "Nastaven zvolenho pluginu"
+
+#~ msgid "Reload"
+#~ msgstr "Obnovit"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "Obnovit zvolen plugin"
+
+#~ msgid "Unload"
+#~ msgstr "Zruit"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "Zruit zvolen plugin"
+
+#~ msgid "Close this window"
+#~ msgstr "Zavi toto okno"
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "Pout tlatka bez okraj"
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "Ignoruj TiK automatick zprvy"
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "Zvtit okno pi udlostech"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Gaim ladc vstupn okno"
+
+#, fuzzy
+#~ 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 ""
+#~ "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."
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s pouval %s, kter byl smazn. %s je te nepipojen."
+
+#~ msgid "Accept?"
+#~ msgstr "Akceptovat?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Chyba Gadu-Gadu"
 
@@ -3802,18 +4724,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "Zmna hesla selhala (%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "dn prezdvka/kanl"
-
-#~ msgid "IRC Error"
-#~ msgstr "Chyba IRC"
-
-#~ msgid "No such server"
-#~ msgstr "dn server"
-
-#~ msgid "IRC Part"
-#~ msgstr "st IRC"
-
 #, fuzzy
 #~ msgid "Password Change Error!"
 #~ msgstr "Gaim - Zmna hesla"
@@ -3829,9 +4739,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "Chyba MSN"
 
-#~ msgid "Invalid name"
-#~ msgstr "Nesprvne jmno"
-
 #~ msgid "Chat Error!"
 #~ msgstr "Chyba Chatu!"
 
@@ -3848,9 +4755,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "Dvod neznm"
 
-#~ msgid "AOL error"
-#~ msgstr "Chyba AOL"
-
 #~ msgid "Error"
 #~ msgstr "Chyba"
 
@@ -3941,15 +4845,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "Reportuj doby neinnosti"
 
-#~ msgid "None"
-#~ msgstr "dne"
-
-#~ msgid "Gaim Use"
-#~ msgstr "Pout Gaim"
-
-#~ msgid "X Use"
-#~ msgstr "Pout X"
-
 #~ msgid "Opera"
 #~ msgstr "Opera"
 
@@ -3969,9 +4864,6 @@
 #~ "Ne vechny protokoly mou vyuvat tyto nastaven proxy. Zkonsultujte,\n"
 #~ "prosm, README soubor kvli detailm."
 
-#~ msgid "No Proxy"
-#~ msgstr "Bez proxy"
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -3985,13 +4877,6 @@
 #~ msgstr "Monosti Buddy Listu"
 
 #, fuzzy
-#~ msgid "Tab Placement:"
-#~ msgstr "Poloha tabulky:"
-
-#~ msgid "Top"
-#~ msgstr "Nahoe"
-
-#, fuzzy
 #~ msgid "Conversation Options"
 #~ msgstr "Monosti konverzace"
 
@@ -4007,34 +4892,12 @@
 #~ msgid "IM Options"
 #~ msgstr "Voby IM"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "Zobraz tlatka jako:"
-
-#~ msgid "Pictures And Text"
-#~ msgstr "Obrzky a text"
-
-#~ msgid "Pictures"
-#~ msgstr "Obrzky"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#, fuzzy
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "Zobraz vechny konverzace v jednom okn se zlokami"
-
 #~ msgid "Window Sizes"
 #~ msgstr "Velikosti okna"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Poloha zloky"
 
-#~ msgid "Left"
-#~ msgstr "Vlevo"
-
-#~ msgid "Right"
-#~ msgstr "Vpravo"
-
 #~ msgid "Chat Options"
 #~ msgstr "Monosti chatu"
 
@@ -4042,9 +4905,6 @@
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Zobraz vechny konverzace v jednom okn se zlokami"
 
-#~ msgid "Font Options"
-#~ msgstr "Monosti psma"
-
 #~ msgid "Italic Text"
 #~ msgstr "Kurzva"
 
@@ -4080,11 +4940,5 @@
 #~ msgid "Conversations"
 #~ msgstr "Konverzace"
 
-#~ msgid "Enable sounds"
-#~ msgstr "Povolit zvuky"
-
 #~ msgid "KFM"
 #~ msgstr "KFM"
-
-#~ msgid "Manual"
-#~ msgstr "Nvod"
--- a/po/da.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/da.po	Sun Jan 05 23:21:50 2003 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GAIM 0.55\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\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,359 +16,532 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "Fravrende"
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "Tilbage"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+#, fuzzy
+msgid "Auto-login"
+msgstr "Auto-logind"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "Log af"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Lydeffekter"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "Konti"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "Indstillinger"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "Om Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Luk"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - Opstning af lyd"
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "Venne-ikon"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Venne-chat"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 #, fuzzy
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr "Luk"
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 #, fuzzy
 msgid "Chat Rooms"
 msgstr "Indstillinger for chat"
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Tilfj"
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Slet"
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr ""
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr ""
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr ""
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr ""
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr ""
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr ""
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 #, fuzzy
 msgid "(No"
 msgstr "Nej"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 #, fuzzy
 msgid "Change"
 msgstr "Kanal:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "Kunne ikke skrive til filen %s."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "%s loggede ind."
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "Besked-vindue"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "Gruppechat-vindue"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "Vis besked"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "Vis besked"
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "Kunne ikke tilslutte"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "Test"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "Vis alle samtaler som faneblade i et vindue"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 #, fuzzy
 msgid "Available"
 msgstr "Ikke tilgngelig"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr "Fravrende"
-
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 #, fuzzy
 msgid "Invisible"
 msgstr "Invitr"
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "Ikke tilgngelig"
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "Kunne ikke sl vrtsnavn op"
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "Kunne ikke kontakte server"
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "Ugyldigt svar fra server."
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "Fejl under lsning fra netvrket."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 msgid "Error while writing to socket."
 msgstr "Fejl under skrivning til netvrket."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 msgid "Authentication failed."
 msgstr "Godkendelse fejlede."
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "Ukendt fejlkode."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr "Klenavn:"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu Bruger"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "Kunne ikke f kontakt"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "Kan ikke lse fra netvrket"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "Kunne ikke f kontakt"
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "Lser data"
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "Finder ledig server"
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr "Lser serverens ngle"
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "Udveksler ngler"
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "Kritisk fejl i GG-bibliotek\n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "Kunne ikke kontakte server"
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "Send som besked"
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr "Sger efter Gadu-Gadu server"
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "Ugyldigt Gadu-Gadu UIN"
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Forbindelse til %s fejlede"
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "Kunne ikke kontakte server"
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "Send som besked"
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr "Sger efter Gadu-Gadu server"
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "Ugyldigt Gadu-Gadu UIN"
+
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Du prver vist at sende en besked til et ugyldigt Gadu-Gadu UIN."
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "Kunne ikke hente sgeresultater"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu sgemaskine"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "ja"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "nej"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "Fornavn"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "Efternavn"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "Klenavn"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "Fdselsr"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "Kn"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "By"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Der er ingen venne-liste gemt p serveren."
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Kunne ikke importere venne-liste fra server"
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Overfrsel af venne-liste til server er get godt"
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Kunne ikke overfre venne-liste til server"
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Venne-liste p server slettet"
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kunne ikke slette venne-liste p server"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "Adgangskoden er ndret"
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Adgangskoden blev ikke ndret"
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
-"Gaim was unable to complete your request due to a problem communicating to "
+"Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "Kunne ikke importere venne-liste fra server"
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "Kunne ikke oprette direkte forbindelse"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Kan ikke lse fra netvrket"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "Databasesgning"
 
@@ -376,165 +549,300 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "Importr venne-liste fra server"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "Eksportr venne-liste til server"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "Slet venne-liste p server"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "Kunne ikke lse filen %s."
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr "Klenavn:"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu Bruger"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "Annullr"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "Ignorr"
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "Send besked gennem server"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Brugerinformation"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Seneste brug af Gaim"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCC Chat med %s afsluttet"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "Forbindelse afbrudt"
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s har ndret emnet til: %s</B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "Lser serverens ngle"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "IRC Fejl"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "Klenavn/kanal findes ikke"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "IRC Fejl"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "Ingen server af den type"
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
 msgstr "Klenavn ikke angivet"
 
-#: src/protocols/irc/irc.c:976
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 msgid ""
-"%s has requested a DCC chat.  Would you like to establish the direct "
-"connection?"
-msgstr "%s beder om en DCC chat. Vil du lave en direkte forbindelse?"
-
-#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "Tilsluttet"
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Kunne ikke skrive"
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "Du er blevet smidt ud af %s: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "Smidt ud af %s: %s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "Se brugeroplysninger"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Du har forladt %s"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "IRC Deltager"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC Chat"
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "Kan ikke lse fra netvrket"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "Kan ikke lse fra netvrket"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Logget ind"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr "Totalt fravrende"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr "Vil ikke forstyrres"
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Besked-fejl"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Ukendt fejlkode."
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -542,195 +850,191 @@
 "\n"
 "Vil du tilfje vedkommende til din venne-liste?"
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "Ingen server af den type"
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Venner"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "Ukendt logind-fejl"
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Adgangskoden er ndret"
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Kunne ikke tilslutte"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "Finder godkendelsesmetode"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 #, fuzzy
 msgid "Jabber Error"
 msgstr "Besked-fejl"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "Rum:"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "Klenavn:"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "Kunne ikke tilslutte"
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Ls log"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Hent fravrsbesked"
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Vis besked"
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "Efternavn"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "Fornavn"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "Klenavn"
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "Hjemmeside"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Adresse 1"
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "Adresse 2"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr "Omrde"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "Postnummer"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "E-post adresse"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "Organisationsnavn"
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "Organisatorisk enhed"
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr "Rolle"
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "Fdselsdato"
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -738,399 +1042,603 @@
 "Alle oplysninger er valgfri. Skriv kun de ting, du nsker andre skal vide om "
 "dig"
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "Brugeroplysninger"
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Redigr Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "Du er nu registreret p serveren!"
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "Ukendt fejl under registrering"
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "Ret brugeroplysninger"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 #, fuzzy
 msgid "Invalid User"
 msgstr "Ugyldigt navn"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr ""
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 #, fuzzy
 msgid "Invalid Username"
 msgstr "Ugyldigt navn"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 #, fuzzy
 msgid "Invalid Friendly Name"
 msgstr "Ugyldigt navn"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 #, fuzzy
 msgid "Not on list"
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 #, fuzzy
 msgid "Not logged in"
 msgstr "%s loggede ind."
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 #, fuzzy
 msgid "Internal server error"
 msgstr "Intern fejl"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 #, fuzzy
 msgid "File operation error"
 msgstr "Intern forbindelsesfejl\n"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "Kritisk forbindelsesfejl\n"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 #, fuzzy
 msgid "Server busy"
 msgstr "Server:"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 #, fuzzy
 msgid "Server unavailable"
 msgstr "Ikke tilgngelig"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 #, fuzzy
 msgid "Database connect error"
 msgstr "Intern forbindelsesfejl\n"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 #, fuzzy
 msgid "Error creating connection"
 msgstr "g003: Fejl ved oprettelse af forbindelse\n"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 #, fuzzy
 msgid "Too many sessions"
 msgstr "For mange resultater."
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Godkendelse fejlede."
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 #, fuzzy
 msgid "Not allowed when offline"
 msgstr "Ingen lyde, nr du logger ind"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 #, fuzzy
 msgid "Unknown Error Code"
 msgstr "Ukendt fejlkode."
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim kunne ikke sende en besked"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "AOL fejl"
+
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Kunne ikke kontakte server"
+
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1179
+#: src/protocols/msn/msn.c:1401
 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:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Fejl under lsning fra netvrket."
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "Kunne ikke kontakte server"
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "Kunne ikke kontakte server"
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Protokolhandlinger"
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "Kunne ikke oprette direkte forbindelse"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "Kunne ikke logge p AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "Kunne ikke sende besked: For lang"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Kan ikke lse fra netvrket"
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 #, fuzzy
 msgid "Password sent"
 msgstr "Adgangskode:"
 
-#: src/protocols/msn/msn.c:1752
-#, fuzzy
-msgid "Unable to write to server"
-msgstr "Kunne ikke kontakte server"
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "Kunne ikke skrive"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "Kunne ikke sende besked: For lang"
+
+#: src/protocols/msn/msn.c:1974
 #, fuzzy
 msgid "Synching with server"
 msgstr "Registrr p server"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 #, fuzzy
 msgid "Busy"
 msgstr "Ven"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 #, fuzzy
 msgid "Hidden"
 msgstr "Skjul ikon"
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+msgid "Be right back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2430
+msgid "Away from the computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2432
+msgid "On the phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2434
+msgid "Out to lunch"
+msgstr ""
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr "Inaktiv:"
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "Send fil"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Efternavn"
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Brugernavn:"
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr "Ugyldigt navn"
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Hvilken gruppe:"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "Ugyldigt navn"
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Ugyldigt navn"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Ikke tilgngelig"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Sgetjeneste midlertidigt utilgngelig."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direkte forbindelse til %s lukket"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direkte forbindelse til %s fejlede"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "Forbindelsesfejl (rend)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "Kritisk forbindelsesfejl\n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Forbindelse til chat-rum %s afbrudt."
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Chat er ikke tilgngelig nu"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Kunne ikke kontakte vrt"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Adgangskode sendt - venter p svar\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "Intern forbindelsesfejl\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Kunne ikke logge p AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Tilsluttet: %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Koblet af.\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Forbindelse fejlede"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Forbindelse oprettet, infokage sendt"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Forkert navn eller adgangskode."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Din konto er ikke aktiv for jeblikket."
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "Tjenesten er midlertidigt utilgngelig."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1139,46 +1647,87 @@
 "minutter og prv s igen, for ellers skal du bare vente endnu lngere."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Din klient er for gammel. Hent en opgradering p"
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Godkendelse fejlede."
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Intern fejl"
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim kunne ikke sende en besked"
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim kunne ikke sende en besked"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte forbindelse til %s oprettet"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+msgid "Transfer timed out"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "Kunne ikke bne konfigurationsfilen %s."
+
+#: src/protocols/oscar/oscar.c:1632
+msgid "File transfer aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr ""
+"\n"
+"\n"
+"Vil du tilfje vedkommende til din venne-liste?"
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+#, fuzzy
+msgid "No reason given."
+msgstr "Klenavn ikke angivet"
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Godkendelse fejlede."
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1186,228 +1735,260 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-#, fuzzy
-msgid "No reason given."
-msgstr "Klenavn ikke angivet"
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:2141
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
 #, 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:1588
-#, 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:1597
+msgid ""
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
-msgid "You missed %d message from %s because it was too large."
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"Vil du tilfje vedkommende til din venne-liste?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu 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:2255
+#, fuzzy, c-format
+msgid "You missed %hu 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:2264
+#, fuzzy, c-format
+msgid "You missed %hu 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:1598
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu 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:1607
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu 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:1608
-#, c-format
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr ""
 "Du har ikke modtaget %d beskeder fra %s fordi der er sendt for mange "
 "beskeder."
 
-#: src/protocols/oscar/oscar.c:1617
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr "Du har ikke modtaget %d besked fra %s fordi den var storeslem :-)."
+
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
 msgstr "Du har ikke modtaget %d besked fra %s fordi den var storeslem :-)."
 
-#: src/protocols/oscar/oscar.c:1618
-#, 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:1627
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu 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:1628
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu 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:1636
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Du har ikke modtaget %d besked fra %s af ukendte rsager."
 
-#: src/protocols/oscar/oscar.c:1637
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Du har ikke modtaget %d beskeder fra %s af ukendte rsager"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2342
+#, c-format
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1707
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1736
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fejlen: %s\n"
 
-#: src/protocols/oscar/oscar.c:1755
-#, 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:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "Ukendt logind-fejl"
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "Klenavn ikke angivet"
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "Din besked til %s blev ikke sendt: %s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "Oplysninger om %s ikke tilgngelige: %s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Venne-ikon"
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Tale"
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "Billede"
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Modtag fil"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr "Send fil"
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Spil"
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Aktier"
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Send venne-liste"
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "AP Bruger"
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "ICQ Send gennem server"
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ Ukendt"
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Trillian Kryptering"
 
-#: src/protocols/oscar/oscar.c:1886
+#: src/protocols/oscar/oscar.c:2655
 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 ""
-"<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:1914
-#, c-format
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "Brugernavn : <B>%s</B>  %s <BR>\n"
 "Advarselsniveau : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>Brugeren har ingen fravrsbesked</i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Klient understtter:"
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Ingen information tilgngelig</i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "Din forbindelse kan vre afbrudt."
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
@@ -1416,206 +1997,270 @@
 "Den seneste besked blev ikke sendt, fordi serveren har for travlt. Vent 10 "
 "sekunder og prv s igen."
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "Godkendelse fejlede."
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "Godkendelse fejlede."
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "g003: Fejl ved oprettelse af forbindelse\n"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "Konto"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "Kunne ikke lse filen %s."
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim kunne ikke sende en besked"
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, 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:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Deltagere:"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Kunne ikke oprette direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4621
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
 #, 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 ""
-"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:3586
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4642
 #, 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:3593
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3618
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4667
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Hent fravrsbesked"
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Klientinformation"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kunne ikke skrive til filen %s."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kunne ikke lse filen %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Beskeden var for lang - de sidste %s bytes blev slettet."
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s er ikke logget p lige nu."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Du kan ikke advare %s."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "En besked blev ikke sendt - du var hurtigere end serveren."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat i %s er ikke muligt."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Du sender beskeder for hurtigt til %s."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Du har ikke modtaget en besked fra %s, fordi den var for lang."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Du har ikke modtaget en besked fra %s, fordi den blev sendt for hurtigt."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "Fejl."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "For mange resultater."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "Angiv flere sgeord."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "Sgetjeneste midlertidigt utilgngelig."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "E-post sgning er begrnset."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Ngleord ignoreret."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "Ingen ngleord."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "Ingen oplysninger om brugeren fundet."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "Land ikke understttet."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Ukendt fejl: %s"
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "Tjenesten er midlertidigt utilgngelig."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "Du har for mange advarsler i jeblikket til at kunne logge ind."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1623,37 +2268,37 @@
 "Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti "
 "minutter og prv s igen, for ellers skal du bare vente endnu lngere."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Der opstod en ukendt fejl under logind: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "En ukendt fejl, %d, er opstet. Info: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "Venter p svar..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC er blevet tilgngelig. Du kan nu sende beskeder igen."
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "Adgangskode skiftet"
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -1665,281 +2310,248 @@
 "at sende en besked. Gaim vil derfor tilbageholde alle beskeder. Dette er kun "
 "midlertidigt, s hav tlmodighed..."
 
-#: src/protocols/toc/toc.c:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "Hent oplysninger"
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "Port"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "Kunne ikke oprette forbindelse til overfrsel!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "Kunne ikke oprette forbindelse til overfrsel!"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "Kunne ikke oprette forbindelse til overfrsel!"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - Gem som..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, 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:1963
+#: src/protocols/toc/toc.c:1980
 #, 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:1968
+#: src/protocols/toc/toc.c:1985
 #, 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:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr "Acceptr"
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din besked blev ikke sendt"
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "Modtager:"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Om Gaim %s"
 
-#: src/about.c:135
+#: src/about.c:112
 #, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "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.freenode.net"
-msgstr ""
-
-#: src/about.c:147
+#: src/about.c:122
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-msgstr ""
-"Aktive udviklere\n"
-"====================\n"
-"Rob Flynn (vedligeholder) [ rob@marko.net ]\n"
-"Sean Egan (programmr)   [ bj91704@binghamton.edu ]\n"
-"\n"
-"Ivrige lappere\n"
-"==============\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Tidligere udviklere\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (oprindelig udvikler)   [ markster@marko.net ]\n"
-"\n"
-"Dansk oversttelse\n"
-"===============\n"
-"Lars Sarauw Hansen                 [ sarauw@dk.ibm.com ]"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "Hjemmeside"
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr "Log af"
-
-#: src/aim.c:162
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "Luk"
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "Indtast dit brugernavn"
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Logind"
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "Brugernavn:"
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr "Adgangskode:"
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "Luk"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr "Konti"
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr "Log p"
-
-#: src/aim.c:354
-msgid "About"
-msgstr "Om"
-
-#: src/aim.c:355
-msgid "Options"
-msgstr "Valgmuligheder"
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr "Udvidelsesmoduler"
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr "Indstillinger"
-
-#: src/aim.c:841 src/multi.c:1481
-#, fuzzy
-msgid "Auto-login"
-msgstr "Auto-logind"
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - Fravrende!"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "S er jeg klar igen"
 
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr "Tilbage"
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "Ny fravrsbesked"
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "Slet fravrsbesked"
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "St alle fravrende"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "Besked"
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Information"
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr "Tilfj handling"
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "Ls log"
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "Omdb"
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "Slet alias"
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr "Opret handling"
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "Slet handling"
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 besked)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[Klik for at ndre]"
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Logget ind: %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Advarsler: %d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Understtter: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1950,947 +2562,880 @@
 "Brugernavn: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggede ind."
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggede ud."
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Information om markeret ven"
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "Send besked"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "Start/deltag i chat"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Jeg er fravrende"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - Mine venner"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Handlinger"
 
-#: src/buddy.c:2667
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr "Tilfj en ven"
 
-#: src/buddy.c:2669
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr "Deltag i chat"
 
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr "Ny besked"
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "Ny fravrsbesked"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr "Se brugeroplysninger"
 
-#: src/buddy.c:2678
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "Importr venne-liste"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "Skjul ikon"
+
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "Vrktjer"
 
-#: src/buddy.c:2706
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr "Handling"
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "Konti"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Indstillinger"
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Protokolhandlinger"
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "Privatliv"
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "Se systemlog"
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr "bn skript"
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "Luk alle skripts"
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr "Vis skripts"
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Hjlp"
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 #, fuzzy
 msgid "Online Help"
 msgstr "Logget ind"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 #, fuzzy
 msgid "Debug Window"
 msgstr "Vis fejlsgningsvindue"
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "Venne-liste"
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "Tilfj en ven"
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "Tilfj en gruppe"
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "Slet markeret ven/gruppe"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Redigr liste"
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - Mine venner"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Deltag i chat"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Deltag i chat som:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr "Annullr"
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Deltag"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Invitr"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Ven"
 
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Besked"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invitr ven med i chat-rum"
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Ignorr ikke"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Ignorr"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s i rum"
 
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s er nu i rummet"
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s er nu i rummet"
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s kalder sig nu for %s"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlod rummet (%s)."
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlod rummet."
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Gruppe-chats"
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Emne:"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "Ingen chattere i rummet"
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr "Hvisk"
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Send"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
-msgid "Block"
-msgstr "Ignorr"
-
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "Advar"
 
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Gem samtale"
-
-#: src/conversation.c:492
+#: src/buddy_chat.c:1592 src/conversation.c:2925
+msgid "Block"
+msgstr "Ignorr"
+
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Indst billede"
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "Kunne ikke sende besked: For lang"
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "Kunne ikke sende besked: For lang"
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr "Netop nu: %d,"
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "Flytter position til %d\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr "Fed tekst"
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr "Fed"
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr "Kursiv tekst"
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr "Kursiv"
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr "Understreget tekst"
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr "Understregning"
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr "Gennemstreget tekst"
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr "Gennemstregning"
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "Mindre skrift"
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr "Lille"
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "Normal skriftstrrelse"
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr "Normal"
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr "Strre skrift"
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr "Stor"
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "Vlg skrifttype"
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr "Skrifttype"
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "Tekstfarve"
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr "Farve"
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr "Baggrundsfarve"
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "Gem samtale"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "Indst lnke"
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr "Lnke"
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr "Indst humr-ansigt"
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "Humr-ansigt"
-
-#: src/conversation.c:2272
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "Indst billede"
 
-#: src/conversation.c:2272
-msgid "Image"
-msgstr "Billede"
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "Luk"
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "Valgmuligheder"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "Registrr i logfil"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr "Logger"
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr "Gem samtale"
-
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr "Gem"
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
-msgstr ""
-
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr "Lyd"
-
-#: src/conversation.c:2782
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "Brug lyde"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - Samtaler"
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Send besked som:"
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Gem ikon"
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Brug ikke animation"
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Brug animation"
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Gem ikon som..."
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "Gaim - Advar bruger?"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "Er du sikker p at du vil advare %s?"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "Advar anonymt?"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "Anonyme advarsler er mindre grove."
 
-#: src/dialogs.c:471
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Sletter %s fra venne-liste.\n"
 
-#: src/dialogs.c:496
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - Slet %s?"
-
-#: src/dialogs.c:509
-msgid "Remove Buddy"
-msgstr "Slet ven"
-
-#: src/dialogs.c:519
-#, c-format
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "Brugernavn:"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
+msgstr "Konto"
+
+#: src/dialogs.c:804
 msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
-msgstr ""
-"Du er ved at slette %s fra din\n"
-"venneliste. Vil du fortstte?"
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr "Acceptr"
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "O.k."
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - Bruger"
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr "Besked til:"
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "Bruger:"
-
-#: src/dialogs.c:816
-#, fuzzy
-msgid "Account:"
-msgstr "Konto"
-
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "Gaim - Se brugeroplysninger"
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr "Tilfj gruppe"
-
-#: src/dialogs.c:1004
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - Tilfj gruppe"
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "Gruppe"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Tilfj ven"
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr "Tilfj ven"
-
-#: src/dialogs.c:1110
-msgid "Contact"
-msgstr "Kontakt"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Brugernavn:"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Tilfj til"
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Fravrende!"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
-msgstr ""
-
-#: src/dialogs.c:1451
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Indstil for:"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Tillad alle brugere at kontakte mig"
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "Tillad kun nedenstende brugere"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "Tillad kun nedenstende brugere"
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr "Tilladte brugere"
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Ignorr alle brugere"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Ignorr kun nedenstende brugere"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "Ignorerede brugere"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Hvem vil du sende en handling ved logind?"
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Ny handling"
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Hvem vil du vente p:"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Konto"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "Hvornr skal handlingen udfres:"
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Nr ven logger ind"
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Nr ikke lngere fravrende"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Nr ven bliver aktiv igen"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "Nr ven skriver til dig"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Hvad skal der ske:"
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "bn besked-vindue"
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Vis besked"
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Send besked"
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Udfr kommando"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Afspil lyd"
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Gem denne handling til senere brug"
 
-#: src/dialogs.c:1971
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr "Gem"
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "Annullr"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Ret kataloginformation"
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Kataloginformation"
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Tillad netsgninger at finde information om dig"
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Fornavn"
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Mellemnavn"
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Efternavn"
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Dbsnavn"
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Landsdel"
 
-#: src/dialogs.c:2126
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr "Gem"
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Adgangskoder er ikke ens"
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Udfyld alle felter ordentligt"
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Skift adgangskode"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Oprindelig adgangskode"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Ny adgangskode"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Ny adgangskode (igen)"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "O.k."
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Ret brugerinformation"
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Her er resultatet af din sgning:"
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Tillad"
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr "Ignorr"
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Tilfj tilladelse"
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ignorr fra nu af"
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Sg efter ven"
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Find ven udfra information"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Find ven udfra e-post adresse"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "Indst lnke"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Tilfj hjemmesideadresse"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Vlg tekstfarve"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Vlg baggrundsfarve"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "Vlg skrifttype"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importr til:"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importr venne-liste"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan ikke lave en fravrsbesked uden en titel"
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "Du kan ikke lave en tom fravrsbesked"
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Ny fravrsbesked"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Ny fravrsbesked"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Titel:"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "Gem og brug"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Brug"
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "Gem og brug"
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Smil!"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr "Lav alias for ven"
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Lav alias for ven"
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "Kunne ikke kontakte vrt"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Gem logfil"
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "Kunne ikke bne konfigurationsfilen %s."
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Er du sikker p at du vil slette loggen?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "O.k."
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Dato"
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Samtale"
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Ryd"
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Omdb gruppe"
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr "Omdb gruppe"
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
-msgid "New name:"
-msgstr "Nyt navn:"
-
-#: src/dialogs.c:4484
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Omdb ven"
 
-#: src/dialogs.c:4494
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Omdb ven"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "Nyt navn:"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vlg Perl-skript"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunne ikke bne konfigurationsfilen %s."
 
-#: src/html.c:183
+#: src/html.c:185
 #, c-format
 msgid "Received: '%s'\n"
 msgstr "Modtaget: '%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fejl ved oprettelse af forbindelse\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim kunne ikke sende en besked"
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "Brugernavn:"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "Protokol:"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Hent venne-ikon"
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "Ikonfil:"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Gennemse"
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "Nulstil"
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "Indstillinger for skrifttyper"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "Brugernavn:"
 
-#: src/multi.c:559
+#: src/multi.c:653
 #, fuzzy
 msgid "Alias:"
 msgstr "Alias"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "Husk adgangskode"
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Auto-logind"
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "Pmindelser om ny post"
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "Indstillinger for mellemvrt (proxy)"
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "Pmindelser om ny post"
+
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Valgmuligheder"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "Registrr p server"
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Ret konto"
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Adgangskode:"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "Log p"
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "Protokolhandlinger"
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2898,40 +3443,45 @@
 "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:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker p at du vil slette %s?"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "Slet"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Ret konto"
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr "Vlg alle"
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr "Vlg auto-logind"
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "Vlg ingen"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "Ret"
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "Log ind/ud"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr "Slet"
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "Ingen mling"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Tilsluttet: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Ret konto"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "Annullr"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -2940,691 +3490,780 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s kunne ikke logge ind"
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "Logind-fejl"
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 msgid "Notice"
 msgstr "Bemrk!"
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s er logget ud"
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr "Forbindelsesfejl"
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim "
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - Udvidelsesmoduler"
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-msgid "Loaded Plugins"
-msgstr "Indlste udvidelsesmoduler"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr "Vlg alle"
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr "Filsti:"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr "Indls"
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "Indls et udvidelsesmodul fra en fil"
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr "Konfigurr"
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "Konfigurr det valgte udvidelsesmodul"
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr "Genindls"
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "Genindls det valgte udvidelsesmodul"
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr "Udls"
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "Udls det valgte udvidelsesmodul"
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "Luk dette vindue"
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr "Generelle indstillinger"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "Vis fejlsgningsvindue"
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "Ingen kant p knapper"
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "Landsdel"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr "Fed"
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr "Kursiv"
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr "Understregning"
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr "Gennemstreget tekst"
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr "Annullr"
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "Indst humr-ansigt"
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "Indst humr-ansigt"
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr "Farve"
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "Tekstfarve"
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "Baggrundsfarve"
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr "Visning af venner"
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "Vis grafiske humransigter"
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "Vis tidspunkt i beskeder"
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "Vis URLer som henvisninger"
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "Fremhv forkert stavede ord"
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "Ignorr farver"
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "Ignrer skrifttyper"
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "Ignrer skriftstrrelser"
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "Ignrer TiK's automatiske beskeder"
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "ENTER sender besked"
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "CTRL+ENTER sender besked"
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "Besked-vindue"
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "ESC lukker vindue"
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "ESC lukker vindue"
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "CTRL+{B/I/U/S} indstter HTML-koder"
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "CTRL+nummer indstter humransigt"
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr "I bunden"
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "Skjul besked/info/chat-knapperne"
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "Brug billeder p knapper"
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "Venne-liste"
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "Husk vinduets strrelse og placering"
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "Send vindue i forgrunden ved aktivitet"
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr "Visning af grupper"
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "Vis ikke gruppe, hvis ingen er logget ind"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "Vis tal for hver gruppe"
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr "Visning af venner"
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 #, fuzzy
 msgid "Show buddy type _icons"
 msgstr "Brug status-ikoner"
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "Vis advarselsniveau"
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "Vis inaktiv tid"
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 #, fuzzy
 msgid "Grey i_dle buddies"
 msgstr "Vis inaktive venner med gr farve"
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "Besked-vindue"
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "Vis knapper som:"
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "Billeder"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "Tekst"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "Billeder og tekst"
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "Bredde i punkter:"
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "Hjde i punkter:"
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "Hjde p skrivefeltet:"
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "Send vindue i forgrunden ved aktivitet"
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "Luk vindue nr besked er sendt"
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "Ikoner/knapper"
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "Skjul knapper"
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "Animr ikke venne-ikoner"
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "Besked nr venner logger ind/ud"
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr "Vis besked"
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "Vis venner at du er ved at skrive til dem"
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "Autofuldfrelse"
 
-#: src/prefs.c:505
-#, fuzzy
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "Autofuldfr navne ved tryk p TAB"
 
-#: src/prefs.c:506
-#, fuzzy
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "TAB som i gamle Gaim-versioner"
 
-#: src/prefs.c:509
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr "Vis nr nogen logger ind eller ud "
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Placering af faneblade"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr "I toppen"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "I bunden"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr "Til venstre"
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "Til hjre"
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "Vis hver chat som faneblad i et vindue"
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 #, fuzzy
 msgid "Show a_liases in tabs/titles"
 msgstr "Vis aliaser i faneblade/titler"
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr "Chat"
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "Vis hver chat som faneblad i et vindue"
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Vis hver chat som et faneblad i samme vindue"
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr "Venne-liste"
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "Mellemvrtstype"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Mellemvrtstype"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Ingen mellemvrt"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Mellemvrt"
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr "Vrtsnavn"
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr "Brugernavn"
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr "Adgangskode"
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "Netlser/browser"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr "Andet program"
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr "Indstillinger for mellemvrt (proxy)"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "Start altid program i nyt vindue"
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr "Beskeder"
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr "Ny besked"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "Gem alle samtaler"
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr "Ingen HTML-koder i logfilen"
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "Se systemlog"
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "Registrr at venner logger ind/ud"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Registrr at venner bliver aktive/inaktive"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "Registrr venners fravr/genkomst"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Registrr eget logind/inaktivitet/fravr"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Separat logfil for hver ven"
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "Indstillinger for lyd"
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "Ingen lyde, nr du logger ind"
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "Afspil lyde under fravr"
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr "Afspil lyd ved hjlp af:"
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "Afspil lyd ved hjlp af:"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "Intern fejl"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
 "(%s for filename)"
 msgstr "Kommando (brug %s istedet for filnavn):"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "Beskedafsendelse ophver fravrsstatus"
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "St nye beskeder i k under fravr"
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "Ignrer nye samtaler under fravr"
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "Send ikke automatisk svar"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "Send ikke automatisk svar"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "Send kun automatisk svar, nr fravrende"
 
-#: src/prefs.c:828
-#, fuzzy
-msgid "Idle"
-msgstr "Inaktiv:"
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "Send ikke automatisk svar"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr "Ingen mling"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Seneste brug af Gaim"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "Seneste brug af X"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "Besked-vindue"
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr "Fravrende"
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "Fravrsbeskeder"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Opstning af lyd"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "Vlg..."
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr "Ret"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 #, fuzzy
 msgid "Interface"
 msgstr "Instans:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr "Skrifttype"
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr "Beskeder"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "Besked-vindue"
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "Gruppechat-vindue"
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "Mellemvrt"
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "Netlser/browser"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "Logger"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr "Lydeffekter"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr "Lydeffekter"
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Titel:"
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "Fravrsbeskeder"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr "Udvidelsesmoduler"
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - Indstillinger"
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Gaim fejlsgningsvindue"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
-msgstr ""
-
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"not the same version I cannot safely tell you which one it was. Needless to "
-"say, it was not successfully loaded."
-msgstr ""
-"Du har forsgt at indlse en protokol som ikke stammer fra samme version af "
-"kildekoden som Gaim selv. Gaim kan ikke se hvilken version protokollens "
-"kildekode er fra, men under alle omstndigheder kan protokollen ikke "
-"indlses."
-
-#: src/prpl.c:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "Vis fejlsgningsvindue"
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3632,33 +4271,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s brugte %s, som blev udlst. %s kan ikke lngere kontaktes."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "Acceptr?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "Gaim - Sprgsml"
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - Ny post"
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "bn post"
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, 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:590
+#: src/prpl.c:634
 #, fuzzy
 msgid ""
 "\n"
@@ -3669,7 +4303,7 @@
 "\n"
 "Vil du tilfje vedkommende til din venne-liste?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3677,87 +4311,406 @@
 "Du har ikke nogen protokoller indlst, som understtter oprettelsen af nye "
 "konti."
 
-#: src/prpl.c:670
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrering"
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr "Registreringsinformation"
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 msgid "Register"
 msgstr "Registrr"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Indtast din adgangskode"
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d beskeder)"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 besked)"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr "Nej"
 
-#: src/server.c:1101
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Flere oplysninger"
 
-#: src/sound.c:63
+#: src/sound.c:68
 #, fuzzy
 msgid "Buddy logs in"
 msgstr "Venne-ikon"
 
-#: src/sound.c:64
+#: src/sound.c:69
 #, fuzzy
 msgid "Buddy logs out"
 msgstr "Venne-liste"
 
-#: src/sound.c:65
+#: src/sound.c:70
 #, fuzzy
 msgid "Message received"
 msgstr "Besked-fejl"
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr ""
 
-#: src/sound.c:67
+#: src/sound.c:72
 #, fuzzy
 msgid "Message sent"
 msgstr "Beskeder"
 
-#: src/sound.c:68
+#: src/sound.c:73
 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 "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:75
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:76
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid ""
+#~ "%s has requested a DCC chat.  Would you like to establish the direct "
+#~ "connection?"
+#~ msgstr "%s beder om en DCC chat. Vil du lave en direkte forbindelse?"
+
+#~ 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 :-)."
+
+#~ 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 ""
+#~ "<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>"
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Godkendelse fejlede."
+
+#~ 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 ""
+#~ "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?"
+
+#~ msgid ""
+#~ "Active Developers\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Crazy Patch Writers\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Retired Developers\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+#~ msgstr ""
+#~ "Aktive udviklere\n"
+#~ "====================\n"
+#~ "Rob Flynn (vedligeholder) [ rob@marko.net ]\n"
+#~ "Sean Egan (programmr)   [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Ivrige lappere\n"
+#~ "==============\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Tidligere udviklere\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (oprindelig udvikler)   [ markster@marko.net ]\n"
+#~ "\n"
+#~ "Dansk oversttelse\n"
+#~ "===============\n"
+#~ "Lars Sarauw Hansen                 [ sarauw@dk.ibm.com ]"
+
+#~ msgid "Web Site"
+#~ msgstr "Hjemmeside"
+
+#~ msgid "Password: "
+#~ msgstr "Adgangskode:"
+
+#~ msgid "About"
+#~ msgstr "Om"
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr "bn skript"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "Luk alle skripts"
+
+#~ msgid "List Scripts"
+#~ msgstr "Vis skripts"
+
+#~ msgid "Whisper"
+#~ msgstr "Hvisk"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Gem samtale"
+
+#~ msgid "Currently at %d, "
+#~ msgstr "Netop nu: %d,"
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "Flytter position til %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr "Fed tekst"
+
+#~ msgid "Bold"
+#~ msgstr "Fed"
+
+#~ msgid "Italics Text"
+#~ msgstr "Kursiv tekst"
+
+#~ msgid "Italics"
+#~ msgstr "Kursiv"
+
+#~ msgid "Underline Text"
+#~ msgstr "Understreget tekst"
+
+#~ msgid "Underline"
+#~ msgstr "Understregning"
+
+#~ msgid "Strike through Text"
+#~ msgstr "Gennemstreget tekst"
+
+#~ msgid "Strike"
+#~ msgstr "Gennemstregning"
+
+#~ msgid "Decrease font size"
+#~ msgstr "Mindre skrift"
+
+#~ msgid "Small"
+#~ msgstr "Lille"
+
+#~ msgid "Normal font size"
+#~ msgstr "Normal skriftstrrelse"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Increase font size"
+#~ msgstr "Strre skrift"
+
+#~ msgid "Big"
+#~ msgstr "Stor"
+
+#~ msgid "Font"
+#~ msgstr "Skrifttype"
+
+#~ msgid "Text Color"
+#~ msgstr "Tekstfarve"
+
+#~ msgid "Background Color"
+#~ msgstr "Baggrundsfarve"
+
+#~ msgid "Link"
+#~ msgstr "Lnke"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "Indst humr-ansigt"
+
+#~ msgid "Smiley"
+#~ msgstr "Humr-ansigt"
+
+#~ msgid "Image"
+#~ msgstr "Billede"
+
+#~ msgid "Sound"
+#~ msgstr "Lyd"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - Advar bruger?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "Er du sikker p at du vil advare %s?"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - Slet %s?"
+
+#~ msgid "Remove Buddy"
+#~ msgstr "Slet ven"
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "Du er ved at slette %s fra din\n"
+#~ "venneliste. Vil du fortstte?"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - Bruger"
+
+#~ msgid "IM who:"
+#~ msgstr "Besked til:"
+
+#~ msgid "User:"
+#~ msgstr "Bruger:"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim - Se brugeroplysninger"
+
+#~ msgid "Add Group"
+#~ msgstr "Tilfj gruppe"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Tilfj ven"
+
+#~ msgid "Contact"
+#~ msgstr "Kontakt"
+
+#~ msgid "Allow List"
+#~ msgstr "Tilladte brugere"
+
+#~ msgid "Block List"
+#~ msgstr "Ignorerede brugere"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "Lav alias for ven"
+
+#~ msgid "Rename Group"
+#~ msgstr "Omdb gruppe"
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim kunne ikke sende en besked"
+
+#~ msgid "Select All"
+#~ msgstr "Vlg alle"
+
+#~ msgid "Select Autos"
+#~ msgstr "Vlg auto-logind"
+
+#~ msgid "Select None"
+#~ msgstr "Vlg ingen"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "Log ind/ud"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim "
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - Udvidelsesmoduler"
+
+#~ msgid "Loaded Plugins"
+#~ msgstr "Indlste udvidelsesmoduler"
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr "Vlg alle"
+
+#~ msgid "Filepath:"
+#~ msgstr "Filsti:"
+
+#~ msgid "Load"
+#~ msgstr "Indls"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "Indls et udvidelsesmodul fra en fil"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurr"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "Konfigurr det valgte udvidelsesmodul"
+
+#~ msgid "Reload"
+#~ msgstr "Genindls"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "Genindls det valgte udvidelsesmodul"
+
+#~ msgid "Unload"
+#~ msgstr "Udls"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "Udls det valgte udvidelsesmodul"
+
+#~ msgid "Close this window"
+#~ msgstr "Luk dette vindue"
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "Ingen kant p knapper"
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "Ignrer TiK's automatiske beskeder"
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "Send vindue i forgrunden ved aktivitet"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Gaim fejlsgningsvindue"
+
+#~ 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 ""
+#~ "Du har forsgt at indlse en protokol som ikke stammer fra samme version "
+#~ "af kildekoden som Gaim selv. Gaim kan ikke se hvilken version "
+#~ "protokollens kildekode er fra, men under alle omstndigheder kan "
+#~ "protokollen ikke indlses."
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s brugte %s, som blev udlst. %s kan ikke lngere kontaktes."
+
+#~ msgid "Accept?"
+#~ msgstr "Acceptr?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Gadu-Gadu Fejl"
 
@@ -3782,18 +4735,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "Skift af adgangskode fejlede (%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "Klenavn/kanal findes ikke"
-
-#~ msgid "IRC Error"
-#~ msgstr "IRC Fejl"
-
-#~ msgid "No such server"
-#~ msgstr "Ingen server af den type"
-
-#~ msgid "IRC Part"
-#~ msgstr "IRC Deltager"
-
 #, fuzzy
 #~ msgid "Password Change Error!"
 #~ msgstr "Gaim - Skift adgangskode"
@@ -3809,9 +4750,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "MSN Fejl"
 
-#~ msgid "Invalid name"
-#~ msgstr "Ugyldigt navn"
-
 #~ msgid "Chat Error!"
 #~ msgstr "Chat-fejl!"
 
@@ -3827,9 +4765,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "Ukendt rsag"
 
-#~ msgid "AOL error"
-#~ msgstr "AOL fejl"
-
 #~ msgid "Error"
 #~ msgstr "Fejl"
 
@@ -3933,15 +4868,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "Mling af inaktiv tid:"
 
-#~ msgid "None"
-#~ msgstr "Ingen mling"
-
-#~ msgid "Gaim Use"
-#~ msgstr "Seneste brug af Gaim"
-
-#~ msgid "X Use"
-#~ msgstr "Seneste brug af X"
-
 #~ msgid "Opera"
 #~ msgstr "Opera"
 
@@ -3961,9 +4887,6 @@
 #~ "Ikke alle protokoller kan bruge en mellemvrt (proxy). Ls README-filen "
 #~ "for detaljer."
 
-#~ msgid "No Proxy"
-#~ msgstr "Ingen mellemvrt"
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -3976,12 +4899,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Udseende"
 
-#~ msgid "Tab Placement:"
-#~ msgstr "Placering af faneblade"
-
-#~ msgid "Top"
-#~ msgstr "I toppen"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Indstillinger for samtaler"
 
@@ -3997,42 +4914,18 @@
 #~ msgid "IM Options"
 #~ msgstr "Indstillinger for beskeder"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "Vis knapper som:"
-
-#~ msgid "Pictures And Text"
-#~ msgstr "Billeder og tekst"
-
-#~ msgid "Pictures"
-#~ msgstr "Billeder"
-
-#~ msgid "Text"
-#~ msgstr "Tekst"
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "Vis alle samtaler som faneblade i et vindue"
-
 #~ msgid "Window Sizes"
 #~ msgstr "Besked-vinduets strrelse"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Placering af faneblade"
 
-#~ msgid "Left"
-#~ msgstr "Til venstre"
-
-#~ msgid "Right"
-#~ msgstr "Til hjre"
-
 #~ msgid "Chat Options"
 #~ msgstr "Indstillinger for chat"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Vis samtaler som faneblade i samme vindue"
 
-#~ msgid "Font Options"
-#~ msgstr "Indstillinger for skrifttyper"
-
 #~ msgid "Italic Text"
 #~ msgstr "Kursiv tekst"
 
@@ -4066,11 +4959,5 @@
 #~ msgid "Conversations"
 #~ msgstr "Samtaler"
 
-#~ msgid "Enable sounds"
-#~ msgstr "Brug lyde"
-
 #~ msgid "KFM"
 #~ msgstr "KFM"
-
-#~ msgid "Manual"
-#~ msgstr "Andet program"
--- a/po/de.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/de.po	Sun Jan 05 23:21:50 2003 +0000
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2002-12-21 15:18+0100\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\n"
 "PO-Revision-Date: 2002-12-21 19:47+0100\n"
 "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: de <de@li.org>\n"
@@ -24,42 +24,52 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/docklet/docklet.c:92 src/multi.c:251
-msgid "Auto-login"
-msgstr "Auto-Login"
-
-#: plugins/docklet/docklet.c:117
+#: plugins/docklet/docklet.c:119
 msgid "New..."
 msgstr "Neu..."
 
-#: plugins/docklet/docklet.c:121 src/buddy.c:499 src/buddy.c:2528
-#: src/buddy.c:2658 src/prefs.c:729 src/protocols/gg/gg.c:75
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
 #: src/protocols/jabber/jabber.c:1165
 msgid "Away"
 msgstr "Abwesend"
 
-#: plugins/docklet/docklet.c:125 src/away.c:484
+#: plugins/docklet/docklet.c:129 src/away.c:485
 msgid "Back"
 msgstr "Zurück"
 
-#: plugins/docklet/docklet.c:130 src/buddy.c:2644
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+msgid "Auto-login"
+msgstr "Auto-Login"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
 msgid "Signoff"
 msgstr "Abmelden"
 
-#: plugins/docklet/docklet.c:138
+#: plugins/docklet/docklet.c:151
 msgid "Mute Sounds"
 msgstr "Klänge"
 
-#: plugins/docklet/docklet.c:143
-msgid "Accounts"
-msgstr "Konten"
-
-# "Info" ist die offizielle GNOME Übersetzung
-#: plugins/docklet/docklet.c:154
-msgid "About"
-msgstr "Info"
-
-#: plugins/docklet/docklet.c:391
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "Konten..."
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "Einstellungen..."
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "Info über Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Beenden"
+
+#: plugins/docklet/docklet.c:400
 msgid "Tray Icon Configuration"
 msgstr "Gaim - Klang-Konfiguration"
 
@@ -67,15 +77,15 @@
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
 #. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
 #. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
-#: plugins/docklet/docklet.c:400
+#: plugins/docklet/docklet.c:409
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "Verstecke neue Nachrichten bis das Docklet-Icon angeklickt wurde"
 
-#: plugins/docklet/docklet.c:412
+#: plugins/docklet/docklet.c:421
 msgid "Tray Icon"
 msgstr ""
 
-#: plugins/docklet/docklet.c:414 plugins/docklet/docklet.c:425
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
 msgid ""
 "Interacts with a System Tray applet (in GNOME or KDE, for example) to "
 "display the current status of Gaim, allow fast access to commonly used "
@@ -90,51 +100,50 @@
 "zwischenzuspeichern, bis das Icon angeklickt wurde, ähnlich wie bei ICQ "
 "(auch wenn das Icon noch nicht aufblinkt)."
 
-#: plugins/docklet/docklet.c:415
+#: plugins/docklet/docklet.c:424
 msgid "Robert McQueen &lt;robot101@debian.org>"
 msgstr ""
 
-#: plugins/docklet/docklet.c:421
+#: plugins/docklet/docklet.c:430
 msgid "System Tray Icon"
 msgstr ""
 
-#: plugins/chatlist.c:69 src/buddy_chat.c:281
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Buddy-Chat"
 
-#: plugins/chatlist.c:162 plugins/chatlist.c:164 plugins/chatlist.c:353
-#: plugins/chatlist.c:355
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:304
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "Chaträume"
 
-#: plugins/chatlist.c:316
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr "Erneuern"
 
 #. buttons
-#: plugins/chatlist.c:317 src/buddy.c:494 src/buddy.c:2756
-#: src/buddy_chat.c:908 src/buddy_chat.c:1588 src/conversation.c:2443
-#: src/conversation.c:3032 src/dialogs.c:1111 src/dialogs.c:1457
-#: src/dialogs.c:1491 src/dialogs.c:2487 src/protocols/icq/gaim_icq.c:279
-#: src/protocols/oscar/oscar.c:2135 src/prpl.c:638
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: plugins/chatlist.c:318 src/buddy.c:496 src/buddy.c:2758
-#: src/buddy_chat.c:906 src/buddy_chat.c:1590 src/conversation.c:2427
-#: src/conversation.c:3026 src/dialogs.c:1461 src/dialogs.c:1495
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Entfernen"
 
-#: plugins/chatlist.c:334
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "Liste der verfügbaren Chaträume"
 
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "Liste der abbonierten Chaträume"
 
@@ -167,8 +176,122 @@
 msgid "Change"
 msgstr "Ändern"
 
-#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:1867
-#: src/protocols/msn/msn.c:1968
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "Datei %s konnte nicht geschrieben werden."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "Nicht angemeldet"
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "Nachrichten-Fenster"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "Chat-Fenster"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "Popup-Benachrichtigung"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "Popup-Benachrichtigung"
+
+#: plugins/notify.c:609
+#, fuzzy
+msgid "Remove when conversation window gains _focus"
+msgstr "%s has das Gespräachsfenster geschlossen"
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+#, fuzzy
+msgid "Remove when _typing in conversation window"
+msgstr "%s has das Gespräachsfenster geschlossen"
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "Verbindung kann nicht hergestellt werden"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "Testen"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+#, fuzzy
+msgid "History"
+msgstr "Betrachte die History"
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "Alle Unterhaltungen in einem Reiter-Fenster zeigen"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Erreichbar"
 
@@ -220,157 +343,157 @@
 msgid "Unknown Error Code."
 msgstr "Unbekannter Fehlercode."
 
-#: src/protocols/gg/gg.c:285 src/protocols/msn/msn.c:1998
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:306
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "Konnte nicht verbinden"
 
-#: src/protocols/gg/gg.c:313
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "Socket kann nicht gelesen werden."
 
-#: src/protocols/gg/gg.c:426
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "Verbindung nicht möglich."
 
-#: src/protocols/gg/gg.c:439
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "Empfange Daten"
 
 # Hier fällt mir nichts ein (Karsten)
-#: src/protocols/gg/gg.c:442
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr ""
 
-#: src/protocols/gg/gg.c:445
-msgid "Reading server key"
-msgstr "Server-Schlüsel wird gelesen"
-
 #: src/protocols/gg/gg.c:448
+msgid "Reading server key"
+msgstr "Server-Schlüsel wird gelesen"
+
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "Schlüssel-Hash wird ausgetauscht"
 
-#: src/protocols/gg/gg.c:457
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "Kritischer Fehler in der GG-Bibliothek\n"
 
-#: src/protocols/gg/gg.c:477 src/protocols/gg/gg.c:577
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Verbindung mit %s fehlgeschlagen"
 
-#: src/protocols/gg/gg.c:528
+#: src/protocols/gg/gg.c:531
 msgid "Unable to ping server"
 msgstr "Server kann nicht angepingt werden"
 
-#: src/protocols/gg/gg.c:540
+#: src/protocols/gg/gg.c:543
 msgid "Send as message"
 msgstr "Als Nachricht senden"
 
-#: src/protocols/gg/gg.c:548
+#: src/protocols/gg/gg.c:551
 msgid "Looking up GG server"
 msgstr "Suche GG-Server"
 
-#: src/protocols/gg/gg.c:551
+#: src/protocols/gg/gg.c:554
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Es wurde eine ungültige Gadu-Gadu UIN angegeben"
 
-#: src/protocols/gg/gg.c:601
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr ""
 "Sie versuchen eine Nachricht an eine ungültige Gadu-Gadu UIN zu senden."
 
-#: src/protocols/gg/gg.c:664
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "Die Suche war ohne Ergebnis"
 
-#: src/protocols/gg/gg.c:669
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Suchmaschine"
 
-#: src/protocols/gg/gg.c:694
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "ja"
 
-#: src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "nein"
 
-#: src/protocols/gg/gg.c:699
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:703
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "Vorname"
 
-#: src/protocols/gg/gg.c:708
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "Zweiter Name"
 
-#: src/protocols/gg/gg.c:712
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "Spitzname"
 
-#: src/protocols/gg/gg.c:719 src/protocols/gg/gg.c:722
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "Geburtsjahr"
 
-#: src/protocols/gg/gg.c:728 src/protocols/gg/gg.c:730
-#: src/protocols/gg/gg.c:732
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "Geschlecht"
 
 #. Line 5
-#: src/dialogs.c:2027 src/dialogs.c:2724 src/protocols/gg/gg.c:736
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Stadt"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:771
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Auf dem Gadu-Gadu Server ist leider keine Buddy-List gespeichert."
 
-#: src/protocols/gg/gg.c:774
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Buddy-Liste konnte nicht vom Server importiert werden"
 
-#: src/protocols/gg/gg.c:821
+#: src/protocols/gg/gg.c:824
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy-Liste wurde erfolgreich zum Gadu-Gadu Server übertragen"
 
-#: src/protocols/gg/gg.c:826
+#: src/protocols/gg/gg.c:829
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Die Buddy-Liste konnte nicht zum Gadu-Gadu Server übertragen werden"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:835
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Die Buddy-Liste wurde erfolgreich vom Gadu-Gadu Server gelöscht"
 
-#: src/protocols/gg/gg.c:837
+#: src/protocols/gg/gg.c:840
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Die Buddy-Liste konnte nicht vom Gadu-Gadu Server gelöscht werden"
 
-#: src/protocols/gg/gg.c:843
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "Das Paßwort wurde erfolgreich geändert"
 
-#: src/protocols/gg/gg.c:848
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Das Paßwort konnte nicht geändert werden"
 
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Kommunikationsfehler mit dem Gadu-Gadu Server"
 
-#: src/protocols/gg/gg.c:960
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -378,11 +501,11 @@
 "Gaim konnte Ihre Anfrage wegen einens Kommunikationsfehlers mit dem Gadu-"
 "Gadu HTTP-Server nicht fertigstellen. Bitte versuchern Sie es später nochmal."
 
-#: src/protocols/gg/gg.c:987
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Konnte die Gadu-Gadu Buddyliste nicht importieren"
 
-#: src/protocols/gg/gg.c:988
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -390,27 +513,27 @@
 "Gaim konnte den Gadu-Gadu Buddy-List-Server nicht erreichen. Bitte versuchen "
 "Sie es später nochmal."
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1048
 msgid "Couldn't export buddy list"
 msgstr "Konnte Buddy-Liste nicht exportieren"
 
-#: src/protocols/gg/gg.c:1046 src/protocols/gg/gg.c:1068
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim konnte den Buddy-Listen-Server nicht erreichen. Bitte versuchen Sie es "
 "später noch einmal"
 
-#: src/protocols/gg/gg.c:1067
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Konnte die Gadu-Gadu Buddy-Liste nicht löschen"
 
 # "Direct IM"
-#: src/protocols/gg/gg.c:1115
+#: src/protocols/gg/gg.c:1118
 msgid "Unable to access directory"
 msgstr "Konnte nicht auf das Verzeichnis zugreifen"
 
-#: src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -418,11 +541,11 @@
 "Gaim konnte nicht im Verzeichnis suchen, weil es den Verzeichnis-Server "
 "nicht erreichen konnte. Bitte versuchen Sie es später nochmal."
 
-#: src/protocols/gg/gg.c:1148
+#: src/protocols/gg/gg.c:1151
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Konnte das Gadu-Gadu Paßwort nicht ändern"
 
-#: src/protocols/gg/gg.c:1149
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -430,7 +553,7 @@
 "Gaim konnte ihr Paßwort nicht ändern, weil es den Gadu-Gadu-Server nicht "
 "erreichen konnte. Bitte versuchen Sie es später nochmal."
 
-#: src/protocols/gg/gg.c:1159 src/protocols/gg/gg.c:1176
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "Verzeichnissuche"
 
@@ -438,28 +561,28 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/dialogs.c:2143 src/protocols/gg/gg.c:1161 src/protocols/gg/gg.c:1178
-#: src/protocols/jabber/jabber.c:4144 src/protocols/jabber/jabber.c:4157
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Paßwort ändern"
 
-#: src/protocols/gg/gg.c:1163 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "Buddy-Liste vom Server importieren"
 
-#: src/protocols/gg/gg.c:1165 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "Buddy-Liste zum Server exportieren"
 
-#: src/protocols/gg/gg.c:1167 src/protocols/gg/gg.c:1182
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "Löschen der Buddy-Liste vom Server"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1214
 msgid "Unable to access user profile."
 msgstr "Konnte nicht auf das Benutzerprofil zugreifen."
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -468,11 +591,11 @@
 "Verbindungsfehlers zum Verzeichnis-Server nicht lesen. Bitte versuchten Sie "
 "es später nochmal."
 
-#: src/protocols/gg/gg.c:1290
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
 msgid "Nick:"
 msgstr "Spitzname:"
 
-#: src/protocols/gg/gg.c:1291
+#: src/protocols/gg/gg.c:1294
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Benutzer"
 
@@ -481,27 +604,27 @@
 msgstr ""
 "Gaim stellte einen Fehler bei der Kommunikation mit dem ICQ-Server fest."
 
-#: src/buddy_chat.c:317 src/buddy_chat.c:401 src/dialogs.c:1115
-#: src/dialogs.c:2085 src/dialogs.c:2208 src/dialogs.c:2266 src/dialogs.c:2476
-#: src/dialogs.c:2658 src/dialogs.c:2835 src/dialogs.c:2902 src/dialogs.c:3547
-#: src/dialogs.c:3746 src/dialogs.c:3903 src/dialogs.c:4285 src/dialogs.c:4390
-#: src/dialogs.c:5132 src/multi.c:1036 src/multi.c:1135
-#: src/protocols/icq/gaim_icq.c:279 src/protocols/irc/irc.c:1288
-#: src/protocols/oscar/oscar.c:1985 src/protocols/oscar/oscar.c:4477
-#: src/protocols/toc/toc.c:1985 src/prpl.c:280 src/prpl.c:638
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
-#: src/protocols/msn/msn.c:878 src/protocols/msn/msn.c:1033
-#: src/protocols/oscar/oscar.c:2082
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
 msgid "Authorize"
 msgstr "Authorisieren"
 
-#: src/dialogs.c:2475 src/protocols/icq/gaim_icq.c:297
-#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:878
-#: src/protocols/msn/msn.c:1033 src/protocols/oscar/oscar.c:2082
-#: src/protocols/oscar/oscar.c:2135
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
 msgid "Deny"
 msgstr "Sperren"
 
@@ -509,13 +632,18 @@
 msgid "Send message through server"
 msgstr "Nachricht mittels Server senden"
 
-#: src/protocols/icq/gaim_icq.c:467 src/protocols/irc/irc.c:2638
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
 #: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
-#: src/protocols/oscar/oscar.c:4516 src/protocols/oscar/oscar.c:4568
-#: src/protocols/toc/toc.c:1257
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Benutzer-Info"
 
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Gaim-Benutzung"
+
 #: src/protocols/irc/irc.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
@@ -525,7 +653,7 @@
 "Kodierungs-Option im Acount-Editor"
 
 # Direct IM erwähnen?
-#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2348
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCC-Chat mit %s geschlossen"
@@ -534,7 +662,7 @@
 msgid "No topic is set"
 msgstr "Kein Thema gesetzt"
 
-#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1539
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s hat das Thema abgeändert auf: %s</B>"
@@ -597,14 +725,14 @@
 "Dies erfordert eine direkte Verbindung zwischen den beiden Computern. "
 "Gesendete Nachrichten werden nicht durch den IRC-Server geschleust."
 
-#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:1985
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
 msgid "Connect"
 msgstr "Verbunden"
 
-#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:276
-#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1058
-#: src/protocols/msn/msn.c:1543
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Schreiben nicht möglich"
 
@@ -618,48 +746,63 @@
 msgid "Kicked by %s: %s"
 msgstr "Hinausgeworfen durch %s: %s"
 
-#: src/protocols/irc/irc.c:1457 src/protocols/irc/irc.c:2657
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
 msgid "CTCP ClientInfo"
 msgstr "CTCP Client-Information"
 
-#: src/protocols/irc/irc.c:1463 src/protocols/irc/irc.c:2663
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
 msgid "CTCP UserInfo"
 msgstr "CTCP Benutzer-Info"
 
-#: src/protocols/irc/irc.c:1469 src/protocols/irc/irc.c:2669
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
 msgid "CTCP Version"
 msgstr "CTCP-Version"
 
-#: src/protocols/irc/irc.c:1489 src/protocols/irc/irc.c:2675
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
 msgid "CTCP Ping"
 msgstr "CTCP-Ping"
 
-#: src/protocols/irc/irc.c:1969
+#: src/protocols/irc/irc.c:1972
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "Das Thema für %s ist %s"
 
-#: src/protocols/irc/irc.c:2061
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Sie haben %s verlassen"
 
-#: src/protocols/irc/irc.c:2062
+#: src/protocols/irc/irc.c:2065
 msgid "IRC Part"
 msgstr "IRC Part"
 
-#: src/protocols/irc/irc.c:2229
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/aim.c:319 src/multi.c:637 src/protocols/irc/irc.c:2233
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Paßwort:"
 
-#: src/protocols/irc/irc.c:2644
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC-Chat"
 
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
 #: src/protocols/jabber/jabber.c:972
 msgid "Unable to change password."
 msgstr "Kann das Paßwort nicht ändern"
@@ -688,7 +831,7 @@
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/buddy.c:2791 src/multi.c:241 src/protocols/jabber/jabber.c:1167
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
 #: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Online"
@@ -732,8 +875,8 @@
 msgid "No such user."
 msgstr "Kein entsprechender Benutzer"
 
-#: src/dialogs.c:908 src/protocols/jabber/jabber.c:1757
-#: src/protocols/msn/msn.c:1068
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Buddies"
 
@@ -749,13 +892,13 @@
 msgid "Password successfully changed."
 msgstr "Das Paßwort wurde erfolgreich geändert"
 
-#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4072
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "Verbindung abgebrochen"
 
 #: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
-#: src/protocols/jabber/jabber.c:4074 src/protocols/jabber/jabber.c:4120
-#: src/protocols/msn/msn.c:1693 src/protocols/msn/msn.c:1722
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Verbindung kann nicht hergestellt werden"
 
@@ -768,7 +911,7 @@
 msgstr "Anfrage der Authentifizierungsmethode fehlgeschlagen"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1714
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
@@ -787,10 +930,6 @@
 msgid "Room:"
 msgstr "Raum:"
 
-#: src/protocols/jabber/jabber.c:2860
-msgid "Server:"
-msgstr "Server:"
-
 #: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "Kürzel:"
@@ -807,8 +946,8 @@
 msgid "View Error Msg"
 msgstr "Betrachte Fehlermeldung"
 
-#: src/buddy_chat.c:895 src/protocols/jabber/jabber.c:3246
-#: src/protocols/oscar/oscar.c:4529
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Abwesenheits-Mitteilung holen"
 
@@ -828,86 +967,86 @@
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheits-Benachrichtigun"
 
-#: src/protocols/jabber/jabber.c:3473
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: src/protocols/jabber/jabber.c:3474
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "Nachname"
 
-#: src/protocols/jabber/jabber.c:3475
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "Vorname"
 
-#: src/protocols/jabber/jabber.c:3476
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: src/dialogs.c:2915 src/protocols/jabber/jabber.c:3477
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3478
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Straße"
 
-#: src/protocols/jabber/jabber.c:3479
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
 # ???
-#: src/protocols/jabber/jabber.c:3480
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "Örtlichkeit"
 
-#: src/protocols/jabber/jabber.c:3481
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr "Bezirk"
 
-#: src/protocols/jabber/jabber.c:3482
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
 #. Line 7
-#: src/dialogs.c:2049 src/dialogs.c:2746 src/protocols/jabber/jabber.c:3483
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3484
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "Telefon"
 
 # Die offizielle GNOME-Übersetzung
-#: src/dialogs.c:2820 src/protocols/jabber/jabber.c:3485
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "E-Mail"
 
-#: src/protocols/jabber/jabber.c:3486
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
-#: src/protocols/jabber/jabber.c:3487
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
-#: src/protocols/jabber/jabber.c:3488
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3489
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr "Funktion"
 
-#: src/protocols/jabber/jabber.c:3490
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: src/dialogs.c:2923 src/prefs.c:983 src/protocols/jabber/jabber.c:3491
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/protocols/jabber/jabber.c:3516
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -915,188 +1054,188 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben möchten."
 
-#: src/protocols/jabber/jabber.c:3517
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "Benutzer Identität"
 
-#: src/protocols/jabber/jabber.c:3929
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCard bearbeiten"
 
-#: src/protocols/jabber/jabber.c:4002
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "Server-Anmeldung erfolgreich!"
 
-#: src/protocols/jabber/jabber.c:4029
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "Unbekannter Fehler bei der Anmeldung"
 
-#: src/protocols/jabber/jabber.c:4138 src/protocols/jabber/jabber.c:4153
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntaxfehler (wahrscheinlich ein Gaim Bug)"
 
-#: src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "Falscher Parameter (wahrscheinlich ein Gaim Bug)"
 
-#: src/protocols/msn/msn.c:197
+#: src/protocols/msn/msn.c:228
 msgid "Invalid User"
 msgstr "Ungültiger Name"
 
-#: src/protocols/msn/msn.c:200
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr "Der vollqualifizierte Domainname fehlt"
 
-#: src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr "Schon angemeldet"
 
-#: src/protocols/msn/msn.c:206
+#: src/protocols/msn/msn.c:237
 msgid "Invalid Username"
 msgstr "Ungültiger Benutzername"
 
-#: src/protocols/msn/msn.c:209
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Friendly Name"
 msgstr "Ungültiger Name"
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr "Vollständige Liste"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr "Schon da"
 
-#: src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:249
 msgid "Not on list"
 msgstr "Nicht in der Liste"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr "Benutzer ist offline"
 
-#: src/protocols/msn/msn.c:224
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr "Schon in diesem Mode"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr "Schon in der \"Gegenteil-Liste\""
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr "Vermittlung gescheitert"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr "Transfer der Benachrichtigung gescheitert"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr "Notwendige Felder fehlen"
 
-#: src/protocols/msn/msn.c:240 src/protocols/oscar/oscar.c:390
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
-#: src/protocols/msn/msn.c:244
+#: src/protocols/msn/msn.c:275
 msgid "Internal server error"
 msgstr "Interner Server-Fehler"
 
-#: src/protocols/msn/msn.c:247
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr "Fehler des Datenbank-Servers"
 
-#: src/protocols/msn/msn.c:250
+#: src/protocols/msn/msn.c:281
 msgid "File operation error"
 msgstr "Dateiverarbeitungsfehler"
 
-#: src/protocols/msn/msn.c:253
+#: src/protocols/msn/msn.c:284
 msgid "Memory allocation error"
 msgstr "Fehler bei der Speicheranforderung"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:288
 msgid "Server busy"
 msgstr "Server beschäftigt"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:291
 msgid "Server unavailable"
 msgstr "Server unerreichbar"
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr "Peer-Benachrichtung Server unten"
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:297
 msgid "Database connect error"
 msgstr "Datenbank-Verbindungsfehler"
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr "Server fährt runter (verlassen Sie das \"Schiff\")"
 
-#: src/protocols/msn/msn.c:273
+#: src/protocols/msn/msn.c:304
 msgid "Error creating connection"
 msgstr "Fehler beim Herstellen der Verbindung"
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr "Sitzung überlastet"
 
-#: src/protocols/msn/msn.c:282
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr "Benutzer ist zu aktiv"
 
-#: src/protocols/msn/msn.c:285
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr "Zu viele Sitzungen"
 
-#: src/protocols/msn/msn.c:288
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr "Nicht erwartet"
 
-#: src/protocols/msn/msn.c:291
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr "Falsche Friends-Datei"
 
-#: src/protocols/msn/msn.c:295
+#: src/protocols/msn/msn.c:326
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen."
 
-#: src/protocols/msn/msn.c:298
+#: src/protocols/msn/msn.c:329
 msgid "Not allowed when offline"
 msgstr "Nicht erlaubt im Offline-Modus"
 
-#: src/protocols/msn/msn.c:301
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr "Akzeptiert keine neuen Benutzer"
 
-#: src/protocols/msn/msn.c:304
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr "Benutzer wurde nicht überprüft"
 
-#: src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:338
 msgid "Unknown Error Code"
 msgstr "Unbekannter Fehlercode."
 
-#: src/protocols/msn/msn.c:453
+#: src/protocols/msn/msn.c:491
 #, c-format
 msgid "%s has closed the conversation window"
 msgstr "%s has das Gespräachsfenster geschlossen"
 
-#: src/protocols/msn/msn.c:524
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr "Eine MSN-Nachricht wurde vielleicht nicht empfangen"
 
-#: src/protocols/msn/msn.c:773
+#: src/protocols/msn/msn.c:1041
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim konnte keine MSN-Nachricht senden"
 
-#: src/protocols/msn/msn.c:774
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
@@ -1104,166 +1243,171 @@
 "Gaim stellte einen Fehler bei der Kommunikation mit dem MSN-"
 "Vermittlungsserver fest. Bitte probieren Sie es später nochmal."
 
-#: src/protocols/msn/msn.c:807 src/protocols/msn/msn.c:826
-#: src/protocols/msn/msn.c:1797 src/protocols/msn/msn.c:1915
-#: src/protocols/msn/msn.c:1933 src/protocols/msn/msn.c:2033
-#: src/protocols/msn/msn.c:2046 src/protocols/msn/msn.c:2072
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2147
-#: src/protocols/msn/msn.c:2182 src/protocols/msn/msn.c:2216
-#: src/protocols/msn/msn.c:2257 src/protocols/msn/msn.c:2264
-#: src/protocols/msn/msn.c:2277 src/protocols/msn/msn.c:2285
-#: src/protocols/msn/msn.c:2314 src/protocols/msn/msn.c:2323
-#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2344
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
 msgid "Write error"
 msgstr "Schreibfehler"
 
-#: src/protocols/msn/msn.c:875
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Der Benutzer %s (%s) möchte %s zu seiner Buddyliste hinzufügen"
 
-#: src/protocols/msn/msn.c:925 src/protocols/msn/msn.c:1700
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
 msgid "Unable to write to server"
 msgstr "Kann nicht an den Server senden"
 
-#: src/protocols/msn/msn.c:1032
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "Der Benutzer %s (%s) möchte Dich zu seiner Buddyliste hinzufügen"
 
-#: src/protocols/msn/msn.c:1133
+#: src/protocols/msn/msn.c:1401
 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:1268 src/protocols/msn/msn.c:1584
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
 msgid "Got invalid XFR\n"
 msgstr "Bekam falsches XFR\n"
 
-#: src/protocols/msn/msn.c:1308
+#: src/protocols/msn/msn.c:1576
 msgid "Error transfering"
 msgstr "Fehler beim transferieren"
 
-#: src/protocols/msn/msn.c:1392 src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 msgid "Error reading from server"
 msgstr "Fehler beim Empfangen vom Server"
 
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1744
 msgid "Unable to connect to Notification Server"
 msgstr "Verbindung zum Benachrichtungsserver nicht möglich."
 
-#: src/protocols/msn/msn.c:1483
+#: src/protocols/msn/msn.c:1751
 msgid "Unable to talk to Notification Server"
 msgstr "Kann nicht mit dem Benachrichtungsserver kommunizieren"
 
-#: src/protocols/msn/msn.c:1499
+#: src/protocols/msn/msn.c:1767
 msgid "Protocol not supported"
 msgstr "Protokoll wird nicht unterstützt"
 
 # "Direct IM"
-#: src/protocols/msn/msn.c:1506
+#: src/protocols/msn/msn.c:1774
 msgid "Unable to request INF\n"
 msgstr "Kann INF nicht abfragen\n"
 
-#: src/protocols/msn/msn.c:1513
+#: src/protocols/msn/msn.c:1781
 msgid "Unable to login using MD5"
 msgstr "Kann nicht mit MD5 anmelden"
 
-#: src/protocols/msn/msn.c:1520
+#: src/protocols/msn/msn.c:1788
 msgid "Unable to send USR\n"
 msgstr "Kann USR nicht senden\n"
 
-#: src/protocols/msn/msn.c:1525
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr "Nachfrage zum Senden des Paßwortes"
 
-#: src/protocols/msn/msn.c:1571
+#: src/protocols/msn/msn.c:1839
 msgid "Unable to send password"
 msgstr "Kann das Paßwort nicht senden"
 
-#: src/protocols/msn/msn.c:1576
+#: src/protocols/msn/msn.c:1844
 msgid "Password sent"
 msgstr "Paßwort gesendet"
 
-#: src/protocols/msn/msn.c:1605
+#: src/protocols/msn/msn.c:1873
 msgid "Unable to transfer"
 msgstr "Kann nicht übertragen"
 
-#: src/protocols/msn/msn.c:1613
+#: src/protocols/msn/msn.c:1881
 msgid "Unable to parse message"
 msgstr "Kann die Nachricht nicht parsen"
 
-#: src/protocols/msn/msn.c:1706
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr "Synchronisiere mit dem Server"
 
-#: src/protocols/msn/msn.c:1868 src/protocols/msn/msn.c:1892
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr "Weg vom Computer"
 
-#: src/protocols/msn/msn.c:1869 src/protocols/msn/msn.c:1894
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr "Komme gleich wieder"
 
-#: src/protocols/msn/msn.c:1870 src/protocols/msn/msn.c:1896
-#: src/protocols/msn/msn.c:1956
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: src/protocols/msn/msn.c:1871 src/protocols/msn/msn.c:1898
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr "Am Telefon"
 
-#: src/protocols/msn/msn.c:1872 src/protocols/msn/msn.c:1900
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr "Beim Essen"
 
-#: src/protocols/msn/msn.c:1873 src/protocols/msn/msn.c:1902
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: src/protocols/msn/msn.c:1958
+#: src/protocols/msn/msn.c:2428
 msgid "Be right back"
 msgstr "Komme gleich wieder"
 
-#: src/protocols/msn/msn.c:1960
+#: src/protocols/msn/msn.c:2430
 msgid "Away from the computer"
 msgstr "Nicht am Computer"
 
-#: src/protocols/msn/msn.c:1962
+#: src/protocols/msn/msn.c:2432
 msgid "On the phone"
 msgstr "Am Telefon"
 
-#: src/protocols/msn/msn.c:1964
+#: src/protocols/msn/msn.c:2434
 msgid "Out to lunch"
 msgstr "Beim Essen"
 
-#: src/prefs.c:746 src/protocols/msn/msn.c:1966
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
 msgid "Idle"
 msgstr "Inaktiv"
 
-#: src/protocols/msn/msn.c:1989
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr "Benutzername zurücksetzen"
 
-#: src/protocols/msn/msn.c:2065
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "Datei versenden"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr "Neuer MSN-Benutzername zu lang"
 
-#: src/protocols/msn/msn.c:2080 src/protocols/msn/msn.c:2101
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 msgid "Set Friendly Name"
 msgstr "Setze Name"
 
-#: src/protocols/msn/msn.c:2081
+#: src/protocols/msn/msn.c:2571
 msgid "Set Friendly Name:"
 msgstr "Setze Benutzername:"
 
-#: src/protocols/msn/msn.c:2082 src/protocols/msn/msn.c:2102
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr "Zurücksetzen aller Benutzernamen"
 
-#: src/protocols/msn/msn.c:2242
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1273,11 +1417,11 @@
 "Vielleicht meinten Sie %s@hotmail.com. An Ihrer Liste der erlaubten Benutzer "
 "wurden keine Änderungen vorgenommen."
 
-#: src/protocols/msn/msn.c:2245 src/protocols/msn/msn.c:2302
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 msgid "Invalid MSN screenname"
 msgstr "Ungültiger MSN-Screenname"
 
-#: src/protocols/msn/msn.c:2299
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1287,195 +1431,195 @@
 "Vielleicht meinten Sie %s@hotmail.com. An Ihrer Liste der blockierten "
 "Benutzer wurden keine Änderungen vorgenommen."
 
-#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4041
-#: src/protocols/toc/toc.c:1142
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "An welcher Gruppe teilnehmen:"
 
-#: src/protocols/oscar/oscar.c:386
+#: src/protocols/oscar/oscar.c:394
 msgid "Invalid error"
 msgstr "Ungültiger Name"
 
-#: src/protocols/oscar/oscar.c:387
+#: src/protocols/oscar/oscar.c:395
 msgid "Invalid SNAC"
 msgstr "Ungültiger SNAC"
 
-#: src/protocols/oscar/oscar.c:388
+#: src/protocols/oscar/oscar.c:396
 msgid "Rate to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:389
+#: src/protocols/oscar/oscar.c:397
 msgid "Rate to client"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:391
+#: src/protocols/oscar/oscar.c:399
 msgid "Service unavailable"
 msgstr "Server unerreichbar"
 
-#: src/protocols/oscar/oscar.c:392
+#: src/protocols/oscar/oscar.c:400
 msgid "Service not defined"
 msgstr "Dienst nicht definiert"
 
-#: src/protocols/oscar/oscar.c:393
+#: src/protocols/oscar/oscar.c:401
 msgid "Obsolete SNAC"
 msgstr "Obsoleteter SNAC"
 
-#: src/protocols/oscar/oscar.c:394
+#: src/protocols/oscar/oscar.c:402
 msgid "Not supported by host"
 msgstr "Nicht unterstützt vom Host"
 
-#: src/protocols/oscar/oscar.c:395
+#: src/protocols/oscar/oscar.c:403
 msgid "Not supported by client"
 msgstr "Nicht unterstützt vom Client"
 
-#: src/protocols/oscar/oscar.c:396
+#: src/protocols/oscar/oscar.c:404
 msgid "Refused by client"
 msgstr "Abgelehnt vom Client"
 
-#: src/protocols/oscar/oscar.c:397
+#: src/protocols/oscar/oscar.c:405
 msgid "Reply too big"
 msgstr "Ergebnis zu groß"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:406
 msgid "Responses lost"
 msgstr "Antwort verloren"
 
-#: src/protocols/oscar/oscar.c:399
+#: src/protocols/oscar/oscar.c:407
 msgid "Request denied"
 msgstr "Anfrage verweigert"
 
-#: src/protocols/oscar/oscar.c:400
+#: src/protocols/oscar/oscar.c:408
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:401
+#: src/protocols/oscar/oscar.c:409
 msgid "Insufficient rights"
 msgstr "Ungenügende Rechte"
 
-#: src/protocols/oscar/oscar.c:402
+#: src/protocols/oscar/oscar.c:410
 msgid "In local permit/deny"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:411
 msgid "Too evil (sender)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:404
+#: src/protocols/oscar/oscar.c:412
 msgid "Too evil (receiver)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:405
+#: src/protocols/oscar/oscar.c:413
 msgid "User temporarily unavailable"
 msgstr "Benutzer ist temporär nicht verfügbar"
 
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:414
 msgid "No match"
 msgstr "Keine Übereinstimmung"
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:415
 msgid "List overflow"
 msgstr "Listenüberlauf"
 
-#: src/protocols/oscar/oscar.c:408
+#: src/protocols/oscar/oscar.c:416
 msgid "Request ambiguous"
 msgstr "Anfrage ist nicht eindeutig"
 
-#: src/protocols/oscar/oscar.c:409
+#: src/protocols/oscar/oscar.c:417
 msgid "Queue full"
 msgstr "Warteschlange voll"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:418
 msgid "Not while on AOL"
 msgstr ""
 
 # Direct IM erwähnen?
-#: src/protocols/oscar/oscar.c:454
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direkte Verbindung zu %s geschlossen"
 
 # Direct IM erwähnen?
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direkte Verbindung mit %s fehlgeschlagen"
 
-#: src/protocols/oscar/oscar.c:494
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/protocols/oscar/oscar.c:505
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "Schwerwiegender Verbindungsfehler!\n"
 
-#: src/protocols/oscar/oscar.c:506 src/protocols/toc/toc.c:554
-#: src/protocols/toc/toc.c:567 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Verbindung unterbrochen"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/toc/toc.c:804
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Die Verbindung zum Raum %s wurde unterbrochen"
 
-#: src/protocols/oscar/oscar.c:531
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Chat ist momentan nicht möglich."
 
-#: src/protocols/oscar/oscar.c:552 src/protocols/oscar/oscar.c:1860
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
 msgid "Buddy canceled transfer"
 msgstr "Buddy brach den Transfer ab"
 
-#: src/protocols/oscar/oscar.c:603 src/protocols/oscar/oscar.c:664
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Keine Verbindung zum Host"
 
-#: src/protocols/oscar/oscar.c:611
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Paßwort wurde übertragen. Warte auf Antwort\n"
 
-#: src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "Interner Verbindungsfehler\n"
 
-#: src/protocols/oscar/oscar.c:646
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Anmeldung nicht möglich"
 
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: src/protocols/oscar/oscar.c:733
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Abgemeldet.\n"
 
-#: src/protocols/oscar/oscar.c:752 src/protocols/oscar/oscar.c:899
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Verbinden nicht möglich"
 
-#: src/protocols/oscar/oscar.c:760
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Verbindung hergestellt. Cookie gesendet"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:801 src/protocols/toc/toc.c:502
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Ungültiger Benutzername oder Paßwort."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:806
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:810
+#: src/protocols/oscar/oscar.c:819
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Der AOL-Instant Messenger Dienst ist zur Zeit nicht erreichbar."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:814
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1485,22 +1629,22 @@
 "noch länger warten"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:819
+#: src/protocols/oscar/oscar.c:828
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Die Client-Version, die Sie nutzen ist zu alt. Bitte updaten Sie unter %s"
 
-#: src/protocols/oscar/oscar.c:824 src/protocols/toc/toc.c:585
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Legitimation fehlgeschlagen"
 
-#: src/protocols/oscar/oscar.c:846
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
-#: src/protocols/oscar/oscar.c:938 src/protocols/oscar/oscar.c:965
-#: src/protocols/oscar/oscar.c:1049
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -1509,36 +1653,36 @@
 "Die Verbindung kann schnell unterbrochen werden. Vielleicht wollen Sie TOC "
 "benutzen bis dieser Fehler behoben wurde. Prüfen Sie %s für Updates."
 
-#: src/protocols/oscar/oscar.c:940 src/protocols/oscar/oscar.c:967
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim konnte keinen gültigen AIM Login-Hash bekommen"
 
-#: src/protocols/oscar/oscar.c:1051
+#: src/protocols/oscar/oscar.c:1061
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim konnte keinen gültigen AIM Login-Hash bekommen."
 
-#: src/protocols/oscar/oscar.c:1489 src/protocols/oscar/oscar.c:4343
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte Verbindung mit %s hergestellt"
 
-#: src/protocols/oscar/oscar.c:1599
+#: src/protocols/oscar/oscar.c:1609
 msgid "Transfer timed out"
 msgstr "Zeitüberschreitung beim Transfer"
 
-#: src/protocols/oscar/oscar.c:1621
+#: src/protocols/oscar/oscar.c:1631
 msgid "Couldn't open listener to send file"
 msgstr "Konnte keinen Listener bekommen, um die Datei zu senden"
 
-#: src/protocols/oscar/oscar.c:1622
+#: src/protocols/oscar/oscar.c:1632
 msgid "File transfer aborted"
 msgstr "Dateitransfer wurde abgebrochen"
 
-#: src/protocols/oscar/oscar.c:1813 src/protocols/oscar/oscar.c:1829
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
 msgid "(There was an error receiving this message)"
 msgstr "(Es gab einen Fehler beim Erhalten dieser Nachricht)"
 
-#: src/protocols/oscar/oscar.c:1985
+#: src/protocols/oscar/oscar.c:2020
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -1548,7 +1692,7 @@
 "notwendig für IM-Bilder. Da Ihre IP-Adresse verwendet wird, kann dies eine "
 "Verletzung der Privatsphäre bedeuten."
 
-#: src/protocols/oscar/oscar.c:2078
+#: src/protocols/oscar/oscar.c:2116
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason: %"
@@ -1557,15 +1701,15 @@
 "Der Benutzer %lu möchte Sie zu seiner Buddy-Liste aus folgendem Grund "
 "hinzufügen: %s"
 
-#: src/protocols/oscar/oscar.c:2078 src/protocols/oscar/oscar.c:2089
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
 msgid "No reason given."
 msgstr "Kein Grund angegeben"
 
-#: src/protocols/oscar/oscar.c:2082
+#: src/protocols/oscar/oscar.c:2120
 msgid "Authorization Request"
 msgstr "Authorisierungsanfrage"
 
-#: src/protocols/oscar/oscar.c:2089
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1576,19 +1720,19 @@
 "wegen dem folgenden Grund abgelehnt:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2090
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr "ICQ-Authentifizierung notwendig"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2096
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "Der Benutzer %lu hat Ihnen erlaubt, daß Sie ihn zu Ihrer Kontaktliste "
 "hinzufügen"
 
-#: src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:2141
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -1601,7 +1745,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2111
+#: src/protocols/oscar/oscar.c:2149
 #, c-format
 msgid ""
 "You have received an ICQ email\n"
@@ -1622,204 +1766,190 @@
 "5=%s\n"
 "6=%s\n"
 
-#: src/protocols/oscar/oscar.c:2131
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "Der ICQ-Benutzer %lu hat Ihnen einen Kontakt geschickt: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2135
+#: src/protocols/oscar/oscar.c:2174
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "Möchten Sie diesen Kontakt zu Ihrer Buddy-List hinzufügen?"
 
-#: src/protocols/oscar/oscar.c:2214
-#, c-format
-msgid "You missed %d message from %s because it was invalid."
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
 msgstr "Sie haben %d Nachricht von %s verpasst, da sie ungültig war."
 
-#: src/protocols/oscar/oscar.c:2215
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da sie ungültig waren."
 
-#: src/protocols/oscar/oscar.c:2224
-#, c-format
-msgid "You missed %d message from %s because it was too large."
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu 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:2225
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu 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:2234
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu 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:2235
-#, c-format
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr ""
 "Sie haben %d Nachrichten von %s verpasst, da die Senderate überschritten "
 "wurde."
 
-#: src/protocols/oscar/oscar.c:2244
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr "Sie haben %d Nachricht von %s verpasst, da sie zu boshaft war."
+
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
 msgstr "Sie haben %d Nachricht von %s verpasst, da sie zu boshaft war."
 
 # ???
-#: src/protocols/oscar/oscar.c:2245
-#, 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:2254
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu 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:2255
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu 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:2263
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Sie haben %d Nachricht von %s aus unbekannten Gründen verpasst."
 
-#: src/protocols/oscar/oscar.c:2264
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Sie haben %d Nachricht von %s aus unbekannten Gründen verpasst."
 
-#: src/protocols/oscar/oscar.c:2305
+#: src/protocols/oscar/oscar.c:2342
 #, c-format
 msgid "%s has declined to receive a file from %s.\n"
 msgstr "%s hat es abgelehnt eine Datei von %s zu empfangen.\n"
 
-#: src/protocols/oscar/oscar.c:2362
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2364
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2396
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC hat den Fehler: %s\n"
 
-#: src/protocols/oscar/oscar.c:2397
+#: src/protocols/oscar/oscar.c:2446
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/protocols/oscar/oscar.c:2420 src/protocols/oscar/oscar.c:2428
-#: src/protocols/oscar/oscar.c:2480
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 msgid "No reason was given."
 msgstr "Kein Grund wurde angegeben"
 
 #. Data is assumed to be the destination sn.
-#: src/protocols/oscar/oscar.c:2427
+#: src/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Ihre Nachricht zu %s wurde nicht gesendet:"
 
-#: src/protocols/oscar/oscar.c:2479
+#: src/protocols/oscar/oscar.c:2528
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Benutzerinformationen für %s sind nicht verfügbar:"
 
-#: src/buddy.c:2173 src/protocols/oscar/oscar.c:2509
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
 
-#: src/buddy.c:2176 src/protocols/oscar/oscar.c:2512
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Stimme"
 
-#: src/buddy.c:2179 src/protocols/oscar/oscar.c:2515
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "IM Bild"
 
-#: src/buddy.c:500 src/buddy.c:2182 src/buddy.c:2527
-#: src/protocols/oscar/oscar.c:2518
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2185 src/protocols/oscar/oscar.c:2521
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Datei holen"
 
-#: src/buddy.c:2188 src/protocols/oscar/oscar.c:2524
-#: src/protocols/oscar/oscar.c:4542
-msgid "Send File"
-msgstr "Datei versenden"
-
-#: src/buddy.c:2192 src/protocols/oscar/oscar.c:2528
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Spiele"
 
-#: src/buddy.c:2195 src/protocols/oscar/oscar.c:2531
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Bestände"
 
-#: src/buddy.c:2198 src/protocols/oscar/oscar.c:2534
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Buddy-Liste senden"
 
-#: src/buddy.c:2201 src/protocols/oscar/oscar.c:2537
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/buddy.c:2204 src/protocols/oscar/oscar.c:2540
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "AP Benutzer"
 
-#: src/buddy.c:2207 src/protocols/oscar/oscar.c:2543
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2210 src/protocols/oscar/oscar.c:2546
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/buddy.c:2213 src/protocols/oscar/oscar.c:2549
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/buddy.c:2216 src/protocols/oscar/oscar.c:2552
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ Unbekannt"
 
-#: src/buddy.c:2219 src/protocols/oscar/oscar.c:2555
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Trillian Verschlüsselung"
 
-#: src/protocols/oscar/oscar.c:2593
+#: src/protocols/oscar/oscar.c:2655
 msgid ""
-"<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>"
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
 msgstr ""
-"<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 "
-"Geräts<br>"
-
-#: src/protocols/oscar/oscar.c:2621
+
+#: src/protocols/oscar/oscar.c:2677
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -1832,27 +1962,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:2653
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>Benutzer hat keine Abwesenheits-Mitteilung</i>"
 
-#: src/protocols/oscar/oscar.c:2665
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Client-Fähigkeiten: "
 
-#: src/protocols/oscar/oscar.c:2673
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Keine Information bereitgestellt</i>"
 
-#: src/protocols/oscar/oscar.c:2696
+#: src/protocols/oscar/oscar.c:2751
 msgid "Your AIM connection may be lost."
 msgstr "Ihre AIM-Verbindung kann unterbrochen sein"
 
-#: src/protocols/oscar/oscar.c:2954
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr "Datenrate-Limitierungsfehler"
 
-#: src/protocols/oscar/oscar.c:2955
+#: src/protocols/oscar/oscar.c:3011
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -1860,15 +1990,15 @@
 "Die letzte Nachricht wurde nicht verschickt, da die Senderate überschritten "
 "wurde. Bitte warten Sie 10 Sekunden und versuchen Sie es erneut."
 
-#: src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3463
 msgid "Account Confirmation Requested"
 msgstr "Kontobestätigung wurde angefragt"
 
-#: src/protocols/oscar/oscar.c:3348
+#: src/protocols/oscar/oscar.c:3490
 msgid "Error Changing Account Info"
 msgstr "Fehler beim Ändern der Account-Information"
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3493
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1877,7 +2007,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name vom "
 "Original abweicht."
 
-#: src/protocols/oscar/oscar.c:3354
+#: src/protocols/oscar/oscar.c:3496
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1886,7 +2016,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name mit "
 "einem Leerzeichen endet."
 
-#: src/protocols/oscar/oscar.c:3357
+#: src/protocols/oscar/oscar.c:3499
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1895,7 +2025,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name zu "
 "lang ist."
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3502
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -1904,7 +2034,7 @@
 "Error 0x%04x: Kann den Benutzernamen nicht formatieren, weil er schon durch "
 "eine andere Anfrage geändert wird."
 
-#: src/protocols/oscar/oscar.c:3363
+#: src/protocols/oscar/oscar.c:3505
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -1913,7 +2043,7 @@
 "Fehler 0x%04x: Kann die E-Mailadresse nicht ändern, weil es schon zu viele E-"
 "Mailadressen gibt, die zum Benutzernamen gehören."
 
-#: src/protocols/oscar/oscar.c:3366
+#: src/protocols/oscar/oscar.c:3508
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -1922,12 +2052,12 @@
 "Fehler 0x%04x: Kann die E-Mailadresse nicht ändern, weil die angegebene "
 "Adresse falsch ist."
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3511
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fehler 0x%04x: Unbekannter Fehler."
 
-#: src/protocols/oscar/oscar.c:3379
+#: src/protocols/oscar/oscar.c:3521
 #, c-format
 msgid ""
 "Your screen name is currently formated as follows:\n"
@@ -1936,20 +2066,20 @@
 "Ihre Benutzername wird zur Zeit wie folgt formatiert:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3380 src/protocols/oscar/oscar.c:3386
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
 msgid "Account Info"
 msgstr "Konto-Info"
 
-#: src/protocols/oscar/oscar.c:3385
+#: src/protocols/oscar/oscar.c:3527
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Die E-Mail-Adresse für %s ist %s"
 
-#: src/protocols/oscar/oscar.c:3603
+#: src/protocols/oscar/oscar.c:3720
 msgid "Unable to set AIM profile."
 msgstr "Kann der AIM-Profil nicht setzen"
 
-#: src/protocols/oscar/oscar.c:3604
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -1959,7 +2089,7 @@
 "Anmeldeprozedur abgeschlossen war. Das Profil bleibt ungesetzt. Versuchen "
 "Sie es wieder, wenn Sie vollständig verbunden sind."
 
-#: src/protocols/oscar/oscar.c:3610
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
@@ -1968,11 +2098,11 @@
 "Die maximale Profilgröße von %d Bytes wurde überschritten. Gaim hat das "
 "Profil abgeschnitten und es so gesetzt."
 
-#: src/protocols/oscar/oscar.c:3633
+#: src/protocols/oscar/oscar.c:3764
 msgid "Unable to set AIM away message."
 msgstr "Konnte keine AIM Abwesenheitsmeldung setzen"
 
-#: src/protocols/oscar/oscar.c:3634
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -1982,7 +2112,7 @@
 "bevor die Anmeldeprozedur abgeschlossen war. Sie bleiben im Anwesent-Status. "
 "Versuchen Sie es wieder, wenn Sie vollständig verbunden sind."
 
-#: src/protocols/oscar/oscar.c:3649
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
@@ -1991,7 +2121,7 @@
 "Die Abwesenheitsnachricht hat die Größe von %d Bytes überschritten. Gaim hat "
 "die Nachricht abgeschnitten und hat Sie abwesend gesetzt."
 
-#: src/protocols/oscar/oscar.c:4024
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -2002,21 +2132,21 @@
 "einige Buddies nicht als Online angezeigt."
 
 # Ich bin mir nicht sicher was "Exchange" hier genau bedeutet.
-#: src/protocols/oscar/oscar.c:4045 src/protocols/toc/toc.c:1146
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Austausch:"
 
 # "Direct IM"
-#: src/protocols/oscar/oscar.c:4466
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Direkte Verbindung nicht möglich"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4620
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Sie haben eine direkte IM-Verbindung mit %s ausgewählt."
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4621
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -2024,7 +2154,7 @@
 "Da dies Ihre IP-Adresse sichtbar macht, kann es als Verletzung der "
 "Privatsphäre bertrachtet werden. Möchten Sie fortsetzen?"
 
-#: src/protocols/oscar/oscar.c:4491
+#: src/protocols/oscar/oscar.c:4635
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
@@ -2033,7 +2163,7 @@
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote-Client unterstützt "
 "nicht das senden von Status-Nachrichten.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4498
+#: src/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
@@ -2042,121 +2172,121 @@
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Benutzer hat keine Status-"
 "Nachricht</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4523
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "Abwesenheits-Mitteilung holen"
 
-#: src/protocols/oscar/oscar.c:4536
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: src/protocols/oscar/oscar.c:4550
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Fähigkeiten holen"
 
-#: src/protocols/toc/toc.c:441
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Datei %s konnte nicht geschrieben werden."
 
-#: src/protocols/toc/toc.c:444
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Datei %s konnte nicht gelesen werden."
 
-#: src/protocols/toc/toc.c:447
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Nachricht zu lange, letzten %s Bytes abgeschnitten."
 
-#: src/protocols/toc/toc.c:450
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ist zur Zeit nicht online."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Verwarnung von %s nicht erlaubt."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Eine Nachricht ging verloren. Sie überschreiten die Geschwindigkeitsgrenze "
 "des Servers."
 
-#: src/protocols/toc/toc.c:459
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s ist nicht möglich."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu groß war."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu schnell gesendet "
 "wurde."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "Fehler."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "Zu viele Übereinstimmungen."
 
-#: src/protocols/toc/toc.c:477
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "Benötige mehr Angaben."
 
-#: src/protocols/toc/toc.c:480
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "Verzeichnis-Dienst ist zur Zeit nicht verfügbar."
 
-#: src/protocols/toc/toc.c:483
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "eMail-Suche eingeschränkt."
 
-#: src/protocols/toc/toc.c:486
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Stichwort ignoriert."
 
-#: src/protocols/toc/toc.c:489
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "Keine Stichwörter."
 
-#: src/protocols/toc/toc.c:492
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "Der Benutzer hat kein Profil."
 
-#: src/protocols/toc/toc.c:496
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "Land nicht unterstützt."
 
-#: src/protocols/toc/toc.c:499
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Unbekannter Fehler: %s."
 
-#: src/protocols/toc/toc.c:505
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "Der Dienst ist zur Zeit nicht erreichbar."
 
-#: src/protocols/toc/toc.c:508
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "Ihre Warn-Stufe ist zur Zeit zu hoch, um sich anzumelden."
 
-#: src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:512
 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."
@@ -2164,38 +2294,38 @@
 "Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
 "versuchen Sie es erneut."
 
-#: src/protocols/toc/toc.c:514
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Unbekannter Anmeldungsfehler: %s."
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Unbekannter Fehler '%d' aufgetreten. Info: %s"
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "Verbindung geschlossen"
 
-#: src/protocols/toc/toc.c:572
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "Auf die Antwort warten..."
 
-#: src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC ist von seiner Pause zurückgekehrt. Sie können wieder Nachrichten senden."
 
-#: src/protocols/toc/toc.c:825
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "Paßwort-Änderung erfolgreich"
 
-#: src/protocols/toc/toc.c:828
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC hat ein Pause-Kommando gesendet."
 
-#: src/protocols/toc/toc.c:828
+#: src/protocols/toc/toc.c:829
 msgid ""
 "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 "
@@ -2206,44 +2336,58 @@
 "senden. Gaim verhindert jetzt, daß Nachrichten durchgehen. Dies ist nur "
 "temporär, bitte haben Sie Geduld."
 
-#: src/protocols/toc/toc.c:1263
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "Verzeichnis Information holen"
 
-#: src/protocols/toc/toc.c:1654 src/protocols/toc/toc.c:1696
-#: src/protocols/toc/toc.c:1901
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "Port"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "Übertragungsverbindung konnte nicht hergestellt werden!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 msgid "Could not connect for transfer."
 msgstr "Übertragungsverbindung konnte nicht hergestellt werden!"
 
-#: src/protocols/toc/toc.c:1815
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "Übertragungsverbindung konnte nicht hergestellt werden!"
 
-#: src/protocols/toc/toc.c:1845
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "Konnte keinen Datei-Kopf schreiben. Die Datei wurde nicht übermittelt. "
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - Speichern unter..."
 
-#: src/protocols/toc/toc.c:1977
+#: src/protocols/toc/toc.c:1979
 #, 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:1978
+#: src/protocols/toc/toc.c:1980
 #, 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:1983
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s bittet Sie eine Datei zu senden"
 
-#: src/protocols/toc/toc.c:1985 src/prpl.c:276
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
 msgid "Accept"
 msgstr "Akzeptieren"
 
@@ -2251,20 +2395,28 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt."
 
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
 # ???
 #: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:873
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "Instanz:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "Empfänger:"
 
@@ -2274,7 +2426,7 @@
 msgid "About Gaim v%s"
 msgstr "Info zu Gaim v%s"
 
-#: src/about.c:111
+#: src/about.c:112
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -2284,36 +2436,58 @@
 "IRC, Jabber, Napster, Zephy und Gadu-Gadu unterstützt. Gaim ist mit Gtk+ "
 "geschrieben und steht unter der GPL.<BR><BR>"
 
-#: src/about.c:125
+#: src/about.c:122
+#, fuzzy
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr ""
+"\n"
+"\n"
+"IRC: #gaim auf irc.freenode.net"
+
+#: src/about.c:126
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Aktive Entwickler:</FONT><BR>"
 
-#: src/about.c:135
+#: src/about.c:128
+msgid ""
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Verrückte Patchschreiber:</FONT><BR>"
 
-#: src/about.c:143
+#: src/about.c:144
 msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Win32 Portierung:</FONT><BR>"
 
-#: src/about.c:150
+#: src/about.c:151
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Zurückgetretene Entwickler:</FONT><BR>"
 
-#: src/about.c:173 src/dialogs.c:1506 src/dialogs.c:4169 src/prpl.c:493
-#: src/prpl.c:740 src/server.c:1144
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
 msgid "Close"
 msgstr "Schließen"
 
-#: src/aim.c:159
+#: src/aim.c:165
 msgid "Please enter your login."
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:278
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Anmeldung"
 
-#: src/aim.c:301
+#: src/aim.c:307
 msgid "Screen Name:"
 msgstr "Benutzername: "
 
@@ -2321,38 +2495,38 @@
 msgid "Gaim - Away!"
 msgstr "Gaim - Ich bin abwesend!"
 
-#: src/away.c:234
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "Ich bin zurück"
 
-#: src/away.c:352
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/away.c:372
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "Abwesenheits-Mitteilung löschen"
 
-#: src/away.c:560
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Alle auf Abwesend setzen"
 
-#: src/buddy.c:495 src/buddy.c:2757 src/dialogs.c:1090
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2525
-#: src/buddy_chat.c:869
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "Nachricht"
 
-#: src/buddy.c:502 src/buddy.c:2526 src/buddy_chat.c:886 src/buddy_chat.c:1597
-#: src/conversation.c:3051
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1082 src/dialogs.c:3732
-#: src/dialogs.c:3745
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
@@ -2380,26 +2554,31 @@
 msgid "Remove Buddy Pounce"
 msgstr "Buddy-Alarm entfernen"
 
-#: src/buddy.c:1729
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 Nachricht)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[Zum Bearbeiten anklicken]"
 
-#: src/buddy.c:2295
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Angemeldet in: %s\n"
 
-#: src/buddy.c:2307
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Warnungen: %d%%\n"
 
-#: src/buddy.c:2319
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Fähigkeiten: %s\n"
 
-#: src/buddy.c:2323
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -2410,321 +2589,313 @@
 "Bildschirmname: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2327
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-#: src/buddy.c:2396 src/buddy.c:2401
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s hat sich angemeldet."
 
-#: src/buddy.c:2455 src/buddy.c:2460
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s hat sich abgemeldet."
 
-#: src/buddy.c:2558
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Info über ausgewählten Buddy"
 
-#: src/buddy.c:2559
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "Nachricht senden"
 
-#: src/buddy.c:2560
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "Buddy-Chat starten"
 
-#: src/buddy.c:2561
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Abwesenheits-Mitteilung aktivieren"
 
-#: src/buddy.c:2611
+#: src/buddy.c:2615
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Buddy-Liste"
 
 #. The file menu
-#: src/buddy.c:2624 src/conversation.c:2173
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Datei"
 
-#: src/buddy.c:2628
+#: src/buddy.c:2632
 msgid "_Add A Buddy"
 msgstr "Buddy hinzufügen"
 
 # vgl. "Join Chat"
-#: src/buddy.c:2630
+#: src/buddy.c:2634
 msgid "_Join A Chat"
 msgstr "Einen Chat betreten"
 
-#: src/buddy.c:2632
+#: src/buddy.c:2636
 msgid "_New Message"
 msgstr "Neue Nachricht"
 
-#: src/buddy.c:2634
+#: src/buddy.c:2638
 msgid "_Get User Info"
 msgstr "Benutzer-Info holen"
 
-#: src/buddy.c:2639
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "Buddy-Liste importieren"
 
-#: src/buddy.c:2646
+#: src/buddy.c:2650
 msgid "Hide"
 msgstr "Minimieren"
 
-#: src/buddy.c:2648
-msgid "Quit"
-msgstr "Beenden"
-
-#: src/buddy.c:2653
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "System"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr "Buddy-Alarm"
 
-#: src/buddy.c:2670
+#: src/buddy.c:2674
 msgid "_Accounts..."
 msgstr "Konten..."
 
-#: src/buddy.c:2673
+#: src/buddy.c:2677
 msgid "_Preferences..."
 msgstr "Einstellungen..."
 
-#: src/buddy.c:2679
-msgid "Protocol Actions"
-msgstr "Protokoll-Aktionen"
-
 #: src/buddy.c:2683
+msgid "Protocol Actions"
+msgstr "Protokoll-Aktionen"
+
+#: src/buddy.c:2687
 msgid "Pr_ivacy..."
 msgstr "Privatsphäre..."
 
-#: src/buddy.c:2686
+#: src/buddy.c:2690
 msgid "_View System Log..."
 msgstr "System-Mitschnitt anzeigen"
 
-#: src/buddy.c:2691
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Online Help"
 msgstr "Online-Hilfe"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2700
 msgid "Debug Window"
 msgstr "Debug-Fenster"
 
-#: src/buddy.c:2700
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "Info über Gaim"
 
-#: src/buddy.c:2717 src/prefs.c:1393
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: src/buddy.c:2768
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "Buddy hinzufügen"
 
-#: src/buddy.c:2769
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "Neue Gruppe hinzufügen"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "Ausgewählten Buddy/Gruppe entfernen"
 
-#: src/buddy.c:2793
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Buddies bearbeiten"
 
-#: src/buddy_chat.c:275
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Chat betreten"
 
 # vgl. "Join Chat"!
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Chat betreten als:"
 
-#: src/buddy_chat.c:313
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Betreten"
 
-#: src/buddy_chat.c:402 src/buddy_chat.c:405 src/buddy_chat.c:1452
-#: src/buddy_chat.c:1547
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/buddy_chat.c:421 src/dialogs.c:1694 src/dialogs.c:3722
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Buddy"
 
-#: src/buddy_chat.c:426
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/buddy_chat.c:463
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Buddy in einen Chatraum einladen"
 
-#: src/buddy_chat.c:876
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Beachten"
 
-#: src/buddy_chat.c:878 src/prefs.c:278
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:954 src/buddy_chat.c:1093 src/buddy_chat.c:1659
-#: src/buddy_chat.c:1692
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s im Raum"
 
-#: src/buddy_chat.c:963
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: src/buddy_chat.c:965
+#: src/buddy_chat.c:959
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] hat den Raum betreten."
 
-#: src/buddy_chat.c:1044
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: src/buddy_chat.c:1102
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
 
-#: src/buddy_chat.c:1104
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen"
 
-#: src/buddy_chat.c:1210
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Gruppenchats"
 
-#: src/buddy_chat.c:1290
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Thema:"
 
-#: src/buddy_chat.c:1329
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0 Leute im Raum"
 
-#: src/buddy_chat.c:1436 src/buddy_chat.c:1546 src/buddy_chat.c:1579
-#: src/conversation.c:3010
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:1594 src/conversation.c:3042
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "Warnen"
 
-#: src/buddy_chat.c:1600 src/conversation.c:3061
+#: src/buddy_chat.c:1592 src/conversation.c:2925
 msgid "Block"
 msgstr "Sperren"
 
-#: src/conversation.c:490
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Unterhaltung speichern"
-
-#: src/conversation.c:538
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Bild einfügen"
 
-#: src/conversation.c:1398
+#: src/conversation.c:1305
 msgid "Unable to send message.  The message is too large"
 msgstr "Nachricht kann nicht gesendet werden. Die Nachricht ist zu groß"
 
-#: src/conversation.c:1402
+#: src/conversation.c:1309
 msgid "Unable to send message"
 msgstr "Nachricht kann nicht gesendet werden"
 
-#: src/conversation.c:2177
+#: src/conversation.c:2043
 msgid "_Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2045
 msgid "View _History"
 msgstr "Betrachte die History"
 
 #.
 #. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
-#: src/conversation.c:2186
+#: src/conversation.c:2052
 msgid "Insert _URL"
 msgstr "Link einfügen"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2053
 msgid "Insert _Image"
 msgstr "IM Bild einfügen"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2058
 msgid "_Close"
 msgstr "Schließen"
 
-#: src/conversation.c:2197
+#: src/conversation.c:2063
 msgid "Options"
 msgstr "Einstellungen"
 
 #. Logging
-#: src/conversation.c:2202
+#: src/conversation.c:2068
 msgid "Enable _Logging"
 msgstr "Mitschnitt aktivieren"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2086
 msgid "Enable _Sounds"
 msgstr "Klänge aktivieren"
 
-#: src/conversation.c:2732 src/conversation.c:2734 src/conversation.c:2745
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
 msgid " [TYPING]"
 msgstr " [tippe]"
 
-#: src/conversation.c:2735 src/conversation.c:2737 src/conversation.c:2749
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
 msgid " [TYPED]"
 msgstr " [getippt]"
 
-#: src/conversation.c:2825
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - Unterhaltungen"
 
-#: src/conversation.c:2938
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Nachricht senden als: "
 
-#: src/conversation.c:3562
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Icon speichern"
 
-#: src/conversation.c:3596
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Animation deaktivieren"
 
-#: src/conversation.c:3603
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Animation aktivieren"
 
-#: src/conversation.c:3609
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: src/conversation.c:3615
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
-#: src/dialogs.c:411
+#: src/dialogs.c:422
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -2733,329 +2904,330 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:420
+#: src/dialogs.c:431
 msgid "Warn _anonymously?"
 msgstr "Anonym warnen?"
 
-#: src/dialogs.c:427
+#: src/dialogs.c:438
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "Anonyme Warnungen sind nicht so barsch."
 
-#: src/dialogs.c:447
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Entferne '%s' von der Buddy-Liste\n"
 
-#: src/dialogs.c:691
+#: src/dialogs.c:706
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
 "Bitte geben Sie den Benutzernamen der Person ein, mit der Sie chatten "
 "wollen\n"
 
-#: src/dialogs.c:707 src/dialogs.c:802
+#: src/dialogs.c:722 src/dialogs.c:816
 msgid "_Screenname:"
 msgstr "Benutzername:"
 
-#: src/dialogs.c:720 src/dialogs.c:815
+#: src/dialogs.c:735 src/dialogs.c:829
 msgid "_Account:"
 msgstr "Konto:"
 
-#: src/dialogs.c:790
+#: src/dialogs.c:804
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr ""
 "Bitte geben Sie den Benutzernamen der Person ein, die Sie sehen möchten.\n"
 
-#: src/dialogs.c:955
+#: src/dialogs.c:956
+msgid "Gaim - Add Group"
+msgstr "Gaim - Gruppe hinzufügen"
+
+#: src/dialogs.c:973
 msgid "Please enter the name of the group to be added.\n"
 msgstr ""
 "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll\n"
 
-#: src/dialogs.c:964
+#: src/dialogs.c:982 src/dialogs.c:4356
 msgid "_Group:"
 msgstr "Gruppe"
 
-#: src/dialogs.c:1051
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Buddy hinzufügen"
 
-#: src/dialogs.c:1062
-msgid "Add Buddy"
-msgstr "Buddy hinzufügen"
-
-#: src/dialogs.c:1072
-msgid "Contact"
-msgstr "Kontakt"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Benutzername: "
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1098
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Hinzufügen zu"
 
-#: src/dialogs.c:1396
+#: src/dialogs.c:1468
 msgid "Gaim - Privacy"
 msgstr "Gaim - Privatsphäre"
 
-#: src/dialogs.c:1407
-msgid "Privacy settings are affected immediately."
+#: src/dialogs.c:1479
+#, fuzzy
+msgid "Changes to privacy settings take effect immediately."
 msgstr "Privacy-Einstellungen werden sofort wirksam"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Setze Privatsphäre für:"
 
-#: src/dialogs.c:1434
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Allen Benutzern erlauben, mich zu kontaktieren"
 
-#: src/dialogs.c:1435
-msgid "Allow only the users below"
-msgstr "Nur den untenstehenden Benutzern erlauben"
-
-#: src/dialogs.c:1436
+#: src/dialogs.c:1509
 msgid "Allow only users on my buddy list"
 msgstr "Nur den Benutzern in meiner Buddy-Liste erlauben"
 
-#: src/dialogs.c:1438
-msgid "Allow List"
-msgstr "Liste der erlaubten Benutzer"
-
-#: src/dialogs.c:1469
+#: src/dialogs.c:1513
+msgid "Allow only the users below"
+msgstr "Nur den untenstehenden Benutzern erlauben"
+
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Allen Usern verwehren"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Nur den untenstehenden Benutzern verwehren"
 
-#: src/dialogs.c:1472
-msgid "Block List"
-msgstr "Verwehren"
-
-#: src/dialogs.c:1525
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte Buddy zum Alarmieren angeben."
 
-#: src/dialogs.c:1664
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Neuer Buddy-Alarm"
 
 #. <pounce type="who">
-#: src/dialogs.c:1674
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Wen alarmieren"
 
-#: src/dialogs.c:1685
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Konto"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1711
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "Wann alarmieren"
 
-#: src/dialogs.c:1721
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Alarm beim Anmelden"
 
-#: src/dialogs.c:1730
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Alarm bei Rückkehr von Abwesenheit"
 
-#: src/dialogs.c:1739
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Alarm bei Rückkehr von Inaktivität"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "Alarm wenn der Buddy schreibt"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1758
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Alarm-Aktion"
 
 # IM benutzen?
-#: src/dialogs.c:1769
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "Nachricht-Fenster öffnen"
 
-#: src/dialogs.c:1778
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Popup-Benachrichtigung"
 
-#: src/dialogs.c:1787 src/prefs.c:294
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: src/dialogs.c:1808
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Befehl bei Alarm ausführen"
 
-#: src/dialogs.c:1830
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Klang bei Alarm abspielen"
 
 #. </pounce type="action">
-#: src/dialogs.c:1852
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Diesen Alarm nach Aktivierung speichern"
 
-#: src/dialogs.c:1872
+#: src/dialogs.c:1967
 msgid "_Save"
 msgstr "Speichern"
 
-#: src/dialogs.c:1878
+#: src/dialogs.c:1973
 msgid "C_ancel"
 msgstr "Abbrechen"
 
-#: src/dialogs.c:1949
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Profil anlegen"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Profil"
 
 # Die Übersetzung stimmt nicht, oder?
-#: src/dialogs.c:1979
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Ermöglicht Personen, Ihr Profil im Web zu finden"
 
 #. Line 1
-#: src/dialogs.c:1982 src/dialogs.c:2676
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Vorname"
 
 #. Line 2
-#: src/dialogs.c:1993 src/dialogs.c:2688
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
 #. Line 3
-#: src/dialogs.c:2005 src/dialogs.c:2700
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Nachname"
 
 #. Line 4
-#: src/dialogs.c:2016 src/dialogs.c:2712
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Mädchenname"
 
 #. Line 6
-#: src/dialogs.c:2038 src/dialogs.c:2735
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: src/dialogs.c:2081 src/dialogs.c:2262 src/dialogs.c:3535 src/dialogs.c:4178
-#: src/dialogs.c:5140
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
 msgid "Save"
 msgstr "Speichern"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Die neuen Passwörter stimmen nicht überein"
 
-#: src/dialogs.c:2108
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Bitte alle Felder komplett ausfüllen"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Paßwort-Änderung"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Altes Paßwort"
 
-#: src/dialogs.c:2176
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Neues Paßwort"
 
-#: src/dialogs.c:2190
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Neues Paßwort (wiederholen)"
 
 #. Build OK Button
-#: src/dialogs.c:2204 src/dialogs.c:2355 src/dialogs.c:2657 src/dialogs.c:2831
-#: src/dialogs.c:2901 src/dialogs.c:4290 src/dialogs.c:4395
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:2230
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Benutzerinfo setzen"
 
-#: src/dialogs.c:2340
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Das Resultat Ihrer Suche:"
 
-#: src/dialogs.c:2473
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Zulassen"
 
-#: src/dialogs.c:2513
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Zulassung hinzufügen"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Sperre hinzufügen"
 
-#: src/dialogs.c:2574
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Unterhaltungs-Mitschnitt"
 
-#: src/dialogs.c:2652 src/dialogs.c:2813
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Nach Buddies suchen"
 
-#: src/dialogs.c:2780
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Buddy nach Profil suchen"
 
 # E-Mail
-#: src/dialogs.c:2807
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Buddy nach E-Mail-Adresse suchen"
 
-#: src/dialogs.c:2896
+#: src/dialogs.c:2997
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Url hinzufügen"
 
-#: src/dialogs.c:3058 src/dialogs.c:3078
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Textfarbe auswählen"
 
-#: src/dialogs.c:3110 src/dialogs.c:3130
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Hintergrundfarbe auswählen"
 
-#: src/dialogs.c:3205 src/dialogs.c:3229
+#: src/dialogs.c:3284 src/dialogs.c:3308
 msgid "Select Font"
 msgstr "Schriftart wählen "
 
-#: src/dialogs.c:3306
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importieren zu:"
 
-#: src/dialogs.c:3330
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Buddy-Liste laden"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3392
+#: src/dialogs.c:3470
 msgid "You cannot save an away message with a blank title"
 msgstr "Sie können keine Abwesenheitsnachricht ohne Titel speichern"
 
-#: src/dialogs.c:3393
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
@@ -3064,99 +3236,101 @@
 "nicht abzuspeichern"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3400
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "Sie können keine leere Abwesenheitsmeldung erstellen"
 
-#: src/dialogs.c:3469
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3478
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3491
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Abwesenheits-Titel:"
 
-#: src/dialogs.c:3539
+#: src/dialogs.c:3614
 msgid "Save & Use"
 msgstr "Speichern & Übernehmen"
 
-#: src/dialogs.c:3543
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Übernehmen"
 
 #. show everything
-#: src/dialogs.c:3677
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Lächle!"
 
-#: src/dialogs.c:3767
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias für Buddy"
 
-#: src/dialogs.c:3805 src/dialogs.c:3812
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Kann nicht an %s schreiben"
 
-#: src/dialogs.c:3836
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Mitschnitt speichern"
 
-#: src/dialogs.c:3866
+#: src/dialogs.c:3940
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Kann nicht die Datei %s löschen."
 
-#: src/dialogs.c:3893
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Mitschnitt wirklich löschen?"
 
-#: src/dialogs.c:3908
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4089
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:4152
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: src/dialogs.c:4173
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Löschen"
 
-#: src/dialogs.c:4255
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Gruppe umbenennen"
 
-#: src/dialogs.c:4264
-msgid "Rename Group"
-msgstr "Gruppe umbenennen"
-
-#: src/dialogs.c:4271 src/dialogs.c:4376
-msgid "New name:"
-msgstr "Neuer Name:"
-
-#: src/dialogs.c:4360
+#: src/dialogs.c:4347
+#, fuzzy
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+"Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll\n"
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Buddy umbenennen"
 
-#: src/dialogs.c:4369
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Buddy umbenennen"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "Neuer Name:"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4453
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Perl-Skript auswählen"
 
-#: src/gaimrc.c:1276
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Konfigurationsdatei %s kann nicht geöffnet werden."
@@ -3170,83 +3344,93 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fehler: Verbindung kann nicht hergestellt werden.\n"
 
-#: src/multi.c:231
+#: src/multi.c:235
 msgid "Screenname"
 msgstr "Benutzername"
 
-#: src/multi.c:259
+#: src/multi.c:263
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/multi.c:538
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Buddy-Icon laden"
 
-#: src/multi.c:581
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "Buddy-Icon Datei:"
 
-#: src/multi.c:594
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Stöbern"
 
-#: src/multi.c:599 src/prefs.c:1219
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: src/multi.c:616
+#: src/multi.c:620
 msgid "Login Options"
 msgstr "Anmeldeoptionen"
 
-#: src/multi.c:626
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "Benutzername:"
 
-#: src/multi.c:649
+#: src/multi.c:653
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/multi.c:661
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/multi.c:668
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "Paßwort speichern"
 
-#: src/multi.c:669
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Auto-Login"
 
-#: src/multi.c:702
+#: src/multi.c:706
 msgid "User Options"
 msgstr "Benutzereinstellungen"
 
-#: src/multi.c:711
+#: src/multi.c:715
 msgid "New Mail Notifications"
 msgstr "Neue Mail-Benachrichtigungen"
 
-#: src/multi.c:805
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Einstellungen"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "Beim Server anmelden"
 
-#: src/multi.c:864
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Konto bearbeiten"
 
-#: src/multi.c:1009
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "Paßwort eingeben"
 
-#: src/multi.c:1040
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Paßwort:"
+
+#: src/multi.c:1044
 msgid "Signon"
 msgstr "Anmelden"
 
-#: src/multi.c:1073
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr "TOC nicht gefunden."
 
-#: src/multi.c:1074
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
@@ -3257,11 +3441,11 @@
 "Plugin kompiliert. Um sich damit anzumelden, editieren Sie dieses Konto, um "
 "OSCAR zu benutzen und laden Sie das TOC-Plugin."
 
-#: src/multi.c:1080
+#: src/multi.c:1084
 msgid "Protocol not found."
 msgstr "Protokoll nicht gefunden"
 
-#: src/multi.c:1081
+#: src/multi.c:1085
 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."
@@ -3270,20 +3454,45 @@
 "Protokoll nicht geladen haben oder da dieses Protokoll keine Anmelde-"
 "Funktion besitzt."
 
-#: src/multi.c:1134
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich löschen?"
 
-#: src/multi.c:1135
+#: src/multi.c:1139
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/multi.c:1183
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Konten-Editor"
 
-#: src/multi.c:1570
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
+msgstr "Bearbeiten"
+
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "Nein"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Anmeldung: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Konten-Editor"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "Abbrechen"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -3292,25 +3501,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1589
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s konnte sich nicht anmelden"
 
-#: src/multi.c:1590
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "Anmeldefehler"
 
-#: src/multi.c:1600
+#: src/multi.c:1604
 msgid "Notice"
 msgstr "Hinweis"
 
-#: src/multi.c:1610
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s wurde abgemeldet"
 
-#: src/multi.c:1611
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
@@ -3320,249 +3529,289 @@
 "GAIM::registen wurde nicht mit den richtigen Argumenten aufgerufen. Lesen "
 "SIe das PERL-HOWTO."
 
-#: src/prefs.c:178
+#: src/prefs.c:180
 msgid "Interface Options"
 msgstr "Allgemeine Einstellungen"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:181
+#: src/prefs.c:183
 msgid "Show _debug window"
 msgstr "Debug-Fenster zeigen"
 
-#: src/prefs.c:198
-msgid "Style"
-msgstr "Stil"
-
-#: src/prefs.c:199
-msgid "_Bold"
-msgstr "Fett"
-
 #: src/prefs.c:200
+msgid "Style"
+msgstr "Stil"
+
+#: src/prefs.c:201
+msgid "_Bold"
+msgstr "Fett"
+
+#: src/prefs.c:202
 msgid "_Italics"
 msgstr "Kursiv"
 
-#: src/prefs.c:201
+#: src/prefs.c:203
 msgid "_Underline"
 msgstr "Unterstrichen"
 
-#: src/prefs.c:202
+#: src/prefs.c:204
 msgid "_Strikethough"
 msgstr "Durchgestrichen"
 
-#: src/prefs.c:204
+#: src/prefs.c:206
 msgid "Face"
 msgstr "Schriftart"
 
-#: src/prefs.c:207
+#: src/prefs.c:209
 msgid "Use custo_m face"
 msgstr "Benutzerdefinierte Schrift verwenden"
 
-#: src/prefs.c:219
+#: src/prefs.c:221
 msgid "Use custom si_ze"
 msgstr "Benutzerdefinierte Größe verwenden"
 
-#: src/prefs.c:226
+#: src/prefs.c:228
 msgid "Color"
 msgstr "Farbe"
 
-#: src/prefs.c:231
+#: src/prefs.c:233
 msgid "_Text color"
 msgstr "Text-Farbe"
 
-#: src/prefs.c:247
+#: src/prefs.c:249
 msgid "Bac_kground color"
 msgstr "Hintergrundfarbe"
 
-#: src/prefs.c:271 src/prefs.c:367 src/prefs.c:407
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 msgid "Display"
 msgstr "Anzeige"
 
-#: src/prefs.c:272
+#: src/prefs.c:274
 msgid "Show graphical _smileys"
 msgstr "Grafische Smileys anzeigen"
 
-#: src/prefs.c:273
+#: src/prefs.c:275
 msgid "Show _timestamp on messages"
 msgstr "Zeit bei Nachrichten zeigen"
 
-#: src/prefs.c:274
+#: src/prefs.c:276
 msgid "Show _URLs as links"
 msgstr "URLs als Link zeigen"
 
-#: src/prefs.c:276
+#: src/prefs.c:278
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter hervorheben"
 
-#: src/prefs.c:279
+#: src/prefs.c:281
 msgid "Ignore c_olors"
 msgstr "Schriftfarben ignorieren"
 
-#: src/prefs.c:280
+#: src/prefs.c:282
 msgid "Ignore font _faces"
 msgstr "Schriftarten ignorieren"
 
-#: src/prefs.c:281
+#: src/prefs.c:283
 msgid "Ignore font si_zes"
 msgstr "Schriftgröße ignorieren"
 
-#: src/prefs.c:295
+#: src/prefs.c:297
 msgid "_Enter sends message"
 msgstr "Enter-Taste verschickt Nachricht"
 
-#: src/prefs.c:296
-msgid "C_ontrol-Enter sends message"
-msgstr "Strg+Enter-Taste verschickt Nachricht"
-
 #: src/prefs.c:298
+msgid "C_ontrol-Enter sends message"
+msgstr "Strg+Enter-Taste verschickt Nachricht"
+
+#: src/prefs.c:300
 msgid "Window Closing"
 msgstr "Fenster schließen"
 
-#: src/prefs.c:299
+#: src/prefs.c:301
 msgid "E_scape closes window"
 msgstr "Esc schließt Fenster"
 
-#: src/prefs.c:300
+#: src/prefs.c:302
 msgid "Control-_W closes window"
 msgstr "Strg-W schließt Fenster"
 
-#: src/prefs.c:303
+#: src/prefs.c:305
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Strg-{B/I/U/S} fügt HTML-Tags ein"
 
-#: src/prefs.c:304
+#: src/prefs.c:306
 msgid "Control-(number) inserts _smileys"
 msgstr "Strg-(Ziffer) fügt Smileys ein"
 
-#: src/prefs.c:316
+#: src/prefs.c:318
 msgid "Buttons"
 msgstr "Buttons"
 
-#: src/prefs.c:317
+#: src/prefs.c:319
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "Nachrichten/Info/Chat-Buttons verstecken"
 
-#: src/prefs.c:318
+#: src/prefs.c:320
 msgid "Show _pictures on buttons"
 msgstr "Bild auf Buttons anzeigen"
 
-#: src/prefs.c:320
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "Buddy-Listen-Fenster"
 
-#: src/prefs.c:321
+#: src/prefs.c:323
 msgid "_Save window size/position"
 msgstr "Fensterposition und -größe speichern"
 
-#: src/prefs.c:322
-msgid "_Raise window on events"
-msgstr "Fenster bei Ereignis in Vordergrund bringen"
-
 #: src/prefs.c:324
+msgid "_Raise window on events"
+msgstr "Fenster bei Ereignis in Vordergrund bringen"
+
+#: src/prefs.c:326
 msgid "Group Display"
 msgstr "Gruppen-Anzeige"
 
-#: src/prefs.c:325
+#: src/prefs.c:327
 msgid "Hide _groups with no online buddies"
 msgstr "Gruppen verstecken, wenn kein Buddy online ist"
 
-#: src/prefs.c:326
+#: src/prefs.c:328
 msgid "Show _numbers in groups"
 msgstr "Anzahl in Gruppe anzeigen"
 
-#: src/prefs.c:328
+#: src/prefs.c:330
 msgid "Buddy Display"
 msgstr "Buddy-Anzeige"
 
-#: src/prefs.c:329
+#: src/prefs.c:331
 msgid "Show buddy type _icons"
 msgstr "Typ-Icon für Buddy anzeigen"
 
-#: src/prefs.c:330
+#: src/prefs.c:332
 msgid "Show _warning levels"
 msgstr "Warnstufen anzeigen"
 
-#: src/prefs.c:331
+#: src/prefs.c:333
 msgid "Show idle _times"
 msgstr "Inaktivitätszeiten anzeigen"
 
-#: src/prefs.c:332
+#: src/prefs.c:334
 msgid "Grey i_dle buddies"
 msgstr "Inaktive Buddies grau anzeigen"
 
-#: src/prefs.c:349 src/prefs.c:391
+#: src/prefs.c:351 src/prefs.c:393
 msgid "Window"
 msgstr "Fenster"
 
-#: src/prefs.c:356 src/prefs.c:398
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "Buttons zeigen als:"
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "nur Bilder"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "nur Text"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "Bilder und Text"
+
+#: src/prefs.c:358 src/prefs.c:400
 msgid "New window _width:"
 msgstr "Neue Fensterbreite:"
 
-#: src/prefs.c:357 src/prefs.c:399
+#: src/prefs.c:359 src/prefs.c:401
 msgid "New window _height:"
 msgstr "Neue Fensterhöhe:"
 
-#: src/prefs.c:358 src/prefs.c:400
+#: src/prefs.c:360 src/prefs.c:402
 msgid "_Entry widget height:"
 msgstr "Höhe des Eingabefelds:"
 
-#: src/prefs.c:359 src/prefs.c:401
+#: src/prefs.c:361 src/prefs.c:403
 msgid "_Raise windows on events"
 msgstr "Fenster bei Ereignis in Vordergrund bringen"
 
-#: src/prefs.c:360
+#: src/prefs.c:362
 msgid "Hide window on _send"
 msgstr "Fenster beim Senden verbergen"
 
-#: src/prefs.c:363
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "Buddy-Icons"
 
-#: src/prefs.c:364
+#: src/prefs.c:366
 msgid "Hide buddy _icons"
 msgstr "Buddy-Icons verbergen"
 
-#: src/prefs.c:365
+#: src/prefs.c:367
 msgid "Disable buddy icon a_nimation"
 msgstr "Buddy-Icon-Animation deaktivieren"
 
-#: src/prefs.c:368
+#: src/prefs.c:370
 msgid "Show _logins in window"
 msgstr "Anmeldungen im Fenster zeigen"
 
-#: src/prefs.c:370
+#: src/prefs.c:372
 msgid "Typing Notification"
 msgstr "Tipp-Benachrichtigung"
 
-#: src/prefs.c:371
+#: src/prefs.c:373
 msgid "Notify buddies that you are _typing to them"
 msgstr "Buddies benachrichten, dass man Ihnen schreibt"
 
-#: src/prefs.c:403
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "Tabulator-Vervollständigung"
 
-#: src/prefs.c:404
+#: src/prefs.c:406
 msgid "_Tab-complete nicks"
 msgstr "Spitznamen mit Tabulator vervollständigen"
 
-#: src/prefs.c:405
+#: src/prefs.c:407
 msgid "_Old-style tab completion"
 msgstr "Alte Tabulator-Vervollständigung"
 
-#: src/prefs.c:408
+#: src/prefs.c:410
 msgid "_Show people joining/leaving in window"
 msgstr "Eintretende/Verlassende Personen im Fenster anzeigen"
 
-#: src/prefs.c:409
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr "Färbe Benutzernamen ein"
 
-#: src/prefs.c:425
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr "IM Reiter"
 
-#: src/prefs.c:432
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Reiter-Platzierung:"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr "Oben"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "Buttons"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr "Links"
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "Rechts"
+
+#: src/prefs.c:434
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
@@ -3570,126 +3819,163 @@
 "Alle Chats in einem Reiter-Fenster \n"
 "zeigen"
 
-#: src/prefs.c:433
+#: src/prefs.c:435
 msgid "Show a_liases in tabs/titles"
 msgstr "Aliase in Reitern/Titeln anzeigen"
 
-#: src/prefs.c:435
+#: src/prefs.c:437
 msgid "Chat Tabs"
 msgstr "Chat-Reiter"
 
-#: src/prefs.c:442
+#: src/prefs.c:444
 msgid "Show all c_hats in one tabbed window"
 msgstr "Alle Chats in einem Reiter-Fenster zeigen"
 
-#: src/prefs.c:445
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr "Kombinierte Reiter"
 
-#: src/prefs.c:446
+#: src/prefs.c:448
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Chats im selben Reiter-Fenster anzeigen"
 
-#: src/prefs.c:448
+#: src/prefs.c:450
 msgid "Buddy List Tabs"
 msgstr "Buddy-Listen Reiter"
 
-#: src/prefs.c:469
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "Proxy-Typ"
 
-#: src/prefs.c:481
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Proxy-Typ"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Kein Proxy"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Proxy-Server"
 
-#: src/prefs.c:494
+#: src/prefs.c:496
 msgid "_Host"
 msgstr "Rechner"
 
-#: src/prefs.c:508
+#: src/prefs.c:510
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:524
+#: src/prefs.c:526
 msgid "_User"
 msgstr "Benutzer"
 
-#: src/prefs.c:538
+#: src/prefs.c:540
 msgid "Pa_ssword"
 msgstr "Paßwort"
 
 #. Registered default browser is used by Windows
-#: src/prefs.c:575
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr "Browserwahl"
 
-#: src/prefs.c:604
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "Browser"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr "Manuell"
+
+#: src/prefs.c:606
 msgid "Browser Options"
 msgstr "Browser-Einstellungen"
 
-#: src/prefs.c:605
+#: src/prefs.c:607
 msgid "Open new _window by default"
 msgstr "Per Vorgabe neues Fenster öffnen"
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Message Logs"
 msgstr "Nachrichten-Mitschnitt"
 
-#: src/prefs.c:621
+#: src/prefs.c:623
 msgid "_Log all instant messages"
 msgstr "Schneide alle Nachrichten mit"
 
-#: src/prefs.c:622
+#: src/prefs.c:624
 msgid "Log all c_hats"
 msgstr "Alles mitschneiden"
 
-#: src/prefs.c:623
+#: src/prefs.c:625
 msgid "Strip _HTML from logs"
 msgstr "HTML aus Mitschnitt entfernen"
 
-#: src/prefs.c:625
+#: src/prefs.c:627
 msgid "System Logs"
 msgstr "System-Mitschnitt anzeigen"
 
-#: src/prefs.c:626
+#: src/prefs.c:628
 msgid "Log when buddies _sign on/sign off"
 msgstr "An/Abmeldung eines Buddies mitschneiden"
 
-#: src/prefs.c:628
+#: src/prefs.c:630
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Mitschnitt, wenn Buddies in/aktiv werden"
 
-#: src/prefs.c:630
+#: src/prefs.c:632
 msgid "Log when buddies go away/come _back"
 msgstr "Mitschneiden, wenn Buddys gehen oder wiederkommen"
 
-#: src/prefs.c:631
+#: src/prefs.c:633
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Eigene Anmeldung/Leerlauf/Abwesenheit mitschneiden"
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Eigene Mitschnitts-Datei für Anmeldung jedes Buddys"
 
-#: src/prefs.c:665
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "Klang-Einstellungen"
 
-#: src/prefs.c:666
+#: src/prefs.c:668
 msgid "_No sounds when you log in"
 msgstr "Kein Klang beim Anmelden"
 
-#: src/prefs.c:667
+#: src/prefs.c:669
 msgid "_Sounds while away"
 msgstr "Klänge bei Abwesenheit"
 
-#: src/prefs.c:670
+#: src/prefs.c:672
 msgid "Sound Method"
 msgstr "Klang-Ausgabesystem"
 
-#: src/prefs.c:694
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "Klang-Ausgabesystem"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "Interner Fehler"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3698,75 +3984,75 @@
 "Klang-Abspielbefehl\n"
 "(%s für Dateiname)"
 
-#: src/prefs.c:730
+#: src/prefs.c:732
 msgid "_Sending messages removes away status"
 msgstr "Senden von Nachrichten hebt Abwesenheit auf"
 
-#: src/prefs.c:731
+#: src/prefs.c:733
 msgid "_Queue new messages when away"
 msgstr "Neue Nachrichten bei Abwesenheit sammeln"
 
-#: src/prefs.c:732
+#: src/prefs.c:734
 msgid "_Ignore new conversations when away"
 msgstr "Neue Unterhaltungen bei Abwesenheit ignorieren"
 
-#: src/prefs.c:734
+#: src/prefs.c:736
 msgid "Auto-response"
 msgstr "Keine automatische Antwort schicken"
 
-#: src/prefs.c:737
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr "Sekunden vor dem Neusenden"
 
-#: src/prefs.c:739
+#: src/prefs.c:741
 msgid "_Don't send auto-response"
 msgstr "Keine automatische Antwort schicken"
 
-#: src/prefs.c:740
+#: src/prefs.c:742
 msgid "_Only send auto-response when idle"
 msgstr "Automatische Antwort nur bei Inaktivität schicken"
 
-#: src/prefs.c:741
+#: src/prefs.c:743
 msgid "Do_n't send auto-response in active conversations"
 msgstr "Keine automatische Antwort während eines Gesprächs schicken"
 
-#: src/prefs.c:747
+#: src/prefs.c:749
 msgid "Idle _time reporting:"
 msgstr ""
 
-#: src/prefs.c:748
+#: src/prefs.c:750
 msgid "None"
 msgstr "Nein"
 
-#: src/prefs.c:749
+#: src/prefs.c:751
 msgid "Gaim usage"
 msgstr "Gaim-Benutzung"
 
-#: src/prefs.c:752
+#: src/prefs.c:754
 msgid "X usage"
 msgstr "X-Benutzung"
 
-#: src/prefs.c:754
+#: src/prefs.c:756
 msgid "Windows usage"
 msgstr "Fenster-Benutzung"
 
-#: src/prefs.c:761
+#: src/prefs.c:763
 msgid "Auto-away"
 msgstr "Automatisch abwesend"
 
-#: src/prefs.c:762
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr "Setze auf abwesend, wenn inaktiv"
 
-#: src/prefs.c:763
+#: src/prefs.c:765
 msgid "_Minutes before setting away:"
 msgstr "Minuten, bevor auf abwesend gesetzt wird"
 
-#: src/prefs.c:768
+#: src/prefs.c:770
 msgid "Away m_essage:"
 msgstr "Abwesenheits-Mitteilungen"
 
-#: src/prefs.c:802 src/prefs.c:890
+#: src/prefs.c:804 src/prefs.c:892
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3781,7 +4067,7 @@
 "\n"
 "%s"
 
-#: src/prefs.c:806 src/prefs.c:894
+#: src/prefs.c:808 src/prefs.c:896
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3792,7 +4078,7 @@
 "\n"
 "%s"
 
-#: src/prefs.c:811
+#: src/prefs.c:813
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3807,7 +4093,7 @@
 "<span weight=\"bold\">URL:</span>t%s\n"
 "<span weight=\"bold\">File name:</span>t%s"
 
-#: src/prefs.c:816
+#: src/prefs.c:818
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3822,91 +4108,91 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Dateiname:</span>  %s"
 
-#: src/prefs.c:1001
+#: src/prefs.c:1003
 msgid "Details"
 msgstr "Details"
 
-#: src/prefs.c:1106
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Klang-Konfiguration"
 
-#: src/prefs.c:1215
+#: src/prefs.c:1217
 msgid "Test"
 msgstr "Testen"
 
-#: src/prefs.c:1223
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "Auswählen..."
 
-#: src/prefs.c:1351
+#: src/prefs.c:1353
 msgid "_Edit"
 msgstr "Bearbeiten"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1391
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: src/prefs.c:1390
+#: src/prefs.c:1392
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: src/prefs.c:1391
+#: src/prefs.c:1393
 msgid "Message Text"
 msgstr "Nachrichtentext"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr "Kürzel"
 
-#: src/prefs.c:1394
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "Nachrichten-Fenster"
 
-#: src/prefs.c:1395
+#: src/prefs.c:1397
 msgid "Chat Window"
 msgstr "Chat-Fenster"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr "Reiter"
 
-#: src/prefs.c:1397
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "Browser"
 
-#: src/prefs.c:1400
-msgid "Logging"
-msgstr "Mitschnitt"
-
-#: src/prefs.c:1401
-msgid "Sounds"
-msgstr "Klänge"
-
 #: src/prefs.c:1402
-msgid "Sound Events"
-msgstr "Klang-Ereignisse"
+msgid "Logging"
+msgstr "Mitschnitt"
 
 #: src/prefs.c:1403
+msgid "Sounds"
+msgstr "Klänge"
+
+#: src/prefs.c:1404
+msgid "Sound Events"
+msgstr "Klang-Ereignisse"
+
+#: src/prefs.c:1405
 msgid "Away / Idle"
 msgstr "Abwesend / Untätig"
 
-#: src/prefs.c:1404
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "Abwesenheits-Mitteilungen"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1408
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/prefs.c:1445
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - Einstellungen"
 
-#: src/prefs.c:1564
+#: src/prefs.c:1565
 msgid "Gaim - Debug Window"
 msgstr "Gaim - Debugfenster"
 
@@ -3982,24 +4268,24 @@
 msgid "Please enter your password"
 msgstr "Bitte geben Sie Ihr Paßwort ein"
 
-#: src/server.c:639
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d Nachrichten)"
 
-#: src/server.c:645
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 Nachricht)"
 
-#: src/server.c:951
+#: src/server.c:966
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:952
+#: src/server.c:967
 msgid "No"
 msgstr "Nein"
 
-#: src/server.c:1148
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Mehr Informationen"
 
@@ -4043,6 +4329,49 @@
 msgid "Someone says your name in chat"
 msgstr "Jemand sagt Ihren Namen im Chat"
 
+#~ msgid "Accounts"
+#~ msgstr "Konten"
+
+# "Info" ist die offizielle GNOME Übersetzung
+#~ msgid "About"
+#~ msgstr "Info"
+
+# ???
+#~ 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."
+
+#~ msgid ""
+#~ "<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 ""
+#~ "<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 Geräts<br>"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Unterhaltung speichern"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Buddy hinzufügen"
+
+#~ msgid "Contact"
+#~ msgstr "Kontakt"
+
+#~ msgid "Allow List"
+#~ msgstr "Liste der erlaubten Benutzer"
+
+#~ msgid "Block List"
+#~ msgstr "Verwehren"
+
+#~ msgid "Rename Group"
+#~ msgstr "Gruppe umbenennen"
+
 #~ msgid "Docklet Configuration"
 #~ msgstr "Docklet-Konfiguration"
 
@@ -4104,9 +4433,6 @@
 #~ msgid "Add Group"
 #~ msgstr "Gruppe hinzufügen"
 
-#~ msgid "Gaim - Add Group"
-#~ msgstr "Gaim - Gruppe hinzufügen"
-
 #~ msgid "Use _borderless buttons"
 #~ msgstr "Randlose Buttons benutzen"
 
@@ -4151,15 +4477,6 @@
 #~ "kann er Ihre ipadresse sehn und könnte ein sicherheitsrisiko darstellen. "
 #~ "Möchten Sie weitermachen?"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim on irc.freenode.net"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim auf irc.freenode.net"
-
 #~ msgid "Whisper"
 #~ msgstr "Flüstern"
 
@@ -4253,9 +4570,6 @@
 #~ msgid "Select None"
 #~ msgstr "Nichts auswählen"
 
-#~ msgid "Modify"
-#~ msgstr "Bearbeiten"
-
 #~ msgid "Sign On/Off"
 #~ msgstr "An-/Abmelden"
 
@@ -4566,9 +4880,6 @@
 #~ "Nicht alle Protokolle können diese Proxy-Einstellungen nutzen. Bitte "
 #~ "lesen Sie die README-Datei."
 
-#~ msgid "No Proxy"
-#~ msgstr "Kein Proxy"
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -4581,12 +4892,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Einstellungen für Buddy-Liste"
 
-#~ msgid "Tab Placement:"
-#~ msgstr "Reiter-Platzierung:"
-
-#~ msgid "Top"
-#~ msgstr "Oben"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Unterhaltungens-Einstellungen"
 
@@ -4602,33 +4907,12 @@
 #~ msgid "IM Options"
 #~ msgstr "Einstellungen für Nachrichten"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "Buttons zeigen als:"
-
-#~ msgid "Pictures And Text"
-#~ msgstr "Bilder und Text"
-
-#~ msgid "Pictures"
-#~ msgstr "nur Bilder"
-
-#~ msgid "Text"
-#~ msgstr "nur Text"
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "Alle Unterhaltungen in einem Reiter-Fenster zeigen"
-
 #~ msgid "Window Sizes"
 #~ msgstr "Fenstergröße"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Reiter-Platzierung"
 
-#~ msgid "Left"
-#~ msgstr "Links"
-
-#~ msgid "Right"
-#~ msgstr "Rechts"
-
 #~ msgid "Chat Options"
 #~ msgstr "Chat-Optionen"
 
@@ -4670,6 +4954,3 @@
 
 #~ msgid "KFM"
 #~ msgstr "KFM/Konqueror"
-
-#~ msgid "Manual"
-#~ msgstr "Manuell"
--- a/po/es.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/es.po	Sun Jan 05 23:21:50 2003 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"POT-Creation-Date: 2003-01-01 00:59-0300\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\n"
 "PO-Revision-Date: 2003-01-01 01:09-0300\n"
 "Last-Translator: Nicols Lichtmaier <nick@technisys.com.ar>\n"
 "Language-Team:  <es@li.org>\n"
@@ -19,13 +19,13 @@
 msgid "New..."
 msgstr "Nuevo..."
 
-#: plugins/docklet/docklet.c:123 src/protocols/gg/gg.c:75
-#: src/protocols/jabber/jabber.c:1164 src/buddy.c:499 src/buddy.c:2531
-#: src/buddy.c:2661 src/prefs.c:731
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
 msgid "Away"
 msgstr "Ausente"
 
-#: plugins/docklet/docklet.c:129 src/away.c:502
+#: plugins/docklet/docklet.c:129 src/away.c:485
 msgid "Back"
 msgstr "Retroceder"
 
@@ -33,7 +33,7 @@
 msgid "Auto-login"
 msgstr "Conectarse Automticamente"
 
-#: plugins/docklet/docklet.c:143 src/buddy.c:2647
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
 msgid "Signoff"
 msgstr "Desconectar"
 
@@ -54,11 +54,11 @@
 msgid "About Gaim..."
 msgstr "Acerca de Gaim"
 
-#: plugins/docklet/docklet.c:162 src/buddy.c:2651
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
 msgid "Quit"
 msgstr "Salir"
 
-#: plugins/docklet/docklet.c:402
+#: plugins/docklet/docklet.c:400
 msgid "Tray Icon Configuration"
 msgstr "Configuracin del cono de Estado"
 
@@ -66,17 +66,17 @@
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
 #. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
 #. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
-#: plugins/docklet/docklet.c:411
+#: plugins/docklet/docklet.c:409
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_Ocultar nuevos mensajes hasta que se clickea en el cono de estado"
 
 #  Me pareci que "bandeja" no suen bien todava, no es comn. Veremos si se
 #  populariza esa traduccin en el resto de Gnome. nl.
-#: plugins/docklet/docklet.c:423
+#: plugins/docklet/docklet.c:421
 msgid "Tray Icon"
 msgstr "cono de Estado"
 
-#: plugins/docklet/docklet.c:425 plugins/docklet/docklet.c:436
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
 msgid ""
 "Interacts with a System Tray applet (in GNOME or KDE, for example) to "
 "display the current status of Gaim, allow fast access to commonly used "
@@ -85,53 +85,52 @@
 "(although the icon doesn't flash yet =)."
 msgstr ""
 
-#: plugins/docklet/docklet.c:426
+#: plugins/docklet/docklet.c:424
 msgid "Robert McQueen &lt;robot101@debian.org>"
 msgstr ""
 
 #  Me pareci que "bandeja" no suen bien todava, no es comn. Veremos si se
 #  populariza esa traduccin en el resto de Gnome. nl.
-#: plugins/docklet/docklet.c:432
+#: plugins/docklet/docklet.c:430
 msgid "System Tray Icon"
 msgstr "cono de Estado"
 
-#: plugins/chatlist.c:68 src/buddy_chat.c:281
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Conversacin de Amigos"
 
-#: plugins/chatlist.c:159 plugins/chatlist.c:161 plugins/chatlist.c:351
-#: plugins/chatlist.c:353
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Gaim Conversaciones"
 
-#: plugins/chatlist.c:302
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "Salas de Chat"
 
-#: plugins/chatlist.c:314
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr "Refrescar"
 
 #. buttons
-#: plugins/chatlist.c:315 src/protocols/icq/gaim_icq.c:279
-#: src/protocols/oscar/oscar.c:2183 src/buddy.c:494 src/buddy.c:2759
-#: src/buddy_chat.c:908 src/buddy_chat.c:1588 src/conversation.c:2464
-#: src/conversation.c:3053 src/dialogs.c:1128 src/dialogs.c:1474
-#: src/dialogs.c:1508 src/dialogs.c:2511 src/prpl.c:638
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Aadir"
 
-#: plugins/chatlist.c:316 src/buddy.c:496 src/buddy.c:2761
-#: src/buddy_chat.c:906 src/buddy_chat.c:1590 src/conversation.c:2448
-#: src/conversation.c:3047 src/dialogs.c:1478 src/dialogs.c:1512
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Quitar"
 
-#: plugins/chatlist.c:332
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "Lista de conversaciones disponibles"
 
-#: plugins/chatlist.c:342
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "Lista de conversaciones subscritas"
 
@@ -164,112 +163,113 @@
 msgid "Change"
 msgstr "Cambios"
 
-#: plugins/notify.c:344
+#: plugins/notify.c:389
 msgid "Unable to write to config file"
 msgstr "No se pudo escribir archivo de configuracin."
 
-#: plugins/notify.c:344
+#: plugins/notify.c:389
 msgid "Notify plugin"
 msgstr "Plugin de notificado"
 
-#: plugins/notify.c:507
+#: plugins/notify.c:561
 msgid "Notify For"
 msgstr "Notificar de"
 
-#: plugins/notify.c:508
+#: plugins/notify.c:562
 msgid "_IM windows"
 msgstr "Ventanas de _mensajes"
 
-#: plugins/notify.c:513
+#: plugins/notify.c:567
 msgid "_Chat windows"
 msgstr "Ventanas de _chat"
 
 #. --------------
-#: plugins/notify.c:519
+#: plugins/notify.c:573
 msgid "Notification Methods"
 msgstr "Mtodos de Notificacin"
 
-#: plugins/notify.c:522
-msgid "Prepend _string into window title:"
+#: plugins/notify.c:576
+#, fuzzy
+msgid "Prepend _string into window title (hit enter to save):"
 msgstr "Prefijar la _cadena en el ttulo de la ventana:"
 
-#: plugins/notify.c:531
+#: plugins/notify.c:587
 msgid "_Quote window title"
 msgstr "_Entrecomillar el ttulo de la ventana"
 
-#: plugins/notify.c:536
+#: plugins/notify.c:592
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "Activar pista \"_URGENT\" (urgente) del Gestor de Ventanas"
 
-#: plugins/notify.c:541
+#: plugins/notify.c:597
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insertar la c_uenta de los nuevos mensajes en el ttulo de la ventana"
 
-#: plugins/notify.c:546
+#: plugins/notify.c:602
 msgid "_Notify even if conversation is in focus"
 msgstr "_Notificar aun si la conversacin est en foco"
 
 #. --------------
-#: plugins/notify.c:552
+#: plugins/notify.c:608
 msgid "Notification Removal"
 msgstr "Eliminado de la Notificacin"
 
-#: plugins/notify.c:553
+#: plugins/notify.c:609
 msgid "Remove when conversation window gains _focus"
 msgstr "Eliminar cuando la ventana de la conversacin obtiene el _foco"
 
-#: plugins/notify.c:558
+#: plugins/notify.c:614
 msgid "Remove when conversation window _receives click"
 msgstr "Eliminar cuando la ventana de la conversacin _recibe un click"
 
-#: plugins/notify.c:563
+#: plugins/notify.c:619
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cuando se _tipee en la ventana de la conversacin"
 
-#: plugins/notify.c:568
+#: plugins/notify.c:624
 msgid "Appl_y"
 msgstr "_Aplicar"
 
-#: plugins/autorecon.c:49 plugins/autorecon.c:60
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Cuando por alguna razn Ud. se desconecta, esto lo vuelve a conectar."
 
-#: plugins/autorecon.c:56
+#: plugins/autorecon.c:61
 msgid "Auto Reconnect"
 msgstr "Auto Reconexin"
 
-#: plugins/timestamp.c:68
+#: plugins/timestamp.c:73
 msgid "Timestamp"
 msgstr "Fechado"
 
-#: plugins/timestamp.c:70
+#: plugins/timestamp.c:75
 msgid "Adds iChat-style timestamps to conversations every 5 minutes."
 msgstr "Aade un fechado estilo iChat en las conversaciones cada 5 minutos."
 
-#: plugins/history.c:67
+#: plugins/history.c:72
 msgid "History"
 msgstr "Historial"
 
-#: plugins/history.c:69
+#: plugins/history.c:74
 msgid "Shows recently logged conversations in new conversations "
 msgstr "Muestra las conversaciones anteriores en las nuevas"
 
-#: plugins/iconaway.c:47
+#: plugins/iconaway.c:52
 msgid "Iconify on away"
 msgstr "Iconificar en ausencia"
 
-#: plugins/iconaway.c:49 plugins/iconaway.c:60
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
 msgid "Iconifies the away box and the buddy list when you go away."
 msgstr ""
 "Iconifica la cajita de ausencia y la lista de amigos cuando usted est "
 "ausente"
 
-#: plugins/iconaway.c:56
+#: plugins/iconaway.c:61
 msgid "Iconify On Away"
 msgstr "Iconificar en Ausencia"
 
-#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2352
-#: src/protocols/msn/msn.c:2457
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "En lnea"
 
@@ -289,7 +289,7 @@
 msgid "Invisible for friends only"
 msgstr "Invisible slo para los amigos"
 
-#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1160
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "No disponible"
 
@@ -321,7 +321,7 @@
 msgid "Unknown Error Code."
 msgstr "Cdigo de error desconocido."
 
-#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2507
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
@@ -429,7 +429,7 @@
 msgstr "Sexo"
 
 #. Line 5
-#: src/protocols/gg/gg.c:739 src/dialogs.c:2044 src/dialogs.c:2748
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Ciudad"
 
@@ -530,9 +530,8 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
-#: src/protocols/jabber/jabber.c:4147 src/protocols/jabber/jabber.c:4160
-#: src/dialogs.c:2160
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Cambiar Contrasea"
 
@@ -571,27 +570,27 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim encontr un error mientras se comunicaba con el servidor ICQ."
 
-#: src/protocols/icq/gaim_icq.c:279 src/protocols/irc/irc.c:1288
-#: src/protocols/oscar/oscar.c:2030 src/protocols/oscar/oscar.c:4641
-#: src/protocols/toc/toc.c:1987 src/buddy_chat.c:317 src/buddy_chat.c:401
-#: src/dialogs.c:1132 src/dialogs.c:2102 src/dialogs.c:2225 src/dialogs.c:2290
-#: src/dialogs.c:2500 src/dialogs.c:2682 src/dialogs.c:2859 src/dialogs.c:2926
-#: src/dialogs.c:3567 src/dialogs.c:3765 src/dialogs.c:3922 src/dialogs.c:4304
-#: src/dialogs.c:4409 src/dialogs.c:5151 src/multi.c:1040 src/multi.c:1139
-#: src/multi.c:1457 src/prpl.c:280 src/prpl.c:638
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1651
-#: src/protocols/msn/msn.c:1163 src/protocols/msn/msn.c:1318
-#: src/protocols/oscar/oscar.c:2130
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1651
-#: src/protocols/msn/msn.c:1163 src/protocols/msn/msn.c:1318
-#: src/protocols/oscar/oscar.c:2130 src/protocols/oscar/oscar.c:2183
-#: src/dialogs.c:2499
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
 msgid "Deny"
 msgstr "Negar"
 
@@ -599,9 +598,9 @@
 msgid "Send message through server"
 msgstr "Enviar mensajes a travs del servidor"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2641
-#: src/protocols/jabber/jabber.c:3240 src/protocols/jabber/jabber.c:3273
-#: src/protocols/oscar/oscar.c:4680 src/protocols/oscar/oscar.c:4732
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
 #: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Obtener Informacin"
@@ -618,7 +617,7 @@
 "(Hubo un error convirtiendo este mensaje.  Verifique la opcin "
 "'Codificacin' en el Editor de Cuentas)"
 
-#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2351
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, fuzzy, c-format
 msgid "DCC Chat with %s closed"
 msgstr "Se cerr el IM con %s"
@@ -627,7 +626,7 @@
 msgid "No topic is set"
 msgstr "No se asign tema"
 
-#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1539
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s ha cambiado el tema a: %s</B>"
@@ -690,14 +689,14 @@
 "Solicita una conexin directa entre las dos computadoras. Los mensajes "
 "enviados no pasaran por el servidor de IRC"
 
-#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2030
-#: src/protocols/oscar/oscar.c:4641
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:306
-#: src/protocols/msn/msn.c:1327 src/protocols/msn/msn.c:1343
-#: src/protocols/msn/msn.c:1828
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "No se pudo escribir"
 
@@ -711,78 +710,78 @@
 msgid "Kicked by %s: %s"
 msgstr "Expulsado por %s: %s"
 
-#: src/protocols/irc/irc.c:1457 src/protocols/irc/irc.c:2660
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
 msgid "CTCP ClientInfo"
 msgstr "Informacin del cliente va CTCP"
 
-#: src/protocols/irc/irc.c:1463 src/protocols/irc/irc.c:2666
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
 msgid "CTCP UserInfo"
 msgstr "Informacin del Usuario va CTCP"
 
-#: src/protocols/irc/irc.c:1469 src/protocols/irc/irc.c:2672
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
 msgid "CTCP Version"
 msgstr "Obtener versin del cliente va CTCP"
 
-#: src/protocols/irc/irc.c:1489 src/protocols/irc/irc.c:2678
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
 msgid "CTCP Ping"
 msgstr "Ping CTCP"
 
-#: src/protocols/irc/irc.c:1969
+#: src/protocols/irc/irc.c:1972
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "El tema de %s es %s"
 
-#: src/protocols/irc/irc.c:2061
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Ha abandonado %s"
 
-#: src/protocols/irc/irc.c:2062
+#: src/protocols/irc/irc.c:2065
 msgid "IRC Part"
 msgstr "Salir de IRC"
 
-#: src/protocols/irc/irc.c:2229
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Canal:"
 
-#: src/protocols/irc/irc.c:2233 src/aim.c:324 src/multi.c:641
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Contrasea:"
 
-#: src/protocols/irc/irc.c:2647
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "Conversar por DCC"
 
-#: src/protocols/irc/irc.c:2718 src/protocols/jabber/jabber.c:2859
-#: src/protocols/msn/msn.c:2905 src/protocols/napster/napster.c:615
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/protocols/irc/irc.c:2724 src/protocols/jabber/jabber.c:4223
-#: src/protocols/msn/msn.c:2911 src/protocols/napster/napster.c:621
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/protocols/irc/irc.c:2730
+#: src/protocols/irc/irc.c:2733
 msgid "Encoding:"
 msgstr "Codificacin:"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:972
 msgid "Unable to change password."
 msgstr "No se puede cambiar la contrasea."
 
-#: src/protocols/jabber/jabber.c:972
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 "La ingresada no es la contrasea actual. Su contrasea no ha sido cambiada."
 
-#: src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:978
 msgid "Unable to change password"
 msgstr "No se pudo cambiar la contrasea"
 
-#: src/protocols/jabber/jabber.c:978
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
@@ -790,43 +789,43 @@
 "La nueva contrasea que usted ingres es la misma que la actual.  Su "
 "contrasea seguir siendo la misma."
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/protocols/jabber/jabber.c:1166 src/protocols/jabber/jabber.c:1184
-#: src/buddy.c:2794 src/multi.c:245
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Conectado"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr "Ausencia Extendida"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr "No Molestar"
 
-#: src/protocols/jabber/jabber.c:1367
+#: src/protocols/jabber/jabber.c:1368
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Error Jabber %s"
 
-#: src/protocols/jabber/jabber.c:1473
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1476
+#: src/protocols/jabber/jabber.c:1477
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: src/protocols/jabber/jabber.c:1646
+#: src/protocols/jabber/jabber.c:1647
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "El usuario %s quiere aadirle a su lista de amigos"
 
-#: src/protocols/jabber/jabber.c:1671
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
@@ -834,179 +833,179 @@
 "El usuario Jabber %s no existe y por lo tanto no se lo aadir a su \"roster"
 "\"."
 
-#: src/protocols/jabber/jabber.c:1674
+#: src/protocols/jabber/jabber.c:1675
 msgid "No such user."
 msgstr "No existe el usuario."
 
-#: src/protocols/jabber/jabber.c:1756 src/protocols/msn/msn.c:1353
-#: src/dialogs.c:924
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Amigos"
 
-#: src/protocols/jabber/jabber.c:1816
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr "Autentificando"
 
-#: src/protocols/jabber/jabber.c:1853
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "Error de login desconocido."
 
-#: src/protocols/jabber/jabber.c:2241
+#: src/protocols/jabber/jabber.c:2242
 msgid "Password successfully changed."
 msgstr "La contrasea se cambi correctamente."
 
-#: src/protocols/jabber/jabber.c:2285 src/protocols/jabber/jabber.c:4075
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "Se perdi la conexin"
 
-#: src/protocols/jabber/jabber.c:2287 src/protocols/jabber/jabber.c:2319
-#: src/protocols/jabber/jabber.c:4077 src/protocols/jabber/jabber.c:4123
-#: src/protocols/msn/msn.c:1978 src/protocols/msn/msn.c:2007
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/jabber/jabber.c:2293
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "Conectado"
 
-#: src/protocols/jabber/jabber.c:2296
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "Solicitando Mtodo de Autentificacin"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2314 src/protocols/msn/msn.c:1999
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/protocols/jabber/jabber.c:2618
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 "El usuario %s es un I.D. de Jabber invlido y por lo tanto no fue aadido."
 
-#: src/protocols/jabber/jabber.c:2620
+#: src/protocols/jabber/jabber.c:2621
 msgid "Jabber Error"
 msgstr "Error Jabber"
 
-#: src/protocols/jabber/jabber.c:2855
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "Sala:"
 
-#: src/protocols/jabber/jabber.c:2864
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "Gestor:"
 
-#: src/protocols/jabber/jabber.c:2888
+#: src/protocols/jabber/jabber.c:2889
 msgid "Unable to join chat"
 msgstr "No se pudo unir a la conversacin."
 
-#: src/protocols/jabber/jabber.c:2921
+#: src/protocols/jabber/jabber.c:2922
 msgid "Chats"
 msgstr "Conversaciones"
 
-#: src/protocols/jabber/jabber.c:3228
+#: src/protocols/jabber/jabber.c:3229
 msgid "View Error Msg"
 msgstr "Ver Mensaje de Error"
 
-#: src/protocols/jabber/jabber.c:3245 src/protocols/oscar/oscar.c:4693
-#: src/buddy_chat.c:895
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Mensaje de Ausencia"
 
-#: src/protocols/jabber/jabber.c:3252
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3255
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr "Ocultarse Temporariamente de"
 
-#: src/protocols/jabber/jabber.c:3278
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr "Sacar del \"roster\""
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3284
 msgid "Cancel Presence Notification"
 msgstr "Cancelar Notificacin de Presencia"
 
-#: src/protocols/jabber/jabber.c:3476
-msgid "Full Name"
-msgstr "Nombre Completo"
-
 #: src/protocols/jabber/jabber.c:3477
-msgid "Family Name"
-msgstr "Apellido"
+msgid "Full Name"
+msgstr "Nombre Completo"
 
 #: src/protocols/jabber/jabber.c:3478
+msgid "Family Name"
+msgstr "Apellido"
+
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3479
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/protocols/jabber/jabber.c:3480 src/dialogs.c:2939
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3481
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Calle"
 
-#: src/protocols/jabber/jabber.c:3482
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "Direccin extendida"
 
-#: src/protocols/jabber/jabber.c:3483
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "Localidad"
 
-#: src/protocols/jabber/jabber.c:3484
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr "Regin"
 
-#: src/protocols/jabber/jabber.c:3485
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "Cdigo postal"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3486 src/dialogs.c:2066 src/dialogs.c:2770
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Pas"
 
-#: src/protocols/jabber/jabber.c:3487
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "Telfono"
 
-#: src/protocols/jabber/jabber.c:3488 src/dialogs.c:2844
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "Correo Electrnico"
 
-#: src/protocols/jabber/jabber.c:3489
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "Nombre de la Organizacin"
 
-#: src/protocols/jabber/jabber.c:3490
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: src/protocols/jabber/jabber.c:3491
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Ttulo"
 
-#: src/protocols/jabber/jabber.c:3492
-msgid "Role"
-msgstr "Rol"
-
 #: src/protocols/jabber/jabber.c:3493
+msgid "Role"
+msgstr "Rol"
+
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "Fecha de nacimiento"
 
-#: src/protocols/jabber/jabber.c:3494 src/dialogs.c:2947 src/prefs.c:985
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Descripcin"
 
-#: src/protocols/jabber/jabber.c:3519
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -1014,190 +1013,190 @@
 "Todos los campos siguientes son opcionales. Introduzca solo la informacin "
 "que siente confortable compartir"
 
-#: src/protocols/jabber/jabber.c:3520
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "Identidad de Usuario"
 
-#: src/protocols/jabber/jabber.c:3932
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Editar datos en Jabber"
 
-#: src/protocols/jabber/jabber.c:4005
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "Registro en el servidor efectuado exitosamente"
 
-#: src/protocols/jabber/jabber.c:4032
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "Error desconocido al registrar"
 
-#: src/protocols/jabber/jabber.c:4141 src/protocols/jabber/jabber.c:4156
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "Cambiar Informacin de Usuario"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Error de sintaxis (probablemente un bug de Gaim)"
 
-#: src/protocols/msn/msn.c:224
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "Parmetro invlido (probablemente un bug de Gaim)"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:228
 msgid "Invalid User"
 msgstr "Usuario no vlido"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr "Falta un nombre de dominio completo"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr "Ya ingres"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:237
 msgid "Invalid Username"
 msgstr "Nombre de usuario no vlido"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Friendly Name"
 msgstr "Nombre no vlido"
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr "Lista llena"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr "Ya en lista"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:249
 msgid "Not on list"
 msgstr "No est en la lista"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr "El usuario no est conectado"
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr "Ya en ese modo"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr "Ya est en la lista contraria"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr "Fall el servidor Switchboard"
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr "Fall la Notificacin de la Transferencia"
 
-#: src/protocols/msn/msn.c:267
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr "Faltan campos obligatorios"
 
-#: src/protocols/msn/msn.c:270 src/protocols/oscar/oscar.c:399
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 msgid "Not logged in"
 msgstr "No ha iniciado sesin"
 
-#: src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:275
 msgid "Internal server error"
 msgstr "Error interno del servidor"
 
-#: src/protocols/msn/msn.c:277
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr "Error del servidor de base de datos"
 
-#: src/protocols/msn/msn.c:280
+#: src/protocols/msn/msn.c:281
 msgid "File operation error"
 msgstr "Error de archivos"
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:284
 msgid "Memory allocation error"
 msgstr "Error pidiendo memoria"
 
-#: src/protocols/msn/msn.c:287
+#: src/protocols/msn/msn.c:288
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#: src/protocols/msn/msn.c:290
+#: src/protocols/msn/msn.c:291
 msgid "Server unavailable"
 msgstr "Servidor no disponible"
 
-#: src/protocols/msn/msn.c:293
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr "Servidor de notificacin de pares cado"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:297
 #, fuzzy
 msgid "Database connect error"
 msgstr "error interno de conexin"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor est apagndose (Slvese quien pueda)"
 
-#: src/protocols/msn/msn.c:303
+#: src/protocols/msn/msn.c:304
 msgid "Error creating connection"
 msgstr "Error al crear la conexin"
 
-#: src/protocols/msn/msn.c:309
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:313
 #, fuzzy
 msgid "User is too active"
 msgstr "El usuario no est conectado"
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr "Demasiadas sesiones"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr "No se esperaba"
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr "Archivo de amigos incorrecto"
 
-#: src/protocols/msn/msn.c:325
+#: src/protocols/msn/msn.c:326
 msgid "Authentication failed"
 msgstr "Fall la autentificacin"
 
-#: src/protocols/msn/msn.c:328
+#: src/protocols/msn/msn.c:329
 msgid "Not allowed when offline"
 msgstr "No puede mandar mensajes fuera de lnea"
 
-#: src/protocols/msn/msn.c:331
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr "No se aceptan nuevos usuarios"
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr "Usuario no verificado"
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:338
 msgid "Unknown Error Code"
 msgstr "Cdigo de error desconocido"
 
-#: src/protocols/msn/msn.c:490
+#: src/protocols/msn/msn.c:491
 #, c-format
 msgid "%s has closed the conversation window"
 msgstr "%s cerr la ventana con la conversacin"
 
-#: src/protocols/msn/msn.c:561
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr "Un mensaje MSN puede no haber llegado a destino."
 
-#: src/protocols/msn/msn.c:1058
+#: src/protocols/msn/msn.c:1041
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim no pudo enviar un mensaje MSN"
 
-#: src/protocols/msn/msn.c:1059
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
@@ -1205,169 +1204,169 @@
 "Gaim encontr un error mientras se comunicaba con el servidor MSN de "
 "'switchboard'.  Por favor vuelva a intentar ms tarde."
 
-#: src/protocols/msn/msn.c:1092 src/protocols/msn/msn.c:1111
-#: src/protocols/msn/msn.c:2282 src/protocols/msn/msn.c:2404
-#: src/protocols/msn/msn.c:2422 src/protocols/msn/msn.c:2542
-#: src/protocols/msn/msn.c:2555 src/protocols/msn/msn.c:2581
-#: src/protocols/msn/msn.c:2638 src/protocols/msn/msn.c:2656
-#: src/protocols/msn/msn.c:2691 src/protocols/msn/msn.c:2725
-#: src/protocols/msn/msn.c:2766 src/protocols/msn/msn.c:2773
-#: src/protocols/msn/msn.c:2786 src/protocols/msn/msn.c:2794
-#: src/protocols/msn/msn.c:2823 src/protocols/msn/msn.c:2832
-#: src/protocols/msn/msn.c:2845 src/protocols/msn/msn.c:2853
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: src/protocols/msn/msn.c:1160
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "El usuario %s (%s) quiere aadir a %s a su lista de amigos."
 
-#: src/protocols/msn/msn.c:1210 src/protocols/msn/msn.c:1985
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
 msgid "Unable to write to server"
 msgstr "No se pudo escribir al servidor"
 
-#: src/protocols/msn/msn.c:1317
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "El usuario %s (%s) quiere aadirle a su lista de amigos"
 
-#: src/protocols/msn/msn.c:1418
+#: src/protocols/msn/msn.c:1401
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Ha sido desconectado al conectar desde otra ubicacin"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/msn/msn.c:1869
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
 msgid "Got invalid XFR\n"
 msgstr "Se obtuvo un XFR invlido\n"
 
-#: src/protocols/msn/msn.c:1593
+#: src/protocols/msn/msn.c:1576
 msgid "Error transfering"
 msgstr "Error transfiriendo"
 
-#: src/protocols/msn/msn.c:1677 src/protocols/msn/msn.c:1916
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 msgid "Error reading from server"
 msgstr "Error al leer del servidor"
 
-#: src/protocols/msn/msn.c:1761
+#: src/protocols/msn/msn.c:1744
 msgid "Unable to connect to Notification Server"
 msgstr "No se pudo conectar al Servidor de Notificaciones"
 
-#: src/protocols/msn/msn.c:1768
+#: src/protocols/msn/msn.c:1751
 msgid "Unable to talk to Notification Server"
 msgstr ""
 "No se pudo establecer una conversacin con el Servidor de Notificaciones"
 
-#: src/protocols/msn/msn.c:1784
+#: src/protocols/msn/msn.c:1767
 msgid "Protocol not supported"
 msgstr "Protocolo no soportado"
 
-#: src/protocols/msn/msn.c:1791
+#: src/protocols/msn/msn.c:1774
 msgid "Unable to request INF\n"
 msgstr "No se pudo pedir INF\n"
 
-#: src/protocols/msn/msn.c:1798
+#: src/protocols/msn/msn.c:1781
 msgid "Unable to login using MD5"
 msgstr "No se pudo entrar usando MD5"
 
-#: src/protocols/msn/msn.c:1805
+#: src/protocols/msn/msn.c:1788
 msgid "Unable to send USR\n"
 msgstr "No se pudo enviar USR\n"
 
-#: src/protocols/msn/msn.c:1810
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr "Solicitando enviar contrasea"
 
-#: src/protocols/msn/msn.c:1856
+#: src/protocols/msn/msn.c:1839
 msgid "Unable to send password"
 msgstr "No se pudo enviar la contrasea"
 
-#: src/protocols/msn/msn.c:1861
+#: src/protocols/msn/msn.c:1844
 msgid "Password sent"
 msgstr "Contrasea enviada"
 
-#: src/protocols/msn/msn.c:1890
+#: src/protocols/msn/msn.c:1873
 msgid "Unable to transfer"
 msgstr "No se pudo transferir"
 
-#: src/protocols/msn/msn.c:1898
+#: src/protocols/msn/msn.c:1881
 msgid "Unable to parse message"
 msgstr "No se pudo interpretar el mensaje"
 
-#: src/protocols/msn/msn.c:1991
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr "Redirigiendo al servidor"
 
-#: src/protocols/msn/msn.c:2353 src/protocols/msn/msn.c:2380
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: src/protocols/msn/msn.c:2354 src/protocols/msn/msn.c:2382
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: src/protocols/msn/msn.c:2355 src/protocols/msn/msn.c:2384
-#: src/protocols/msn/msn.c:2445
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/protocols/msn/msn.c:2356 src/protocols/msn/msn.c:2386
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr "Al telfono"
 
-#: src/protocols/msn/msn.c:2357 src/protocols/msn/msn.c:2388
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr "Sal a comer"
 
-#: src/protocols/msn/msn.c:2358 src/protocols/msn/msn.c:2390
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/protocols/msn/msn.c:2447
+#: src/protocols/msn/msn.c:2428
 msgid "Be right back"
 msgstr "Vuelvo enseguida"
 
-#: src/protocols/msn/msn.c:2449
+#: src/protocols/msn/msn.c:2430
 msgid "Away from the computer"
 msgstr "Ausente"
 
-#: src/protocols/msn/msn.c:2451
+#: src/protocols/msn/msn.c:2432
 msgid "On the phone"
 msgstr "Al telfono"
 
-#: src/protocols/msn/msn.c:2453
+#: src/protocols/msn/msn.c:2434
 msgid "Out to lunch"
 msgstr "Sal a comer"
 
-#: src/protocols/msn/msn.c:2455 src/prefs.c:748
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
 msgid "Idle"
 msgstr "Ausente"
 
-#: src/protocols/msn/msn.c:2492
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr "Actualizar nombre"
 
-#: src/protocols/msn/msn.c:2498 src/protocols/oscar/oscar.c:2581
-#: src/protocols/oscar/oscar.c:4706 src/buddy.c:2191
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
 msgid "Send File"
 msgstr "Enviar Archivo"
 
-#: src/protocols/msn/msn.c:2574
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr "El nuevo nombre amistoso MSN es demasiado largo."
 
-#: src/protocols/msn/msn.c:2589 src/protocols/msn/msn.c:2610
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 msgid "Set Friendly Name"
 msgstr "Establecer nombre"
 
-#: src/protocols/msn/msn.c:2590
+#: src/protocols/msn/msn.c:2571
 msgid "Set Friendly Name:"
 msgstr "Establecer nombre:"
 
-#: src/protocols/msn/msn.c:2591 src/protocols/msn/msn.c:2611
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr "Actualizar todos los nombres"
 
-#: src/protocols/msn/msn.c:2751
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1377,11 +1376,11 @@
 "Quiz quiso decir %s@hotmail.com.  No se modific su lista de usuarios "
 "aceptados."
 
-#: src/protocols/msn/msn.c:2754 src/protocols/msn/msn.c:2811
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 msgid "Invalid MSN screenname"
 msgstr "Nombre de usuario MSN no vlido"
 
-#: src/protocols/msn/msn.c:2808
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1391,196 +1390,196 @@
 "Quiz usted quiso decir %s@hotmail.com.  No se efectuaron cambios en su "
 "lista de usuarios bloqueados."
 
-#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4205
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
 #: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Unirse a qu grupo:"
 
-#: src/protocols/oscar/oscar.c:395
+#: src/protocols/oscar/oscar.c:394
 msgid "Invalid error"
 msgstr "Error invlido"
 
-#: src/protocols/oscar/oscar.c:396
+#: src/protocols/oscar/oscar.c:395
 msgid "Invalid SNAC"
 msgstr "SNAC invlido"
 
-#: src/protocols/oscar/oscar.c:397
+#: src/protocols/oscar/oscar.c:396
 msgid "Rate to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:397
 msgid "Rate to client"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:400
+#: src/protocols/oscar/oscar.c:399
 msgid "Service unavailable"
 msgstr "Servicio no disponible"
 
-#: src/protocols/oscar/oscar.c:401
+#: src/protocols/oscar/oscar.c:400
 msgid "Service not defined"
 msgstr "Servicio no definido"
 
-#: src/protocols/oscar/oscar.c:402
+#: src/protocols/oscar/oscar.c:401
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:402
 msgid "Not supported by host"
 msgstr "No soportado por el servidor"
 
-#: src/protocols/oscar/oscar.c:404
+#: src/protocols/oscar/oscar.c:403
 msgid "Not supported by client"
 msgstr "No soportado por el cliente"
 
-#: src/protocols/oscar/oscar.c:405
+#: src/protocols/oscar/oscar.c:404
 msgid "Refused by client"
 msgstr "Rechazado por el cliente"
 
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:405
 msgid "Reply too big"
 msgstr "Respuesta demasiado grande"
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:406
 msgid "Responses lost"
 msgstr "Respuestas perdidas"
 
-#: src/protocols/oscar/oscar.c:408
+#: src/protocols/oscar/oscar.c:407
 msgid "Request denied"
 msgstr "Pedido negado"
 
-#: src/protocols/oscar/oscar.c:409
+#: src/protocols/oscar/oscar.c:408
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:409
 msgid "Insufficient rights"
 msgstr "Derechos insuficientes"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:410
 #, fuzzy
 msgid "In local permit/deny"
 msgstr "Aadir amigo a autorizar/negar"
 
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
 #: src/protocols/oscar/oscar.c:412
-msgid "Too evil (sender)"
+msgid "Too evil (receiver)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:413
-msgid "Too evil (receiver)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:414
 #, fuzzy
 msgid "User temporarily unavailable"
 msgstr "Servicio de directorio temporalmente no disponible."
 
-#: src/protocols/oscar/oscar.c:415
+#: src/protocols/oscar/oscar.c:414
 msgid "No match"
 msgstr "No hubo coincidencia"
 
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
 #: src/protocols/oscar/oscar.c:416
-msgid "List overflow"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:417
 msgid "Request ambiguous"
 msgstr "Pedido ambiguo"
 
-#: src/protocols/oscar/oscar.c:418
+#: src/protocols/oscar/oscar.c:417
 msgid "Queue full"
 msgstr "Cola llena"
 
-#: src/protocols/oscar/oscar.c:419
+#: src/protocols/oscar/oscar.c:418
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Se cerr el IM con %s"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Fallo un IM directo con %s"
 
-#: src/protocols/oscar/oscar.c:503
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "error de conexin (rend)\n"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "error de conexin grave\n"
 
-#: src/protocols/oscar/oscar.c:515 src/protocols/toc/toc.c:555
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
 #: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: src/protocols/oscar/oscar.c:527 src/protocols/toc/toc.c:805
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala: %s"
 
-#: src/protocols/oscar/oscar.c:540
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "La conversacin no est disponible"
 
-#: src/protocols/oscar/oscar.c:561 src/protocols/oscar/oscar.c:1896
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
 msgid "Buddy canceled transfer"
 msgstr "La otra parte cancel la transferencia"
 
-#: src/protocols/oscar/oscar.c:614 src/protocols/oscar/oscar.c:677
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al host"
 
-#: src/protocols/oscar/oscar.c:622
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Contrasea enviada, esperando respuesta\n"
 
-#: src/protocols/oscar/oscar.c:658
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "error interno de conexin\n"
 
-#: src/protocols/oscar/oscar.c:659
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/protocols/oscar/oscar.c:664
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Desconectado.\n"
 
-#: src/protocols/oscar/oscar.c:766 src/protocols/oscar/oscar.c:914
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/oscar/oscar.c:774
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Conexin establecida, cookie enviada"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:815 src/protocols/toc/toc.c:503
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contrasea incorrecta."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:820
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Su cuenta est deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:824
+#: src/protocols/oscar/oscar.c:819
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajero Instantneo AOL est temporalmente no disponible."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:828
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1590,23 +1589,23 @@
 "tiempo."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:833
+#: src/protocols/oscar/oscar.c:828
 #, fuzzy, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versin del cliente que usa es demasiado antigua. Por favor, actualcela "
 "en "
 
-#: src/protocols/oscar/oscar.c:838 src/protocols/toc/toc.c:586
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Fall la Autorizacin"
 
-#: src/protocols/oscar/oscar.c:860
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/protocols/oscar/oscar.c:953 src/protocols/oscar/oscar.c:982
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -1615,46 +1614,46 @@
 "Quiz sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Monitoree %s para novedades."
 
-#: src/protocols/oscar/oscar.c:955 src/protocols/oscar/oscar.c:984
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim no pudo enviar el mensaje"
 
-#: src/protocols/oscar/oscar.c:1068
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim no pudo enviar el mensaje"
 
-#: src/protocols/oscar/oscar.c:1508 src/protocols/oscar/oscar.c:4507
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Se estableci un IM Directo con %s"
 
-#: src/protocols/oscar/oscar.c:1618
+#: src/protocols/oscar/oscar.c:1609
 msgid "Transfer timed out"
 msgstr "Se acab el tiempo destinado a la transferencia"
 
-#: src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1631
 #, fuzzy
 msgid "Couldn't open listener to send file"
 msgstr "No se pudo abrir el archivo de configuracin %s."
 
-#: src/protocols/oscar/oscar.c:1641
+#: src/protocols/oscar/oscar.c:1632
 msgid "File transfer aborted"
 msgstr "Transferencia de archivo abortada"
 
-#: src/protocols/oscar/oscar.c:1840 src/protocols/oscar/oscar.c:1860
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
 msgid "(There was an error receiving this message)"
 msgstr "(Hubo un error recibiendo este mensaje)"
 
-#: src/protocols/oscar/oscar.c:2030
+#: src/protocols/oscar/oscar.c:2020
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2126
+#: src/protocols/oscar/oscar.c:2116
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason: %"
@@ -1663,15 +1662,15 @@
 "El usuario %lu quiere aadirle a su lista de amigos por el siguiente motivo: "
 "%s"
 
-#: src/protocols/oscar/oscar.c:2126 src/protocols/oscar/oscar.c:2137
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
 msgid "No reason given."
 msgstr "No se indic una razn."
 
-#: src/protocols/oscar/oscar.c:2130
+#: src/protocols/oscar/oscar.c:2120
 msgid "Authorization Request"
 msgstr "Pedido de Autorizacin"
 
-#: src/protocols/oscar/oscar.c:2137
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1682,18 +1681,18 @@
 "la siguiente razn:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2138
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr "Autorizacin ICQ negada."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2144
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "El usuario %lu ha autorizado su peticin de aadirlo a su lista de contactos."
 
-#: src/protocols/oscar/oscar.c:2151
+#: src/protocols/oscar/oscar.c:2141
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -1706,7 +1705,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2159
+#: src/protocols/oscar/oscar.c:2149
 #, c-format
 msgid ""
 "You have received an ICQ email\n"
@@ -1727,180 +1726,181 @@
 "5=%s\n"
 "6=%s\n"
 
-#: src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "El usuario ICQ %lu le ha enviado un contacto: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2183
+#: src/protocols/oscar/oscar.c:2174
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "Desea aadir este contacto a su lista de amigos?"
 
-#: src/protocols/oscar/oscar.c:2262
-#, c-format
-msgid "You missed %d message from %s because it was invalid."
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
 msgstr "Usted perdi el mensaje %d de %s porque era invlido."
 
-#: src/protocols/oscar/oscar.c:2263
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
 msgstr "Usted perdi %d mensajes de %s porque eran invlidos."
 
-#: src/protocols/oscar/oscar.c:2272
-#, c-format
-msgid "You missed %d message from %s because it was too large."
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
 msgstr "Usted perdi el mensaje %d de %s porque era demasiado grande."
 
-#: src/protocols/oscar/oscar.c:2273
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
 msgstr "Usted perdi %d mensajes de %s porque eran demasiado grandes."
 
-#: src/protocols/oscar/oscar.c:2282
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
 msgstr ""
 "Usted perdi el mensaje %d de %s porque se excedi el lmite de cadencia."
 
-#: src/protocols/oscar/oscar.c:2283
-#, c-format
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr ""
 "Usted perdi %d mensajes de %s porque se excedi el lmite de cadencia."
 
-#: src/protocols/oscar/oscar.c:2292
+#: src/protocols/oscar/oscar.c:2284
 #, fuzzy, c-format
-msgid "You missed %d message from %s because he/she was too evil."
+msgid "You missed %hu message from %s because he/she was too evil."
 msgstr "Usted perdi el mensaje %d de %s porque era demasiado malvado."
 
-#: src/protocols/oscar/oscar.c:2293
+#: src/protocols/oscar/oscar.c:2285
 #, fuzzy, c-format
-msgid "You missed %d messages from %s because he/she was too evil."
+msgid "You missed %hu messages from %s because he/she was too evil."
 msgstr "Usted perdi el mensaje %d de %s porque era demasiado malvado."
 
-#: src/protocols/oscar/oscar.c:2302
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
+msgstr "Usted perdi %d mensajes de %s porque es demasiado malvado."
+
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr "Usted perdi %d mensajes de %s porque es demasiado malvado."
 
 #: src/protocols/oscar/oscar.c:2303
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
-msgstr "Usted perdi %d mensajes de %s porque es demasiado malvado."
-
-#: src/protocols/oscar/oscar.c:2311
 #, fuzzy, c-format
-msgid "You missed %d message from %s for an unknown reason."
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Usted perdi el mensaje %d de %s por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:2312
+#: src/protocols/oscar/oscar.c:2304
 #, fuzzy, c-format
-msgid "You missed %d messages from %s for an unknown reason."
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Usted perdi %d mensajes de %s por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:2350
+#: src/protocols/oscar/oscar.c:2342
 #, c-format
 msgid "%s has declined to receive a file from %s.\n"
 msgstr "%s ha declinado el recibir un archivo de %s.\n"
 
-#: src/protocols/oscar/oscar.c:2395
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<BR><HR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:2397
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>Estado:</B> %s<BR><HR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC envi el error: %s\n"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2446
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/protocols/oscar/oscar.c:2477 src/protocols/oscar/oscar.c:2485
-#: src/protocols/oscar/oscar.c:2537
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 msgid "No reason was given."
 msgstr "No se indic una razn."
 
 #. Data is assumed to be the destination sn.
-#: src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Su mensaje a %s no fue enviado:"
 
-#: src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:2528
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informacin de usuario de %s no disponible:"
 
-#: src/protocols/oscar/oscar.c:2566 src/buddy.c:2176
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "cono de Amigo"
 
-#: src/protocols/oscar/oscar.c:2569 src/buddy.c:2179
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Voz"
 
-#: src/protocols/oscar/oscar.c:2572 src/buddy.c:2182
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "Imagen de IM"
 
-#: src/protocols/oscar/oscar.c:2575 src/buddy.c:500 src/buddy.c:2185
-#: src/buddy.c:2530
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Hablar"
 
-#: src/protocols/oscar/oscar.c:2578 src/buddy.c:2188
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Recibir Archivo"
 
-#: src/protocols/oscar/oscar.c:2585 src/buddy.c:2195
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Juegos"
 
-#: src/protocols/oscar/oscar.c:2588 src/buddy.c:2198
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Bolsa"
 
-#: src/protocols/oscar/oscar.c:2591 src/buddy.c:2201
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Enviar Lista de Amigos"
 
-#: src/protocols/oscar/oscar.c:2594 src/buddy.c:2204
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "Bug de EveryBuddy"
 
-#: src/protocols/oscar/oscar.c:2597 src/buddy.c:2207
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: src/protocols/oscar/oscar.c:2600 src/buddy.c:2210
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:2603 src/buddy.c:2213
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:2606 src/buddy.c:2216
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:2609 src/buddy.c:2219
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ Desconocido"
 
-#: src/protocols/oscar/oscar.c:2612 src/buddy.c:2222
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: src/protocols/oscar/oscar.c:2661
+#: src/protocols/oscar/oscar.c:2655
 msgid ""
 "<I>Unable to display information because it was sent in an unknown encoding."
 "</I>"
@@ -1908,22 +1908,7 @@
 "<I>No se puede mostrar cierta informacin porque fue enviada con una "
 "codificacin desconocida.</I>"
 
-#: src/protocols/oscar/oscar.c:2668
-msgid ""
-"<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 ""
-"<BODY BGCOLOR=WHITE><hr><I>Leyenda:</I><br><br><IMG SRC=\"free_icon.gif\"> : "
-"Usuario Normal de AIM<br><IMG SRC=\"aol_icon.gif\"> : Usuario de AOL<br><IMG "
-"SRC=\"dt_icon.gif\"> : Usuario de prueba de AIM<br><IMG SRC=\"admin_icon.gif"
-"\"> : Administrador <br><IMG SRC=\"ab_icon.gif\"> : Agente Interactivo de "
-"ActiveBuddy<br><IMG SRC=\"wireless_icon.gif\"> : Usuario de dispositivo "
-"inalmbrico<br>"
-
-#: src/protocols/oscar/oscar.c:2696
+#: src/protocols/oscar/oscar.c:2677
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -1936,27 +1921,27 @@
 "%s%s%s<BR>\n"
 "<HR>\n"
 
-#: src/protocols/oscar/oscar.c:2728
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>El usuario no tiene mensaje de ausencia</i>"
 
-#: src/protocols/oscar/oscar.c:2740
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Funcionalidades del Cliente: "
 
-#: src/protocols/oscar/oscar.c:2748
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>No se aport informacin</i>"
 
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:2751
 msgid "Your AIM connection may be lost."
 msgstr "Su conexin AIM puede haberse perdido."
 
-#: src/protocols/oscar/oscar.c:3031
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3032
+#: src/protocols/oscar/oscar.c:3011
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -1964,62 +1949,62 @@
 "El ltimo mensaje no se envi por haber superado el lmite de cadencia.  Por "
 "favor espere 10 segundos y vuelva a intentarlo."
 
-#: src/protocols/oscar/oscar.c:3483
+#: src/protocols/oscar/oscar.c:3463
 msgid "Account Confirmation Requested"
 msgstr "Confirmacin de Cuenta Solicitada"
 
-#: src/protocols/oscar/oscar.c:3510
+#: src/protocols/oscar/oscar.c:3490
 msgid "Error Changing Account Info"
 msgstr "Error Cambiando Info de la Cuenta"
 
-#: src/protocols/oscar/oscar.c:3513
+#: src/protocols/oscar/oscar.c:3493
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3516
+#: src/protocols/oscar/oscar.c:3496
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3519
+#: src/protocols/oscar/oscar.c:3499
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3522
+#: src/protocols/oscar/oscar.c:3502
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3525
+#: src/protocols/oscar/oscar.c:3505
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3508
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3531
+#: src/protocols/oscar/oscar.c:3511
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3521
 #, c-format
 msgid ""
 "Your screen name is currently formated as follows:\n"
@@ -2028,20 +2013,20 @@
 "El formato de su nombre de usuario es actualmente el siguiente:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3542 src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
 msgid "Account Info"
 msgstr "Informacin de la Cuenta"
 
-#: src/protocols/oscar/oscar.c:3547
+#: src/protocols/oscar/oscar.c:3527
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "La direccin de correo electrnico de %s es %s"
 
-#: src/protocols/oscar/oscar.c:3740
+#: src/protocols/oscar/oscar.c:3720
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: src/protocols/oscar/oscar.c:3741
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -2051,25 +2036,25 @@
 "ingreso se haya completado.  Su perfil quedar sin cambiar, intntelo "
 "nuevamente cuando ya est conectado del todo."
 
-#: src/protocols/oscar/oscar.c:3747
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3784
+#: src/protocols/oscar/oscar.c:3764
 msgid "Unable to set AIM away message."
 msgstr "No se pudo establecer el mensaje de ausencia AIM."
 
-#: src/protocols/oscar/oscar.c:3785
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3801
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
@@ -2078,27 +2063,27 @@
 "Fue excedido el lmite de %d bytes de longitud en el mensaje de ausencia.  "
 "Gaim lo trunc y ya est usted marcado como ausente."
 
-#: src/protocols/oscar/oscar.c:4188
+#: src/protocols/oscar/oscar.c:4168
 #, 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:4209 src/protocols/toc/toc.c:1148
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Intercambio:"
 
-#: src/protocols/oscar/oscar.c:4630
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a IM"
 
-#: src/protocols/oscar/oscar.c:4640
+#: src/protocols/oscar/oscar.c:4620
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4641
+#: src/protocols/oscar/oscar.c:4621
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -2106,7 +2091,7 @@
 "Como sto revela su direccin IP, puede ser considerado como un riesgo a su "
 "privacidad.  Quiere continuar?"
 
-#: src/protocols/oscar/oscar.c:4655
+#: src/protocols/oscar/oscar.c:4635
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
@@ -2115,7 +2100,7 @@
 "<B>UIN:</B> %s<BR><B>Estado:</B> %s<BR><HR><I>El cliente remoto no soporta "
 "el envo de mensajes de estado.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4662
+#: src/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
@@ -2124,15 +2109,15 @@
 "<B>UIN:</B> %s<BR><B>Estado:</B> %s<BR><HR><I>El usuario no tiene mensaje de "
 "estado.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4687
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "Obtener Msj de Estado"
 
-#: src/protocols/oscar/oscar.c:4700
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "IM Directo"
 
-#: src/protocols/oscar/oscar.c:4714
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Obtener funcionalidades"
 
@@ -2373,7 +2358,7 @@
 msgid "About Gaim v%s"
 msgstr "Acerca de Gaim v%s"
 
-#: src/about.c:111
+#: src/about.c:112
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -2383,37 +2368,37 @@
 "ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr y Gadu-Gadu al mismo tiempo.  "
 "Est escrito usando GTK+ y est licenciado bajo la licencia GNU GPL.<BR><BR>"
 
-#: src/about.c:121
+#: src/about.c:122
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> canal #gaim en irc.freenode.net<BR><BR>"
 
-#: src/about.c:125
+#: src/about.c:126
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Desarrolladores en Actividad:</FONT><BR>"
 
-#: src/about.c:127
+#: src/about.c:128
 msgid ""
 "  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
 "A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
 "\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
 msgstr ""
 "  Rob Flynn (mantenedor) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
-"A>&gt;<BR>  Sean Egan (programador) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
-"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
-
-#: src/about.c:135
+"A>&gt;<BR>  Sean Egan (programador) &lt;<A HREF=\"mailto:bj91704@binghamton."
+"edu\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+
+#: src/about.c:136
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Alocados Escritores de Patchs:</FONT><BR>"
 
-#: src/about.c:143
+#: src/about.c:144
 msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Versin Win32:</FONT><BR>"
 
-#: src/about.c:150
+#: src/about.c:151
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Desarrolladores Retirados:</FONT><BR>"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid ""
 "  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
 "\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
@@ -2423,59 +2408,59 @@
 "\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (autor original) &lt;<A "
 "HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
 
-#: src/about.c:173 src/dialogs.c:1523 src/dialogs.c:4188 src/prpl.c:493
-#: src/prpl.c:740 src/server.c:1168
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/aim.c:164
+#: src/aim.c:165
 msgid "Please enter your login."
 msgstr "Por favor, ingrese su nombre de usuario."
 
-#: src/aim.c:283
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Ingreso"
 
-#: src/aim.c:306
+#: src/aim.c:307
 msgid "Screen Name:"
 msgstr "Nombre de Usuario:"
 
-#: src/away.c:192
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - Ausente!"
 
-#: src/away.c:252
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "Ya he vuelto!"
 
-#: src/away.c:370
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/away.c:390
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "Quitar Mensaje de Ausencia"
 
-#: src/away.c:578
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Ausente en todas las cuentas"
 
-#: src/buddy.c:495 src/buddy.c:2760 src/dialogs.c:1107
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Grupo"
 
-#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2528
-#: src/buddy_chat.c:869
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "Mensaje"
 
-#: src/buddy.c:502 src/buddy.c:2529 src/buddy_chat.c:886 src/buddy_chat.c:1597
-#: src/conversation.c:3072
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1099 src/dialogs.c:3751
-#: src/dialogs.c:3764
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
@@ -2511,22 +2496,22 @@
 msgid "[Click to edit]"
 msgstr "[Haga click para editar]"
 
-#: src/buddy.c:2298
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Conectado: %s\n"
 
-#: src/buddy.c:2310
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Advertencias: %d%%\n"
 
-#: src/buddy.c:2322
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Capacidades: %s\n"
 
-#: src/buddy.c:2326
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -2537,326 +2522,312 @@
 "Nombre de Usuario: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2330
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "Inactivo: "
 
-#: src/buddy.c:2399 src/buddy.c:2404
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s conectado."
 
-#: src/buddy.c:2458 src/buddy.c:2463
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s desconectado."
 
-#: src/buddy.c:2561
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Informacin sobre el Amigo seleccionado"
 
-#: src/buddy.c:2562
-msgid "Send Instant Message"
-msgstr "Mandar Mensaje Instantneo"
-
 #: src/buddy.c:2563
-msgid "Start/join a Buddy Chat"
-msgstr "Empezar/unirse a Conversacin de Amigos"
+msgid "Send Instant Message"
+msgstr "Mandar Mensaje Instantneo"
 
 #: src/buddy.c:2564
+msgid "Start/join a Buddy Chat"
+msgstr "Empezar/unirse a Conversacin de Amigos"
+
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Activar Mensaje de Ausencia"
 
-#: src/buddy.c:2614
+#: src/buddy.c:2615
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista de Amigos"
 
 #. The file menu
-#: src/buddy.c:2627 src/conversation.c:2194
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Archivo"
 
-#: src/buddy.c:2631
+#: src/buddy.c:2632
 msgid "_Add A Buddy"
 msgstr "_Aadir Amigo"
 
-#: src/buddy.c:2633
+#: src/buddy.c:2634
 msgid "_Join A Chat"
 msgstr "_Unirse a una Conversacin"
 
-#: src/buddy.c:2635
+#: src/buddy.c:2636
 msgid "_New Message"
 msgstr "_Nuevo Mensaje"
 
-#: src/buddy.c:2637
+#: src/buddy.c:2638
 msgid "_Get User Info"
 msgstr "_Obtener Informacin del Usuario"
 
-#: src/buddy.c:2642
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "Importar Lista de Amigos"
 
-#: src/buddy.c:2649
+#: src/buddy.c:2650
 #, fuzzy
 msgid "Hide"
 msgstr "Oculto"
 
-#: src/buddy.c:2656
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "Herramientas"
 
-#: src/buddy.c:2666
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr "Aviso de Amigo"
 
-#: src/buddy.c:2673
+#: src/buddy.c:2674
 msgid "_Accounts..."
 msgstr "_Cuentas..."
 
-#: src/buddy.c:2676
+#: src/buddy.c:2677
 msgid "_Preferences..."
 msgstr "_Preferencias..."
 
-#: src/buddy.c:2682
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Acciones del Protocolo"
 
-#: src/buddy.c:2686
+#: src/buddy.c:2687
 msgid "Pr_ivacy..."
 msgstr "Pr_ivacidad..."
 
-#: src/buddy.c:2689
+#: src/buddy.c:2690
 msgid "_View System Log..."
 msgstr "_Ver Registro del Sistema..."
 
-#: src/buddy.c:2694
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/buddy.c:2698
+#: src/buddy.c:2699
 msgid "Online Help"
 msgstr "Ayuda En-Lnea"
 
-#: src/buddy.c:2699
+#: src/buddy.c:2700
 msgid "Debug Window"
 msgstr "Ventana de Depuracin"
 
-#: src/buddy.c:2703
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: src/buddy.c:2720 src/prefs.c:1395
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "Lista de Amigos"
 
-#: src/buddy.c:2771
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "Aadir un nuevo Amigo"
 
-#: src/buddy.c:2772
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "Aadir un nuevo Grupo"
 
-#: src/buddy.c:2773
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "Quitar Amigo/Grupo seleccionado"
 
-#: src/buddy.c:2796
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Editar Amigos"
 
-#: src/buddy_chat.c:275
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Unirse a Conversacin"
 
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Unirse a Conversacin como:"
 
-#: src/buddy_chat.c:313
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Unirse"
 
-#: src/buddy_chat.c:402 src/buddy_chat.c:405 src/buddy_chat.c:1452
-#: src/buddy_chat.c:1547
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/buddy_chat.c:421 src/dialogs.c:1711 src/dialogs.c:3741
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Amigo"
 
-#: src/buddy_chat.c:426
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/buddy_chat.c:463
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invitar a un Amigo a la Conversacin"
 
-#: src/buddy_chat.c:876
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "No Ignorar"
 
-#: src/buddy_chat.c:878 src/prefs.c:280
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:954 src/buddy_chat.c:1093 src/buddy_chat.c:1659
-#: src/buddy_chat.c:1692
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s en la sala"
 
-#: src/buddy_chat.c:963
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrado en la sala."
 
-#: src/buddy_chat.c:965
+#: src/buddy_chat.c:959
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrado en la sala."
 
-#: src/buddy_chat.c:1044
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ahora se llama %s"
 
-#: src/buddy_chat.c:1102
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
 
-#: src/buddy_chat.c:1104
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha salido de la sala."
 
-#: src/buddy_chat.c:1210
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Conversaciones"
 
-#: src/buddy_chat.c:1290
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Tema:"
 
-#: src/buddy_chat.c:1329
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0 personas en la sala"
 
-#: src/buddy_chat.c:1436 src/buddy_chat.c:1546 src/buddy_chat.c:1579
-#: src/conversation.c:3031
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Enviar"
 
-#: src/buddy_chat.c:1594 src/conversation.c:3063
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "Advertir"
 
-#: src/buddy_chat.c:1600 src/conversation.c:3082
+#: src/buddy_chat.c:1592 src/conversation.c:2925
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/conversation.c:511
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Guardar Conversacin"
-
-#: src/conversation.c:559
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Insertar Imagen"
 
-#: src/conversation.c:1419
+#: src/conversation.c:1305
 msgid "Unable to send message.  The message is too large"
 msgstr "No se pudo enviar el mensaje.  Es demasiado grande"
 
-#: src/conversation.c:1423
+#: src/conversation.c:1309
 msgid "Unable to send message"
 msgstr "No se pudo enviar el mensaje"
 
-#: src/conversation.c:2198
+#: src/conversation.c:2043
 msgid "_Save Conversation"
 msgstr "_Guardar Conversacin"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2045
 msgid "View _History"
 msgstr "Ver _Historial"
 
 #.
 #. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
-#: src/conversation.c:2207
+#: src/conversation.c:2052
 msgid "Insert _URL"
 msgstr "Insertar _URL"
 
-#: src/conversation.c:2208
+#: src/conversation.c:2053
 msgid "Insert _Image"
 msgstr "Insertar _Imagen"
 
-#: src/conversation.c:2213
+#: src/conversation.c:2058
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/conversation.c:2218
+#: src/conversation.c:2063
 msgid "Options"
 msgstr "Opciones"
 
 #. Logging
-#: src/conversation.c:2223
+#: src/conversation.c:2068
 msgid "Enable _Logging"
 msgstr "_Habilitar registro"
 
-#: src/conversation.c:2241
+#: src/conversation.c:2086
 msgid "Enable _Sounds"
 msgstr "Habilitar _Sonidos"
 
-#: src/conversation.c:2753 src/conversation.c:2755 src/conversation.c:2766
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
 msgid " [TYPING]"
 msgstr " [TIPEANDO]"
 
-#: src/conversation.c:2756 src/conversation.c:2758 src/conversation.c:2770
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
 msgid " [TYPED]"
 msgstr " [TIPE]"
 
-#: src/conversation.c:2846
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversaciones"
 
-#: src/conversation.c:2959
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Enviar mensaje como: "
 
-#: src/conversation.c:3389 src/dialogs.c:2584
-#, c-format
-msgid "%s - Gaim (logged)"
-msgstr "%s - Gaim (registrada)"
-
-#: src/conversation.c:3391
-#, c-format
-msgid "%s - Gaim"
-msgstr "%s - Gaim"
-
-#: src/conversation.c:3583
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Guardar cono"
 
-#: src/conversation.c:3617
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Deshabilitar Animaciones"
 
-#: src/conversation.c:3624
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Habilitar Animaciones"
 
-#: src/conversation.c:3630
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Ocultar cono"
 
-#: src/conversation.c:3636
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Guardar cono Como..."
 
-#: src/dialogs.c:424
+#: src/dialogs.c:422
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -2865,34 +2836,34 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:433
+#: src/dialogs.c:431
 msgid "Warn _anonymously?"
 msgstr "Advertir _annimamente?"
 
-#: src/dialogs.c:440
+#: src/dialogs.c:438
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Las advertencias annimas son menos duras.</b>"
 
-#: src/dialogs.c:460
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Quitando '%s' de la lista de amigos.\n"
 
-#: src/dialogs.c:708
+#: src/dialogs.c:706
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
 "Por favor ingrese el nombre de usuario de la persona con la que se quiere "
 "comunicar.\n"
 
-#: src/dialogs.c:724 src/dialogs.c:818
+#: src/dialogs.c:722 src/dialogs.c:816
 msgid "_Screenname:"
 msgstr "_Nombre de Usuario:"
 
-#: src/dialogs.c:737 src/dialogs.c:831
+#: src/dialogs.c:735 src/dialogs.c:829
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: src/dialogs.c:806
+#: src/dialogs.c:804
 #, fuzzy
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
@@ -2901,393 +2872,395 @@
 "Por favor ingrese el nombre de usuario de la persona con la que se quiere "
 "comunicar.\n"
 
-#: src/dialogs.c:972
+#: src/dialogs.c:956
+msgid "Gaim - Add Group"
+msgstr "Gaim - Aadir Grupo"
+
+#: src/dialogs.c:973
 msgid "Please enter the name of the group to be added.\n"
 msgstr "Por favor ingrese el nombre del grupo a agregar.\n"
 
-#: src/dialogs.c:981
+#: src/dialogs.c:982 src/dialogs.c:4356
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: src/dialogs.c:1068
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Aadir Amigo"
 
-#: src/dialogs.c:1079
-msgid "Add Buddy"
-msgstr "Aadir Amigo"
-
-#: src/dialogs.c:1089
-msgid "Contact"
-msgstr "Contacto"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Nombre de Usuario:"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1115
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Aadir a"
 
-#: src/dialogs.c:1413
+#: src/dialogs.c:1468
 msgid "Gaim - Privacy"
 msgstr "Gaim - Privacidad"
 
-#: src/dialogs.c:1424
-msgid "Privacy settings are affected immediately."
+#: src/dialogs.c:1479
+#, fuzzy
+msgid "Changes to privacy settings take effect immediately."
 msgstr "La configuracin de privacidad toma efecto inmediatamente."
 
-#: src/dialogs.c:1432
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Privacidad para:"
 
-#: src/dialogs.c:1451
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"
 
-#: src/dialogs.c:1452
-msgid "Allow only the users below"
-msgstr "Permitir slo a los siguientes usuarios"
-
-#: src/dialogs.c:1453
+#: src/dialogs.c:1509
 msgid "Allow only users on my buddy list"
 msgstr "Permitir slo a los usuarios en mi lista"
 
-#: src/dialogs.c:1455
-msgid "Allow List"
-msgstr "Lista de Usuarios Permitidos"
-
-#: src/dialogs.c:1486
+#: src/dialogs.c:1513
+msgid "Allow only the users below"
+msgstr "Permitir slo a los siguientes usuarios"
+
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Negar a todos"
 
-#: src/dialogs.c:1487
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Bloquear los siguientes usuarios"
 
-#: src/dialogs.c:1489
-msgid "Block List"
-msgstr "Lista de Bloqueados"
-
-#: src/dialogs.c:1542
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Por favor indique el amigo con aviso."
 
-#: src/dialogs.c:1681
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuevo Aviso de Amigo"
 
 #. <pounce type="who">
-#: src/dialogs.c:1691
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Avisar a quin"
 
-#: src/dialogs.c:1702
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Cuenta"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1728
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "Cundo avisar"
 
-#: src/dialogs.c:1738
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Aviso al conectarse"
 
-#: src/dialogs.c:1747
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Aviso al dejar de estar ausente"
 
-#: src/dialogs.c:1756
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Aviso al dejar de estar inactivo"
 
-#: src/dialogs.c:1765
+#: src/dialogs.c:1843
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Aviso cuando el amigo le est escribiendo"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1775
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Accin del Aviso"
 
-#: src/dialogs.c:1786
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "Abrir Ventana de Mensaje"
 
-#: src/dialogs.c:1795
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Notificacin con un Popup"
 
-#: src/dialogs.c:1804 src/prefs.c:296
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Enviar Mensaje"
 
-#: src/dialogs.c:1825
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Ejecutar orden para avisar"
 
-#: src/dialogs.c:1847
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Avisar mediante sonido"
 
 #. </pounce type="action">
-#: src/dialogs.c:1869
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Guardar este aviso tras la activacin"
 
-#: src/dialogs.c:1889
+#: src/dialogs.c:1967
 msgid "_Save"
 msgstr "_Guardar"
 
-#: src/dialogs.c:1895
+#: src/dialogs.c:1973
 #, fuzzy
 msgid "C_ancel"
 msgstr "C_ancelar"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Crear Informacin del directorio"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Informacin del Directorio"
 
-#: src/dialogs.c:1996
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dejar que bsquedas en la Web encuentren su informacin"
 
 #. Line 1
-#: src/dialogs.c:1999 src/dialogs.c:2700
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Nombre"
 
 #. Line 2
-#: src/dialogs.c:2010 src/dialogs.c:2712
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Segundo Nombre"
 
 #. Line 3
-#: src/dialogs.c:2022 src/dialogs.c:2724
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Apellido"
 
 #. Line 4
-#: src/dialogs.c:2033 src/dialogs.c:2736
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Apellido de Soltera"
 
 #. Line 6
-#: src/dialogs.c:2055 src/dialogs.c:2759
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Estado"
 
-#: src/dialogs.c:2098 src/dialogs.c:2286 src/dialogs.c:3555 src/dialogs.c:4197
-#: src/dialogs.c:5159
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
 msgid "Save"
 msgstr "Guardar"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Las contraseas no coinciden"
 
-#: src/dialogs.c:2125
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Rellene todos los campos completamente"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Cambiar Contrasea"
 
-#: src/dialogs.c:2179
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Contrasea Original"
 
-#: src/dialogs.c:2193
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Nueva Contrasea"
 
-#: src/dialogs.c:2207
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Nueva Contrasea (de nuevo)"
 
 #. Build OK Button
-#: src/dialogs.c:2221 src/dialogs.c:2379 src/dialogs.c:2681 src/dialogs.c:2855
-#: src/dialogs.c:2925 src/dialogs.c:4309 src/dialogs.c:4414
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/dialogs.c:2249
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Crear Informacin del Usuario"
 
-#: src/dialogs.c:2364
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "A continuacin, los resultados de su bsqueda: "
 
-#: src/dialogs.c:2497
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/dialogs.c:2537
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Aadir Permiso"
 
-#: src/dialogs.c:2539
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Aadir Negacin"
 
-#: src/dialogs.c:2598
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Guardar Conversacin"
 
-#: src/dialogs.c:2676 src/dialogs.c:2837
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Buscar un Amigo"
 
-#: src/dialogs.c:2804
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Encontrar amigo por informacin"
 
-#: src/dialogs.c:2831
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electrnico"
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:2997
 msgid "Insert Link"
 msgstr "Insertar Enlace"
 
-#: src/dialogs.c:2971
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Aadir URL"
 
-#: src/dialogs.c:3082 src/dialogs.c:3102
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Seleccionar Color del Texto"
 
-#: src/dialogs.c:3134 src/dialogs.c:3154
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Seleccionar Color de Fondo"
 
-#: src/dialogs.c:3229 src/dialogs.c:3253
+#: src/dialogs.c:3284 src/dialogs.c:3308
 msgid "Select Font"
 msgstr "Seleccionar fuente"
 
-#: src/dialogs.c:3330
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importar a:"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar Lista de Amigos"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3415
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "No se puede crear un mensaje sin ttulo"
 
-#: src/dialogs.c:3416
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3423
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "No se puede crear un mensaje de ausencia vaco"
 
-#: src/dialogs.c:3486
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3495
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3508
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Ttulo del mensaje de ausencia: "
 
-#: src/dialogs.c:3559
+#: src/dialogs.c:3614
 msgid "Save & Use"
 msgstr "Guardar y Usar"
 
-#: src/dialogs.c:3563
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Usar"
 
 #. show everything
-#: src/dialogs.c:3697
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Sonra!"
 
-#: src/dialogs.c:3786
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Aadir Alias al Amigo"
 
-#: src/dialogs.c:3824 src/dialogs.c:3831
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "No se pudo escribir en %s."
 
-#: src/dialogs.c:3855
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Guardar Archivo de Registro"
 
-#: src/dialogs.c:3885
+#: src/dialogs.c:3940
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "No se pudo borrar el archivo %s."
 
-#: src/dialogs.c:3912
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "En serio quiere limpiar el registro?"
 
-#: src/dialogs.c:3927
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "Ok"
 
-#: src/dialogs.c:4108
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Fecha"
 
-#: src/dialogs.c:4171
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Conversacin"
 
-#: src/dialogs.c:4192
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/dialogs.c:4274
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Renombrar Grupo"
 
-#: src/dialogs.c:4283
-msgid "Rename Group"
-msgstr "Renombrar Grupo"
-
-#: src/dialogs.c:4290 src/dialogs.c:4395
-msgid "New name:"
-msgstr "Nuevo Nombre:"
-
-#: src/dialogs.c:4379
+#: src/dialogs.c:4347
+#, fuzzy
+msgid "Please enter a new name for the selected group.\n"
+msgstr "Por favor ingrese el nombre del grupo a agregar.\n"
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Renombrar Amigo"
 
-#: src/dialogs.c:4388
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Renombrar Amigo"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "Nuevo Nombre:"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4472
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Seleccionar Script en Perl"
 
-#: src/gaimrc.c:1347
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "No se pudo abrir el archivo de configuracin %s."
@@ -3358,6 +3331,11 @@
 msgid "New Mail Notifications"
 msgstr "Notificaciones de Correo Nuevo"
 
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Opciones"
+
 #: src/multi.c:809
 msgid "Register with server"
 msgstr "Registrarse en el servidor"
@@ -3370,6 +3348,11 @@
 msgid "Enter Password"
 msgstr "Introduzca Contrasea"
 
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Contrasea:"
+
 #: src/multi.c:1044
 msgid "Signon"
 msgstr "Conectar"
@@ -3415,6 +3398,21 @@
 msgid "_Modify"
 msgstr "_Modificar"
 
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "Ninguno"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Conectado: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Editor de Cuentas"
+
 #: src/multi.c:1517
 msgid "Cancel All"
 msgstr "Cancelar Todo"
@@ -4121,7 +4119,7 @@
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
-#: src/prefs.c:1566
+#: src/prefs.c:1565
 msgid "Gaim - Debug Window"
 msgstr "Gaim - Ventana de Depuracin"
 
@@ -4190,24 +4188,24 @@
 msgid "Please enter your password"
 msgstr "Por favor, indique su contrasea"
 
-#: src/server.c:652
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d mensajes)"
 
-#: src/server.c:664
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 mensaje)"
 
-#: src/server.c:975
+#: src/server.c:966
 msgid "Yes"
 msgstr "S"
 
-#: src/server.c:976
+#: src/server.c:967
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1172
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Ms Informacin"
 
@@ -4251,6 +4249,44 @@
 msgid "Someone says your name in chat"
 msgstr "Alguien menciona su nombre en la conversacin"
 
+#~ msgid ""
+#~ "<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 ""
+#~ "<BODY BGCOLOR=WHITE><hr><I>Leyenda:</I><br><br><IMG SRC=\"free_icon.gif"
+#~ "\"> : Usuario Normal de AIM<br><IMG SRC=\"aol_icon.gif\"> : Usuario de "
+#~ "AOL<br><IMG SRC=\"dt_icon.gif\"> : Usuario de prueba de AIM<br><IMG SRC="
+#~ "\"admin_icon.gif\"> : Administrador <br><IMG SRC=\"ab_icon.gif\"> : "
+#~ "Agente Interactivo de ActiveBuddy<br><IMG SRC=\"wireless_icon.gif\"> : "
+#~ "Usuario de dispositivo inalmbrico<br>"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Guardar Conversacin"
+
+#~ msgid "%s - Gaim (logged)"
+#~ msgstr "%s - Gaim (registrada)"
+
+#~ msgid "%s - Gaim"
+#~ msgstr "%s - Gaim"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Aadir Amigo"
+
+#~ msgid "Contact"
+#~ msgstr "Contacto"
+
+#~ msgid "Allow List"
+#~ msgstr "Lista de Usuarios Permitidos"
+
+#~ msgid "Block List"
+#~ msgstr "Lista de Bloqueados"
+
+#~ msgid "Rename Group"
+#~ msgstr "Renombrar Grupo"
+
 #~ msgid "Accounts"
 #~ msgstr "Cuentas"
 
@@ -4455,9 +4491,6 @@
 #~ msgid "Add Group"
 #~ msgstr "Aadir Grupo"
 
-#~ msgid "Gaim - Add Group"
-#~ msgstr "Gaim - Aadir Grupo"
-
 #, fuzzy
 #~ msgid "Gaim was unable to load your plugin."
 #~ msgstr "Gaim no pudo envar el mensaje"
--- a/po/fi.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/fi.po	Sun Jan 05 23:21:50 2003 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.59\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\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,354 +13,527 @@
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "Poissa"
+
+# src/menus.c:327
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "Palaa"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+msgid "Auto-login"
+msgstr "Automaattinen sisnkirjautuminen"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "Kirjaudu ulos"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "net"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "Kyttjtilit"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "Asetukset"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "Gaim:ista"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Lopeta"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - niasetukset"
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "Tuttavakuvake"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Tuttavakeskustelu"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Gaim Ryhmkeskustelu"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr "Sulje"
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "Keskusteluhuoneet"
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr "Pivit"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Lis"
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Poista"
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "Saatavilla olevien ryhmkeskustelujen lista"
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "Tilattujen ryhmkeskustelujen lista"
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr "Gnomen osakekurssisovelman asetukset"
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr "Pivitystiheys minuuteissa"
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr "Kirjoita symbolit erotettuna \"+\"-merkill alla olevaan laatikkoon."
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr "Nyt vain symbolit ja hinta:"
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr "Vierit vasemmalta oikealle:"
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 msgid "(No"
 msgstr "(Ei"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 msgid "Change"
 msgstr "Vaihda"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "Ei kyetty kirjoittamaan tiedostoa %s."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "Et ole kirjautuneena sisn."
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "Pikaviesti-ikkuna"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "Ryhmkeskustelu-ikkuna"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "Nyt ilmoitus"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "Nyt ilmoitus"
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "Yhteyden muodostaminen eponnistui"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "Kokeilu"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "Nyt kaikki keskustelut yhdess jaetussa ikkunassa"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Tavoitettavissa"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr "Tavoitettavissa vain ystville"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr "Poissa"
-
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr "Poissa vain ystville"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 msgid "Invisible"
 msgstr "Nkymtn"
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "Nkymtn vain ystville"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "Tavoittamattomissa"
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "Ei kyetty selvittmn isnnn nime."
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "Palvelimeen ei kyetty muodostamaan yhteytt."
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "Virhe luettaessa socketista."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 msgid "Error while writing to socket."
 msgstr "Virhe kirjoitettaessa socketiin."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 msgid "Authentication failed."
 msgstr "Todennus eponnistui."
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "Tuntematon virhekoodi."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr "Kutsumanimi:"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu-kyttj"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "Yhteytt ei kyetty muodostamaan"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan socketia"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen eponnistui."
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "Luetaan tietoja"
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "Tasapainottajan kttely"
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr "Luetaan palvelinavainta"
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "Vaihdetaan avaimen hash-arvoa"
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "Kriittinen virhe GG-kirjastossa\n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "Palvelinta ei kyetty pingaamaan"
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "Lhet viestin"
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr "Etsitn GG-palvelinta"
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "Epkelpo Gadu-Gadu-UIN ilmoitettu"
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s: yhteyden muodostaminen eponnistui"
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "Palvelinta ei kyetty pingaamaan"
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "Lhet viestin"
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr "Etsitn GG-palvelinta"
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "Epkelpo Gadu-Gadu-UIN ilmoitettu"
+
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Yritt lhett viesti epkelvolle Gadu-Gadu-UIN:lle!"
 
 # src/message.c:76
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "Ei kyetty noutamaan hakutuloksia"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu-hakukone"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "kyll"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "ei"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "Etunimi"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "Sukunimi"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "Syntymvuosi"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "Sukupuoli"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Kunta"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Palvelimelle ei ole tallennettu tuttavalistaa. Pahoittelen!"
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Ei voitu tuoda tuttavalistaa palvelimelta"
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Tuttavalista siirretty onnistuneesti palvelimelle"
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Ei voitu siirt tuttavalistaa palvelimelle"
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Tuttavalista onnistuneesti poistettu palvelimelta"
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Ei voitu poistaa tuttavalistaa palvelimelta"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Salasanaa ei voitu muuttaa"
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "Ei voitu tuoda tuttavalistaa palvelimelta"
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "Ei kyetty avaamaan suoraa pikaviestint"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Ei kyetty lhettmn salasanaa"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
@@ -368,353 +541,484 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "Ei kyetty lukemaan tiedostoa %s."
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr "Kutsumanimi:"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu-kyttj"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "Kiell"
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "Lhet viesti palvelimen kautta"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Gaim:in kytt"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCC-keskustelu %s:n kanssa suljettu"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "Ei listalla"
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s on vaihtanut aiheeksi: %s</B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "Luetaan palvelinavainta"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "IRC-virhe"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "Kutsumanime/kanavaa ei ole olemassa"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "IRC-virhe"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "Palvelinta ei ole olemassa"
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
+msgstr "Kutsumanime ei annettu"
+
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
 msgstr ""
 
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
-msgstr "Kutsumanime ei annettu"
-
-#: src/protocols/irc/irc.c:976
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 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 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "Yhdistettyn"
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "%s: Sinut on potkaistu pois: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "%s potkaisi: %s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "Hae kyttjtiedot"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "%s: Olet poistunut"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "IRC Poistu"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Kanava:"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC-keskustelu"
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "Palvelin:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "Portti"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "Ei kyetty lhettmn salasanaa"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "Ei kyetty lhettmn salasanaa"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr "l hiritse"
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber-virhe"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr "Virhe %s: %s"
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Kyttj %s haluaa list sinut tuttavalistalleen."
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "Palvelinta ei ole olemassa"
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Tuttavat"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "Tuntematon sisnkirjautumisvirhe"
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 msgid "Password successfully changed."
 msgstr "Salasanan vaihto onnistui."
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "Yhteys kadotettu"
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen eponnistui"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "Yhdistettyn"
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "Pyydetn todennusmuotoa"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Yhdistetn"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 msgid "Jabber Error"
 msgstr "Jabber-virhe"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "Huone:"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr "Palvelin:"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "Kdensija:"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "Yhteyden muodostaminen eponnistui"
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 msgid "Chats"
 msgstr "Ryhmkeskustelut"
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 msgid "View Error Msg"
 msgstr "Nyt virheviesti"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr "Poista tuttavalistalta"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Nyt ilmoitus"
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "Alue"
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr "Seutu"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "Postinumero"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Maa"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "Shkposti"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "Organisaatioyksikk"
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Arvonimi"
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr "Asema"
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "Syntympiv"
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -722,375 +1026,583 @@
 "Kaikki allaolevat kentt ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidt sopivana."
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "Kyttjn henkilllisyys"
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Muokkaa Jabberin vCardia"
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "Palvelimelle rekisterityminen onnistui!"
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "Tunnistamaton rekisterintivirhe"
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "Aseta kyttjtiedot"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntaksivirhe (todennkisesti ohjelmistovirhe Gaimissa)"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "Epkelpo parametri (todennkisesti ohjelmistovirhe Gaimissa)"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 msgid "Invalid User"
 msgstr "Epkelpo kyttj"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr "Tysin kelvollinen verkkoalueen nimi puuttuu"
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr "Olet jo kirjautuneena sisn"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 msgid "Invalid Username"
 msgstr "Epkelpo kyttjnimi"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Friendly Name"
 msgstr "Epkelpo tuttavanimi"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr "Lista tynn"
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr "Olet jo siell"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 msgid "Not on list"
 msgstr "Ei listalla"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr "Kyttj on poissa linjoilta"
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr "Olet jo kyseisess tilassa"
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr "Olet jo vastakkaisessa listassa"
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 #, fuzzy
 msgid "Switchboard failed"
 msgstr "Kytkent eponnistui"
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr "Siirrosta tiedottaminen eponnistui"
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr "Vaadittuja kentti puuttuu"
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 msgid "Not logged in"
 msgstr "Et ole kirjautuneena sisn."
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 msgid "Internal server error"
 msgstr "Sisinen palvelinvirhe"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr "Tietokantapalvelimen virhe"
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 msgid "File operation error"
 msgstr "Tiedostotoiminnossa virhe"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 msgid "Memory allocation error"
 msgstr "Muistin varaamisessa virhe"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 msgid "Server busy"
 msgstr "Palvelin on varattu"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 msgid "Server unavailable"
 msgstr "Palvelin on tavoittamattomissa"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr "Vastapn tiedottajapalvelin ei toiminnassa"
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 msgid "Database connect error"
 msgstr "Tietokantayhteysvirhe"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr "Palvelin on poistumassa toiminnasta (jttk laiva)"
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 msgid "Error creating connection"
 msgstr "Virhe luotaessa yhteytt"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr "Istunnon ylikuormitus"
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr "Kyttj on liian aktiivinen"
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr "Liian monta istuntoa"
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr "Odottamaton"
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr "Virheellinen tuttavatiedosto"
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 msgid "Authentication failed"
 msgstr "Todennus eponnistui"
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 msgid "Not allowed when offline"
 msgstr "Ei sallittu kun poissa linjoilta"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr "Ei ota vastaan uusia kyttji"
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr "Varmistamaton kyttj"
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 msgid "Unknown Error Code"
 msgstr "Tuntematon virhekoodi"
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 #, fuzzy
 msgid "An MSN message may not have been received."
 msgstr "Viesti ei ehk ole saatu vastaan"
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim ei kyennyt lhettmn viesti"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "AOL-virhe"
+
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Kyttj %s (%s) haluaa list kyttjn %s tuttavalistalleen."
 
-#: src/protocols/msn/msn.c:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+msgid "Unable to write to server"
+msgstr "Palvelimelle ei kyetty kirjoittamaan"
+
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "Kyttj %s (%s) haluaa list sinut tuttavalistalleen"
 
-#: src/protocols/msn/msn.c:1179
+#: src/protocols/msn/msn.c:1401
 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:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 msgid "Error reading from server"
 msgstr "Virhe luettaessa palvelimelta"
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "Palvelimeen ei kyetty muodostamaan yhteytt."
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "Palvelimelle ei kyetty kirjoittamaan"
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Protokollatoiminnot"
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "Ei kyetty avaamaan suoraa pikaviestint"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "Ei kyetty kirjautumaan sisn AIM:iin"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "Viesti ei voitu lhett: liian suuri"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr "Pyydetn salasanan lhettmist"
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 msgid "Unable to send password"
 msgstr "Ei kyetty lhettmn salasanaa"
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 msgid "Password sent"
 msgstr "Salasana lhetetty"
 
-#: src/protocols/msn/msn.c:1752
-msgid "Unable to write to server"
-msgstr "Palvelimelle ei kyetty kirjoittamaan"
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "Ei kyetty kirjoittamaan"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "Viesti ei voitu lhett: liian suuri"
+
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr "Synkronoidaan palvelimen kanssa"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 msgid "Busy"
 msgstr "Varattu"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+#, fuzzy
+msgid "Be right back"
+msgstr "Tulen pian takaisin"
+
+#: src/protocols/msn/msn.c:2430
+#, fuzzy
+msgid "Away from the computer"
+msgstr "Poissa tietokoneelta"
+
+#: src/protocols/msn/msn.c:2432
+#, fuzzy
+msgid "On the phone"
+msgstr "Puhelimessa"
+
+#: src/protocols/msn/msn.c:2434
+#, fuzzy
+msgid "Out to lunch"
+msgstr "Lounaalla"
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr "Jouten: "
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr "Nollaa tuttavanimi"
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "Lhet tiedosto"
+
+#: src/protocols/msn/msn.c:2555
 #, fuzzy
 msgid "New MSN friendly name too long."
 msgstr "Tuttavanimi liian pitk."
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 msgid "Set Friendly Name"
 msgstr "Aseta tuttavanimi"
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 msgid "Set Friendly Name:"
 msgstr "Aseta tuttavanimi: "
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr "Nollaa kaikki tuttavanimet"
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr "Epkelpo kyttjnimi"
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Mihin ryhmn liitytn:"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "Epkelpo kyttj"
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Epkelpo nimi"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Palvelin on tavoittamattomissa"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Hakemistopalvelu ei tilapisesti ole kytettviss."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Suora pikaviesti %s:n kanssa suljettu"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Suora pikaviesti %s:n kanssa eponnistui"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "yhteysvirhe (rend)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "merkittv yhteysvirhe\n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Yhteys katkennut."
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Ryhmkeskustelu ei ole parhaillaan kytettviss"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Yhteytt isntn ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Salasana lhetetty, odotetaan vastausta\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "sisinen yhteysvirhe\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan sisn AIM:iin"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Sisnkirjaus: %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Kirjauduttu ulos.\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Yhteytt ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, evste lhetetty"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Kyttjtilisi palvelu on parhaillaan keskeytetty."
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "Palvelu ei tilapisesti ole kytss."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1100,46 +1612,85 @@
 "pidempn."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Pivit "
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Todennus eponnistui"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Sisinen virhe"
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim ei kyennyt lhettmn viesti"
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim ei kyennyt lhettmn viesti"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviesti %s:n kanssa muodostettu"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+#, fuzzy
+msgid "Transfer timed out"
+msgstr "Siirrosta tiedottaminen eponnistui"
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "Ei voitu avata asetustiedostoa %s."
+
+#: src/protocols/oscar/oscar.c:1632
+#, fuzzy
+msgid "File transfer aborted"
+msgstr "Siirrosta tiedottaminen eponnistui"
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr "Kyttj %s haluaa list sinut tuttavalistalleen."
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+msgid "No reason given."
+msgstr "Syyt ei annettu"
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Gaim - ICQ valtuutus evtty"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1150,226 +1701,258 @@
 "syyst:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-msgid "No reason given."
-msgstr "Syyt ei annettu"
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 #, fuzzy
 msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ valtuutus evtty"
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "Kyttj %lu on hyvksynyt pyyntsi list hnet tuttavalistallesi."
 
-#: src/protocols/oscar/oscar.c:1587
-#, 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:1588
-#, 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:1597
+#: src/protocols/oscar/oscar.c:2141
 #, 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:1598
-#, 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:1607
-#, 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:1608
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
 #, 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:1617
-#, 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:1618
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
 #, 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:1627
-#, 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:1628
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"Haluatko list hnet tuttavalistallesi?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "Et saanut %d viesti %s:lta koska se oli epkelpo."
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "Et saanut %d viesti %s:lta koska ne olivat epkelpoja."
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu 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:2265
+#, fuzzy, c-format
+msgid "You missed %hu 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:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu 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:2275
+#, fuzzy, c-format
+msgid ""
+"You missed %hu 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:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr "Et saanut %d viesti %s:lta koska se oli liian hirve."
+
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
+msgstr "Et saanut %d viesti %s:lta koska se oli liian hirve."
+
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
 msgstr "Et saanut %d viesti %s:lta koska olet liian hirve."
 
-#: src/protocols/oscar/oscar.c:1636
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
+msgstr "Et saanut %d viesti %s:lta koska olet liian hirve."
+
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Et saanut %d viesti %s:lta tuntemattomista syist."
 
-#: src/protocols/oscar/oscar.c:1637
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Et saanut %d viesti %s:lta tuntemattomista syist."
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2342
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
+#, fuzzy, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Tila:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1707
-#, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+#: src/protocols/oscar/oscar.c:2389
+#, fuzzy, c-format
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>Tila:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1736
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC heitti virheen: %s\n"
 
-#: src/protocols/oscar/oscar.c:1755
-#, c-format
-msgid "Your message to %s did not get sent: %s"
-msgstr "Viestisi %s:lle ei lhetetty: %s"
-
-#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "Tuntematon sisnkirjautumisvirhe"
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "Syyt ei annettu"
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "Viestisi %s:lle ei lhetetty: %s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "%s:n kyttjtiedot eivt ole saatavilla: %s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "ni"
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "Pikaviestikuva"
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Ryhmkeskustelu"
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr "Lhet tiedosto"
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Pelit"
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Osakkeet"
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Lhet tuttavalista"
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy-ohjelmistovirhe"
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "AP-kyttj"
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen vlitys"
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ tuntematon"
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: src/protocols/oscar/oscar.c:1886
+#: src/protocols/oscar/oscar.c:2655
 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>"
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
 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:1914
-#, c-format
+
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "Kyttjnimi: <B>%s</B>  %s <BR>\n"
 "Varoitustaso: <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>Kyttjll ei ole poissaoloviesti</i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Asiakasohjelman kyvyt: "
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Ei tietoja annettu</i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "Yhteytesi voi olla kadonnut."
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
@@ -1378,55 +1961,118 @@
 "Viimeist viesti ei lhetetty koska olet ylittnyt taajuusrajan. Odota 10 "
 "sekuntia ja yrit uudelleen."
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "Gaim - ICQ valtuutus evtty"
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "Gaim - ICQ valtuutus hyvksytty"
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "Virhe luotaessa yhteytt"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "Kyttjtili"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "Ei kyetty lukemaan tiedostoa %s."
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim ei kyennyt lhettmn viesti"
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1435,154 +2081,154 @@
 "Maksimimr tuttavia tuttavalistallasi on %d ja sinulla on nyt %d. Jotkut "
 "tuttavat eivat ny olevan linjoilla ennen kuin alitat rajan."
 
-#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Vaihto:"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Ei kyetty avaamaan suoraa pikaviestint"
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
 #, 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?"
+msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
-"Olet valinnut suoran pikaviestinnn avaamisen %s:n kanssa. Tmn tekeminen "
-"antaa vastapuolen nhd IP-osoitteesi ja voi olla turvallisuusriski. "
-"Haluatko jatkaa?"
-
-#: src/protocols/oscar/oscar.c:3586
-#, c-format
+
+#: src/protocols/oscar/oscar.c:4621
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
-"support sending status messages.</I><BR>"
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
+#, fuzzy, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>Tila:</B> %s<BR><HR><BR><I>Vastapuolen ohjelma ei tue "
 "tilaviestien lhettmist.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3593
-#, c-format
+#: src/protocols/oscar/oscar.c:4642
+#, fuzzy, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>Tila:</B> %s<BR><HR><BR><I>Kyttjll ei ole "
 "tilaviestia.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Hae kyvyt"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Ei kyetty kirjoittamaan tiedostoa %s."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Ei kyetty lukemaan tiedostoa %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Viesti on liian pitk, viimeiset %s tavua katkaistu."
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ei ole parhaillaan kirjautuneena sisn."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s:n varoittaminen ei ole sallittua."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Viesti on hyltty, ylitt palvelimen nopeusrajan."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s: Ryhmkeskustelu ei ole kytettviss."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Lhett viestej %s:lle liian nopeasti."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Et saanut %s:n pikaviesti koska se oli liian suuri."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Et saanut %s:n pikaviesti koska se lhetettiin liian nopeasti."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "Eponnistuminen."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "Liian monta tsmvyytt."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "Tarvitaan lis mritteit."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "Hakemistopalvelu ei tilapisesti ole kytettviss."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "Shkpostin katsominen rajoitettu."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Avainsanasta ei vlitetty."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "Ei avainsanoja."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "Kyttjll ei ole hakemistotietoja."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "Maata ei tuettu."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Tunnistamaton eponnistuminen: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "Palvelu ei tilapisesti ole kytss."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "Varoitustasosi on parhaillaan liian korkea kirjautuaksesi sisn."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1591,37 +2237,37 @@
 "ja yrit uudestaan. Jos jatkat yrittmist, joudut odottamaan viel "
 "pidempn."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Tuntematon sisnkirjautumisvirhe esiintyi: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Tuntematon virhe, %d, esiintyi. Tiedot: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "Yhteys suljettu"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "Odotetaan vastausta..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC on palannut tauoltaan. Voit lhett viestej jlleen."
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -1633,76 +2279,101 @@
 "viestin. Gaim est kaiken lpimenon. Tm on vain vliaikaista, ole "
 "krsivllinen."
 
-#: src/protocols/toc/toc.c:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "Portti"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "Yhteytt siirtoa varten ei voitu muodostaa!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "Yhteytt siirtoa varten ei voitu muodostaa!"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "Yhteytt siirtoa varten ei voitu muodostaa!"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - Tallenna nimell..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, 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:1963
+#: src/protocols/toc/toc.c:1980
 #, 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:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pyyt sinua lhettmn hnelle tiedoston"
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr "Hyvksy"
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "Viestisi ei lhetetty."
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Luokka:"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "Ilmentym:"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "Vastaanottaja:"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Tietoja Gaimista v%s"
 
-#: src/about.c:135
+#: src/about.c:112
+#, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim on modulaarinen pikaviestinasiakassovellus, joka kykenee \n"
 "kyttmn AIM-, ICQ-, Yahoo!-, MSN-, IRC-, Jabber-, Napster-,\n"
@@ -1711,205 +2382,151 @@
 "\n"
 "URL: "
 
-#: src/about.c:137
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
+#: src/about.c:122
+#, fuzzy
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "\n"
 "\n"
 "IRC: #gaim palvelimella irc.openprojects.net"
 
-#: src/about.c:147
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
 msgstr ""
-"Aktiiviset kehittjt\n"
-"==============================\n"
-"Rob Flynn (yllpitj) [ rob@marko.net ]\n"
-"Sean Egan (ohjelmoija) [ bj91704@binghamton.edu ]\n"
-"\n"
-"Villit korjausten kirjoittajat\n"
-"==============================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Poistuneet kehittjt\n"
-"==============================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (alkuperinen tekij) [ markster@marko.net ]"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "Web-sivusto"
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr "Kirjaudu ulos"
-
-#: src/aim.c:162
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "Sulje"
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "Anna sisnkirjautumistietosi"
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Sisnkirjautuminen"
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "Nyttnimi: "
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr "Salasana: "
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "Lopeta"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr "Kyttjtilit"
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr "Kirjaudu sisn"
-
-#: src/aim.c:354
-msgid "About"
-msgstr "Tietoja"
-
-# src/menus.c:311
-#: src/aim.c:355
-msgid "Options"
-msgstr "Valinnat"
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr "Liitnniset"
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr "Asetukset"
-
-#: src/aim.c:841 src/multi.c:1481
-msgid "Auto-login"
-msgstr "Automaattinen sisnkirjautuminen"
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - Poissa!"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "Olen palannut!"
 
-# src/menus.c:327
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr "Palaa"
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "Poista poissaoloviesti"
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Ryhm"
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Tietoja"
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr "Lis tuttavailmoitin"
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "Nyt loki"
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "Nime uudelleen"
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "Poista alias"
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 viesti)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[Napsauta muokataksesi]"
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Kirjautuneena sisn: %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Varoitukset: %d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Kyvyt: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1920,945 +2537,882 @@
 "Nyttnimi: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "Jouten: "
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s kirjautui sisn."
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Tietoja valitusta tuttavasta"
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "Lhet pikaviesti"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "Aloita/liity tuttavakeskusteluun"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Aktivoi poissaoloviesti"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - Tuttavalista"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Tiedosto"
 
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
+msgstr "Lis tuttava"
+
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
+msgstr "Liity ryhmkeskusteluun"
+
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "Uusi poissaoloviesti"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
+msgstr "Hae kyttjtiedot"
+
+#: src/buddy.c:2643
+msgid "Import Buddy List"
+msgstr "Tuo tuttavalista"
+
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "Piilotettu"
+
+#: src/buddy.c:2657
+msgid "Tools"
+msgstr "Tykalut"
+
 #: src/buddy.c:2667
-msgid "Add A Buddy"
-msgstr "Lis tuttava"
-
-#: src/buddy.c:2669
-msgid "Join A Chat"
-msgstr "Liity ryhmkeskusteluun"
-
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr "Uusi pikaviesti"
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
-msgstr "Hae kyttjtiedot"
-
-#: src/buddy.c:2678
-msgid "Import Buddy List"
-msgstr "Tuo tuttavalista"
-
-#: src/buddy.c:2696
-msgid "Tools"
-msgstr "Tykalut"
-
-#: src/buddy.c:2706
 msgid "Buddy Pounce"
 msgstr "Tuttavailmoitin"
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "Kyttjtilit"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Asetukset"
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Protokollatoiminnot"
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "Yksityisyys"
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "Nyt jrjestelmn loki"
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr "Lataa skripti"
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "Poista kaikki skriptit"
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr "Listaa skriptit"
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Ohje"
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 msgid "Online Help"
 msgstr "Tukea linjoilla"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 msgid "Debug Window"
 msgstr "Testausikkuna"
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "Gaim:ista"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "Lis uusi tuttava"
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "Lis uusi ryhm"
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "Poista valittu tuttava/ryhm"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Muokkaa tuttavia"
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - Tuttavalista"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Liity ryhmkeskusteluun"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Liity ryhmkeskusteluun nimell:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr "Peruuta"
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Liity"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Tuttava"
 
 # src/sidebar.c:103
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Viesti"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Kutsu tuttava keskusteluhuoneeseen"
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Vlit"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "l vlit"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s huoneessa"
 
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s saapui huoneeseen."
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltn %s"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Yhdistetyt ryhmkeskustelut"
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0 ihmist huoneessa"
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr "Kuiskaa"
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Lhet"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
-msgid "Block"
-msgstr "Est"
-
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "Varoita"
 
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Tallenna keskustelu"
-
-#: src/conversation.c:492
+#: src/buddy_chat.c:1592 src/conversation.c:2925
+msgid "Block"
+msgstr "Est"
+
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Liit kuva"
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "Viesti ei voitu lhett: liian suuri"
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "Viesti ei voitu lhett: liian suuri"
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr "Parhaillaan %d:ssa, "
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "Asetetaan sijainniksi %d\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr "Lihavoi teksti"
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr "Lihavoi"
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr "Kursivoi teksti"
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr "Kursivoi"
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr "Alleviivaa teksti"
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr "Alleviivaa"
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr "Yliviivaa teksti"
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr "Yliviivaa"
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "Pienenn fonttikokoa"
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr "Pieni"
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "Normaali fonttikoko"
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr "Normaali"
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr "Suurenna fonttikokoa"
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr "Suuri"
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "Valitse fontti"
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr "Fontti"
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "Tekstin vri"
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr "Vri"
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr "Taustavri"
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "Tallenna keskustelu"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "Lis linkki"
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr "Linkki"
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr "Lis hymi"
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "Hymi"
-
-#: src/conversation.c:2272
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "Lis pikaviestikuva"
 
-#: src/conversation.c:2272
-msgid "Image"
-msgstr "Kuva"
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "Sulje"
+
+# src/menus.c:311
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "Valinnat"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "Ota kyttn kirjaaminen lokiin"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr "Kirjataan lokiin"
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr "Tallenna keskustelu"
-
-# src/menus.c:280
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr "Tallenna"
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "Ota kyttn kirjaaminen lokiin"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
 msgstr ""
 
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr "ni"
-
-#: src/conversation.c:2782
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - Keskustelut"
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Lhet viesti nimell: "
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Tallenna kuvake"
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Poista animaatio kytst"
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Ota animaatio kyttn"
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimell..."
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "Gaim - Varoita kyttj?"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "Haluatko todella varoittaa kyttj %s?"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "Varoita nimettmn?"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "Nimettmt varoitukset ovat vhemmn ankaria."
 
-#: src/dialogs.c:471
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Poistetaan '%s' tuttavalistalta.\n"
 
-#: src/dialogs.c:496
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - Poista %s?"
-
-#: src/dialogs.c:509
-msgid "Remove Buddy"
-msgstr "Poista tuttava"
-
-#: src/dialogs.c:519
-#, c-format
-msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
-"Olet poistamassa '%s':n tuttavalistaltasi.\n"
-"Haluatko jatkaa?"
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr "Hyvksy"
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - Pikaviestimen kyttj"
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr "Pikaviesti kenelle:"
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "Kyttj:"
-
-#: src/dialogs.c:816
-msgid "Account:"
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "Nyttnimi:"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
 msgstr "Kyttjtili:"
 
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "Gaim - Hae kyttjtiedot"
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr "Lis ryhm"
-
-#: src/dialogs.c:1004
+#: src/dialogs.c:804
+msgid ""
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - Lis ryhm"
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "Ryhm"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Lis tuttava"
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr "Lis tuttava"
-
-#: src/dialogs.c:1110
-msgid "Contact"
-msgstr "Kontakti"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Nyttnimi: "
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Lis"
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Poissa!"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
-#: src/dialogs.c:1451
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Salli kaikkien kyttjien ottaa minuun yhteytt"
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "Salli vain allaolevat kyttjt"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "Salli vain allaolevat kyttjt"
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr "Sallittujen lista"
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Kiell kaikki kyttjt"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Kiell allaolevia kyttji"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "Kiellettyjen lista"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Syt ilmoitettava tuttava."
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Uusi tuttavailmoitin"
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Kenest ilmoitetaan"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Kyttjtili"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "Milloin ilmoitetaan"
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Ilmoita sisnkirjautuessa"
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Ilmoita palatessa oltuaan poissa"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Ilmoita palatessa oltuaan jouten"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "Ilmoitin kun tuttava kirjoittaa sinulle"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Ilmoittimen toiminto"
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "Avaa pikaviesti-ikkuna"
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Nyt ilmoitus"
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Lhet viesti"
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Suorita komento ilmoitettaessa"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Soita ni ilmoitettaessa"
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Tallenna tm ilmoitin aktivoinnin jlkeen"
 
-#: src/dialogs.c:1971
+# src/menus.c:280
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr "Tallenna"
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "Peruuta"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Aseta hakemistotiedot"
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Hakemistotiedot"
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Salli verkkohaut tietojesi lytmiseksi"
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Etunimi"
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Sukunimi"
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Entinen nimi"
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Lni"
 
-#: src/dialogs.c:2126
+# src/menus.c:280
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr "Tallenna"
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Uudet salasanat eivt tsm"
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Tyt kaikki kentt kokonaan"
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Salasanan vaihto"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Vanha salasana"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Uusi salasana"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "OK"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Aseta kyttjtiedot"
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Alla ovat hakusi tulokset: "
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Salli"
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr "Kiell"
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Salli lis"
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Kiell lis"
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Kirjaa keskustelu lokiin"
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Etsi tuttavaa"
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Etsi tuttava tietojen perusteella"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Etsi tuttava shkpostin perusteella"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "Lis linkki"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Lis URL"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Valitse tekstin vri"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Valitse taustavri"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "Valitse fontti"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Tuo:"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Tuo tuttavalista"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "Et voi luoda poissaoloviesti tyhjll otsikolla"
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhj poissaoloviesti"
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Uusi poissaoloviesti"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "Tallenna ja kyt"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Kyt"
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "Tallenna ja kyt"
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr "Anna tuttavalle alias"
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Anna tuttavalle alias"
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "Yhteytt isntn ei voitu muodostaa"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Tallenna lokitiedosto"
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "Ei voitu avata asetustiedostoa %s."
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Tyhjenn loki?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "Selv"
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Ajankohta"
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Tyhjenn"
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Nime ryhm uudelleen"
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr "Nime ryhm uudelleen"
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
-msgid "New name:"
-msgstr "Uusi nimi:"
-
-#: src/dialogs.c:4484
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Nime tuttava uudelleen"
 
-#: src/dialogs.c:4494
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Nime tuttava uudelleen"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "Uusi nimi:"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Valitse Perlskripti"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ei voitu avata asetustiedostoa %s."
 
-#: src/html.c:183
+#: src/html.c:185
 #, c-format
 msgid "Received: '%s'\n"
 msgstr "Vastaanotettu: \"%s\"\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteytt.\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim ei kyennyt lhettmn viesti"
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "Nyttnimi:"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "Protokolla:"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Lataa tuttavakuvake"
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "Tuttavakuvaketiedosto:"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Selaa"
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "Fonttivalinnat"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "Nyttnimi:"
 
-#: src/multi.c:559
+#: src/multi.c:653
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "Muista salasana"
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Kirjaudu sisn automaattisesti"
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "Tiedota uusista shkposteista"
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "Vlityspalvelimen valinnat"
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "Tiedota uusista shkposteista"
+
+# src/menus.c:311
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Valinnat"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "Rekisteridy palvelimeen"
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Muokkaa tili"
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Salasana:"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "Kirjaudu sisn"
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "Protokollatoiminnot"
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2866,40 +3420,45 @@
 "Et voi kirjata tt kyttjtili sisn. Et ole ladannut protokollaa, jota "
 "se kytt, tai protokollassa ei ole sisnkirjautumisfunktiota."
 
-#: src/multi.c:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "Poista"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Tilin muokkaus"
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr "Valitse kaikki"
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr "Valitse automaattiset"
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "Poista valinnat"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "Muuta"
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "Kirjaa sisn/ulos"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr "Poista"
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "Ei mitn"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Sisnkirjaus: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Tilin muokkaus"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "Peruuta"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -2908,533 +3467,555 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s ei kyennyt kirjautumaan sisn"
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "Sisnkirjautumisvirhe"
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 msgid "Notice"
 msgstr "Ilmoitus"
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s on kirjautunut ulos"
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim - Liitnnislista"
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - Liitnniset"
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-msgid "Loaded Plugins"
-msgstr "Ladatut liitnniset"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr "Valitse kaikki"
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr "Tiedostopolku:"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr "Lataa"
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "Lataa liitnninen tiedostosta"
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr "Muuta asetuksia"
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "Muuta asetuksia valitulle liitnniselle"
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr "Lataa uudelleen"
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "Lataa valittu liitnninen uudelleen"
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr "Poista"
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "Poista valittu liitnninen"
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "Sulje tm ikkuna"
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr "Yleiset valinnat"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "Nyt testausikkuna"
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "Kyt reunattomia painikkeita"
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "Lni"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr "Lihavoi"
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr "Kursivoi"
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr "Alleviivaa"
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr "Yliviivaa teksti"
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr "Peruuta"
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "Kyttj on liian aktiivinen"
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "Kyttj on liian aktiivinen"
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr "Vri"
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "Tekstin vri"
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "Taustavri"
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr "Tuttavien nytt"
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "Nyt graafiset hymit"
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "Nyt aikaleimat viesteiss"
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "Nyt URL:t linkkein"
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "Korosta vrinkirjoitetut sanat"
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "l vlit vreist"
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "l vlit fonttien tyypist"
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "l vlit fonttien koosta"
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "l vlit automatisoiduista TiK-viesteist"
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "\"Enter\" lhett viestin"
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "\"Control-Enter\" lhett viestin"
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "Pikaviesti-ikkuna"
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "\"Escape\" sulkee ikkunan"
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "\"Control-W\" sulkee ikkunan"
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "\"Control-{B/I/U/S}\" lis HTML-lapun"
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "\"Control-(numero)\" lis hymin"
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr "Alhaalla"
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "Piilota pikaviesti-/tiedot- ja ryhmkeskustelupainikkeet"
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "Nyt kuvat painikkeissa"
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "Tallenna ikkunan koko/sijainti"
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "Nosta ikkuna tapahtumahetkin"
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr "Ryhmien nytt"
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "Piilota ryhmt joissa ei ole tuttavia linjoilla"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "Nyt mrt ryhmiss"
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr "Tuttavien nytt"
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 #, fuzzy
 msgid "Show buddy type _icons"
 msgstr "Nyt tuttavatyyppien kuvakkeet"
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "Nyt varoitustasot"
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "Nyt joutenoloajat"
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 #, fuzzy
 msgid "Grey i_dle buddies"
 msgstr "Nyt jouten olevat tuttavat harmaina"
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "Pikaviesti-ikkuna"
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "Nyt painikkeissa: "
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "Kuvat"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "Teksti"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "Kuvat ja teksti"
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "Uuden ikkunan leveys:"
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "Uuden ikkunan korkeus:"
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "Kirjoitusalueen korkeus:"
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "Nosta ikkuna tapahtumahetkin"
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "Piilota ikkuna lhetettess"
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "Tuttavakuvakkeet"
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "Piilota tuttavakuvakkeet"
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "Poista tuttavakuvakkeen animaatio kytst"
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "Nyt sisnkirjautumiset ikkunassa"
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr "Nyt ilmoitus"
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "Ilmoita tuttaville kun kirjoitat heille"
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "\"Tab\"-tydennys"
 
-#: src/prefs.c:505
-#, fuzzy
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "\"Tab\"-tydenn lempinimet"
 
-#: src/prefs.c:506
-#, fuzzy
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "Vanhanmallinen \"Tab\"-tydennys"
 
-#: src/prefs.c:509
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr "Nyt ihmisten saapuminen/poistuminen ikkunassa"
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Vlilehtien sijoitus:"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr "Ylhll"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "Alhaalla"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr "Vasemmalla"
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "Oikealla"
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "Nyt kaikki ryhmkeskustelut yhdess jaetussa ikkunassa"
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 #, fuzzy
 msgid "Show a_liases in tabs/titles"
 msgstr "Nyt aliakset vlilehdiss/otsikoissa/vierittimess"
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr "Ryhmkeskustelut"
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "Nyt kaikki ryhmkeskustelut yhdess jaetussa ikkunassa"
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Nyt ryhmkeskustelut samassa jaetussa ikkunassa"
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr "Tuttavalista"
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "Vlityspalvelimen tyyppi"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Vlityspalvelimen tyyppi"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Ei vlityspalvelinta"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Vlityspalvelin"
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr "Verkkoasema"
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr "Portti"
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr "Kyttj"
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr "Salasana"
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "Selain"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr ""
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr "Vlityspalvelimen valinnat"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "Avaa uusi ikkuna oletuksena"
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr "Viestit"
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr "Uusi pikaviesti"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "Kirjaa kaikki keskustelut lokiin"
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr "Poista HTML lokitiedostoista"
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "Nyt jrjestelmn loki"
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "Kirjaa lokiin tuttavien kirjautumiset sisn/ulos"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Kirjaa lokiin tuttavien siirtymiset jouten-/paikallaoleviksi"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "Kirjaa lokiin tuttavien poistumiset/palaamiset"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Kirjaa lokiin omat sisnkirjautumiset/joutenolot/poissaolot"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Oma lokitiedosto joka tuttavan sisnkirjautumisille"
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "nivalinnat"
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "Ei ni kun kirjaudut sisn"
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "net poissaollessasi"
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr "nimenetelm"
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "nimenetelm"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "Sisinen virhe"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3443,158 +4024,225 @@
 "nikomento\n"
 "(%s tiedostonimeksi)"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "Viestien lhettminen poistaa poissaolotilan"
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "Laita uudet viestit jonoon poissaollessa"
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "l vlit uusista keskusteluista poissaollessa"
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "l lhet automaattista vastausta"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "l lhet automaattista vastausta"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "Lhet automaattinen vastaus vain jouten ollessa"
 
-#: src/prefs.c:828
-#, fuzzy
-msgid "Idle"
-msgstr "Jouten: "
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "l lhet automaattista vastausta"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr "Ei mitn"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Gaim:in kytt"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "X:n kytt"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "Pikaviesti-ikkuna"
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr "Poissa"
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "Poissaoloviestit"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - niasetukset"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 msgid "Test"
 msgstr "Kokeilu"
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr "Muokkaa"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 #, fuzzy
 msgid "Interface"
 msgstr "Ilmentym:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr "Fontti"
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr "Viesti lhetetty"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "Pikaviesti-ikkuna"
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "Ryhmkeskustelu-ikkuna"
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "Vlityspalvelin"
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "Selain"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "Kirjataan lokiin"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr "net"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr "net"
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Poissaolon otsikko: "
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr "Liitnniset"
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - Asetukset"
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Gaim-virheidenetsinnn tulostusikkuna"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "Testausikkuna"
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
 msgstr ""
 
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"not the same version I cannot safely tell you which one it was. Needless to "
-"say, it was not successfully loaded."
-msgstr ""
-"Yritit ladata protokollan, jota ei ole knnetty saman lhdekoodiversion "
-"kanssa kuin tm ohjelma. Koska se ei ole samaa versiota, en valitettavasti "
-"voi sanoa varmasti mik se oli. Lienee tarpeetonta sanoakaan, ettei sit "
-"kyetty onnistuneesti lataamaan."
-
-#: src/prpl.c:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3602,33 +4250,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s kytti %s:aa, joka poistettiin. %s on nyt poissa linjoilta."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "Hyvksy?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "Gaim - Kehote"
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - Uusi shkposti"
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "Avaa shkposti"
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, 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:590
+#: src/prpl.c:634
 msgid ""
 "\n"
 "\n"
@@ -3638,7 +4281,7 @@
 "\n"
 "Haluatko list hnet tuttavalistallesi?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3646,83 +4289,397 @@
 "Sinulla ei ole tll hetkell kytettviss yhtn protokollaa joka kykenisi "
 "rekisterimn uusia kyttjtilej."
 
-#: src/prpl.c:670
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr "Gaim - Rekisterinti"
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr "Rekisterintitiedot"
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 msgid "Register"
 msgstr "Rekisteri"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Anna salasanasi"
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d viesti)"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr "Kyll"
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr "Ei"
 
-#: src/server.c:1101
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Lis tietoja"
 
-#: src/sound.c:63
+#: src/sound.c:68
 msgid "Buddy logs in"
 msgstr "Tuttava kirjautuu sisn"
 
-#: src/sound.c:64
+#: src/sound.c:69
 msgid "Buddy logs out"
 msgstr "Tuttava kirjautuu ulos"
 
-#: src/sound.c:65
+#: src/sound.c:70
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr "Vastaanotettu viesti aloittaa keskustelun"
 
-#: src/sound.c:67
+#: src/sound.c:72
 msgid "Message sent"
 msgstr "Viesti lhetetty"
 
-#: src/sound.c:68
+#: src/sound.c:73
 msgid "Person enters chat"
 msgstr "Joku saapuu ryhmkeskusteluun"
 
-#: src/sound.c:69
+#: src/sound.c:74
 msgid "Person leaves chat"
 msgstr "Joku poistuu ryhmkeskustelusta"
 
-#: src/sound.c:70
+#: src/sound.c:75
 msgid "You talk in chat"
 msgstr "Sin puhut ryhmkeskustelussa"
 
-#: src/sound.c:71
+#: src/sound.c:76
 msgid "Others talk in chat"
 msgstr "Muut puhuvat ryhmkeskustelussa"
 
-#: src/sound.c:74
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr "Joku sanoo nimesi ryhmkeskustelussa"
 
+#~ 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?"
+
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "Et saanut %d viesti %s:lta koska ne ovat liian hirveit."
+
+#~ 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 ""
+#~ "<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>"
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Gaim - ICQ valtuutus hyvksytty"
+
+#~ 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 ""
+#~ "Olet valinnut suoran pikaviestinnn avaamisen %s:n kanssa. Tmn "
+#~ "tekeminen antaa vastapuolen nhd IP-osoitteesi ja voi olla "
+#~ "turvallisuusriski. Haluatko jatkaa?"
+
+#~ msgid ""
+#~ "Active Developers\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Crazy Patch Writers\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Retired Developers\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+#~ msgstr ""
+#~ "Aktiiviset kehittjt\n"
+#~ "==============================\n"
+#~ "Rob Flynn (yllpitj) [ rob@marko.net ]\n"
+#~ "Sean Egan (ohjelmoija) [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Villit korjausten kirjoittajat\n"
+#~ "==============================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Poistuneet kehittjt\n"
+#~ "==============================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (alkuperinen tekij) [ markster@marko.net ]"
+
+#~ msgid "Web Site"
+#~ msgstr "Web-sivusto"
+
+#~ msgid "Password: "
+#~ msgstr "Salasana: "
+
+#~ msgid "About"
+#~ msgstr "Tietoja"
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr "Lataa skripti"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "Poista kaikki skriptit"
+
+#~ msgid "List Scripts"
+#~ msgstr "Listaa skriptit"
+
+#~ msgid "Whisper"
+#~ msgstr "Kuiskaa"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Tallenna keskustelu"
+
+#~ msgid "Currently at %d, "
+#~ msgstr "Parhaillaan %d:ssa, "
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "Asetetaan sijainniksi %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr "Lihavoi teksti"
+
+#~ msgid "Bold"
+#~ msgstr "Lihavoi"
+
+#~ msgid "Italics Text"
+#~ msgstr "Kursivoi teksti"
+
+#~ msgid "Italics"
+#~ msgstr "Kursivoi"
+
+#~ msgid "Underline Text"
+#~ msgstr "Alleviivaa teksti"
+
+#~ msgid "Underline"
+#~ msgstr "Alleviivaa"
+
+#~ msgid "Strike through Text"
+#~ msgstr "Yliviivaa teksti"
+
+#~ msgid "Strike"
+#~ msgstr "Yliviivaa"
+
+#~ msgid "Decrease font size"
+#~ msgstr "Pienenn fonttikokoa"
+
+#~ msgid "Small"
+#~ msgstr "Pieni"
+
+#~ msgid "Normal font size"
+#~ msgstr "Normaali fonttikoko"
+
+#~ msgid "Normal"
+#~ msgstr "Normaali"
+
+#~ msgid "Increase font size"
+#~ msgstr "Suurenna fonttikokoa"
+
+#~ msgid "Big"
+#~ msgstr "Suuri"
+
+#~ msgid "Font"
+#~ msgstr "Fontti"
+
+#~ msgid "Text Color"
+#~ msgstr "Tekstin vri"
+
+#~ msgid "Background Color"
+#~ msgstr "Taustavri"
+
+#~ msgid "Link"
+#~ msgstr "Linkki"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "Lis hymi"
+
+#~ msgid "Smiley"
+#~ msgstr "Hymi"
+
+#~ msgid "Image"
+#~ msgstr "Kuva"
+
+#~ msgid "Sound"
+#~ msgstr "ni"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - Varoita kyttj?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "Haluatko todella varoittaa kyttj %s?"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - Poista %s?"
+
+#~ msgid "Remove Buddy"
+#~ msgstr "Poista tuttava"
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "Olet poistamassa '%s':n tuttavalistaltasi.\n"
+#~ "Haluatko jatkaa?"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - Pikaviestimen kyttj"
+
+#~ msgid "IM who:"
+#~ msgstr "Pikaviesti kenelle:"
+
+#~ msgid "User:"
+#~ msgstr "Kyttj:"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim - Hae kyttjtiedot"
+
+#~ msgid "Add Group"
+#~ msgstr "Lis ryhm"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Lis tuttava"
+
+#~ msgid "Contact"
+#~ msgstr "Kontakti"
+
+#~ msgid "Allow List"
+#~ msgstr "Sallittujen lista"
+
+#~ msgid "Block List"
+#~ msgstr "Kiellettyjen lista"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "Anna tuttavalle alias"
+
+#~ msgid "Rename Group"
+#~ msgstr "Nime ryhm uudelleen"
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim ei kyennyt lhettmn viesti"
+
+#~ msgid "Select All"
+#~ msgstr "Valitse kaikki"
+
+#~ msgid "Select Autos"
+#~ msgstr "Valitse automaattiset"
+
+#~ msgid "Select None"
+#~ msgstr "Poista valinnat"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "Kirjaa sisn/ulos"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim - Liitnnislista"
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - Liitnniset"
+
+#~ msgid "Loaded Plugins"
+#~ msgstr "Ladatut liitnniset"
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr "Valitse kaikki"
+
+#~ msgid "Filepath:"
+#~ msgstr "Tiedostopolku:"
+
+#~ msgid "Load"
+#~ msgstr "Lataa"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "Lataa liitnninen tiedostosta"
+
+#~ msgid "Configure"
+#~ msgstr "Muuta asetuksia"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "Muuta asetuksia valitulle liitnniselle"
+
+#~ msgid "Reload"
+#~ msgstr "Lataa uudelleen"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "Lataa valittu liitnninen uudelleen"
+
+#~ msgid "Unload"
+#~ msgstr "Poista"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "Poista valittu liitnninen"
+
+#~ msgid "Close this window"
+#~ msgstr "Sulje tm ikkuna"
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "Kyt reunattomia painikkeita"
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "l vlit automatisoiduista TiK-viesteist"
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "Nosta ikkuna tapahtumahetkin"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Gaim-virheidenetsinnn tulostusikkuna"
+
+#~ 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 ""
+#~ "Yritit ladata protokollan, jota ei ole knnetty saman lhdekoodiversion "
+#~ "kanssa kuin tm ohjelma. Koska se ei ole samaa versiota, en "
+#~ "valitettavasti voi sanoa varmasti mik se oli. Lienee tarpeetonta "
+#~ "sanoakaan, ettei sit kyetty onnistuneesti lataamaan."
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s kytti %s:aa, joka poistettiin. %s on nyt poissa linjoilta."
+
+#~ msgid "Accept?"
+#~ msgstr "Hyvksy?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Gadu-Gadu-virhe"
 
@@ -3747,18 +4704,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "Salasanan vaihtaminen eponnistui (%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "Kutsumanime/kanavaa ei ole olemassa"
-
-#~ msgid "IRC Error"
-#~ msgstr "IRC-virhe"
-
-#~ msgid "No such server"
-#~ msgstr "Palvelinta ei ole olemassa"
-
-#~ msgid "IRC Part"
-#~ msgstr "IRC Poistu"
-
 #~ msgid "Incorrect current password! Password NOT Changed!"
 #~ msgstr "Vr nykyinen salasana! Salasanaa EI vaihdettu!"
 
@@ -3777,9 +4722,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "MSN-virhe"
 
-#~ msgid "Invalid name"
-#~ msgstr "Epkelpo nimi"
-
 #~ msgid "Chat Error!"
 #~ msgstr "Ryhmkeskusteluvirhe!"
 
@@ -3795,9 +4737,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "Tuntematon syy"
 
-#~ msgid "AOL error"
-#~ msgstr "AOL-virhe"
-
 #~ msgid "Error"
 #~ msgstr "Virhe"
 
@@ -3899,15 +4838,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "Raportoi joutenoloajat"
 
-#~ msgid "None"
-#~ msgstr "Ei mitn"
-
-#~ msgid "Gaim Use"
-#~ msgstr "Gaim:in kytt"
-
-#~ msgid "X Use"
-#~ msgstr "X:n kytt"
-
 #~ msgid "Konqueror"
 #~ msgstr "Konqueror"
 
@@ -3936,9 +4866,6 @@
 #~ "Kaikki protokollat eivt voi kytt nit vlityspalvelinvalintoja. Lue "
 #~ "README-tiedostosta yksityiskohdat."
 
-#~ msgid "No Proxy"
-#~ msgstr "Ei vlityspalvelinta"
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -3951,12 +4878,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Tuttavalistan valinnat"
 
-#~ msgid "Tab Placement:"
-#~ msgstr "Vlilehtien sijoitus:"
-
-#~ msgid "Top"
-#~ msgstr "Ylhll"
-
 #~ msgid "Raise Buddy List on Signons and Signoffs"
 #~ msgstr "Nosta tuttavalista sisn- ja uloskirjautumisten kohdalla"
 
@@ -3975,42 +4896,18 @@
 #~ msgid "IM Options"
 #~ msgstr "Pikaviestivalinnat"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "Nyt painikkeissa: "
-
-#~ msgid "Pictures And Text"
-#~ msgstr "Kuvat ja teksti"
-
-#~ msgid "Pictures"
-#~ msgstr "Kuvat"
-
-#~ msgid "Text"
-#~ msgstr "Teksti"
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "Nyt kaikki keskustelut yhdess jaetussa ikkunassa"
-
 #~ msgid "Window Sizes"
 #~ msgstr "Ikkunakoot"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Vlilehtien sijoitus"
 
-#~ msgid "Left"
-#~ msgstr "Vasemmalla"
-
-#~ msgid "Right"
-#~ msgstr "Oikealla"
-
 #~ msgid "Chat Options"
 #~ msgstr "Ryhmkeskusteluvalinnat"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Nyt keskustelut samassa jaetussa ikkunassa"
 
-#~ msgid "Font Options"
-#~ msgstr "Fonttivalinnat"
-
 #~ msgid "Italic Text"
 #~ msgstr "Kursivoitu teksti"
 
--- a/po/fr.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/fr.po	Sun Jan 05 23:21:50 2003 +0000
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2003-01-02 13:12-0800\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\n"
 "PO-Revision-Date:  2003-01-02 13:12-0800\n"
 "Last-Translator: sebfrance <sebfrance@ifrance.com>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -22,9 +22,9 @@
 msgid "New..."
 msgstr "Nouveau..."
 
-#: plugins/docklet/docklet.c:123 src/protocols/gg/gg.c:75
-#: src/protocols/jabber/jabber.c:1165 src/buddy.c:499 src/buddy.c:2532
-#: src/buddy.c:2662 src/prefs.c:731
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
 msgid "Away"
 msgstr "Absent"
 
@@ -64,6 +64,10 @@
 msgid "Tray Icon Configuration"
 msgstr "Configuration de l'icone du Tray"
 
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
 #: plugins/docklet/docklet.c:409
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "Cacher les nouveaux messages jusqu'au clic du Docklet"
@@ -93,42 +97,42 @@
 msgid "System Tray Icon"
 msgstr "Icone du System Tray"
 
-#: plugins/chatlist.c:68 src/buddy_chat.c:281
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Discussion"
 
-#: plugins/chatlist.c:159 plugins/chatlist.c:161 plugins/chatlist.c:351
-#: plugins/chatlist.c:353
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Gaim - Discussion"
 
-#: plugins/chatlist.c:302
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "Salons de discussion"
 
-#: plugins/chatlist.c:314
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr "Rafraichir"
 
-#: plugins/chatlist.c:315 src/protocols/icq/gaim_icq.c:279
-#: src/protocols/oscar/oscar.c:2175 src/buddy.c:494 src/buddy.c:2760
-#: src/buddy_chat.c:908 src/buddy_chat.c:1588 src/conversation.c:2466
-#: src/conversation.c:3053 src/dialogs.c:1128 src/dialogs.c:1474
-#: src/dialogs.c:1508 src/dialogs.c:2511 src/prpl.c:638
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Ajouter"
 
-#: plugins/chatlist.c:316 src/buddy.c:496 src/buddy.c:2762
-#: src/buddy_chat.c:906 src/buddy_chat.c:1590 src/conversation.c:2450
-#: src/conversation.c:3047 src/dialogs.c:1478 src/dialogs.c:1512
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Enlever"
 
-#: plugins/chatlist.c:332
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "Liste des salons disponibles"
 
-#: plugins/chatlist.c:342
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "Liste des salons souscris"
 
@@ -144,6 +148,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr "Saisissez des symboles délimitant avec \"+\" dans la boite suivante"
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr "Vérifier que cette boite affiche seulement les symboles et les prix :"
@@ -160,108 +165,111 @@
 msgid "Change"
 msgstr "Changer"
 
-#: plugins/notify.c:344
+#: plugins/notify.c:389
 msgid "Unable to write to config file"
 msgstr "Impossible d'écrire dans le fichier de configuration"
 
-#: plugins/notify.c:344
+#: plugins/notify.c:389
 msgid "Notify plugin"
 msgstr "Module de notification"
 
-#: plugins/notify.c:507
+#: plugins/notify.c:561
 msgid "Notify For"
 msgstr "Notification pour"
 
-#: plugins/notify.c:508
+#: plugins/notify.c:562
 msgid "_IM windows"
 msgstr "Fenêtres de message"
 
-#: plugins/notify.c:513
+#: plugins/notify.c:567
 msgid "_Chat windows"
 msgstr "Fenêtres de discussions"
 
-#: plugins/notify.c:519
+#. --------------
+#: plugins/notify.c:573
 msgid "Notification Methods"
 msgstr "Méthode de notification"
 
-#: plugins/notify.c:522
-msgid "Prepend _string into window title:"
+#: plugins/notify.c:576
+#, fuzzy
+msgid "Prepend _string into window title (hit enter to save):"
 msgstr "Préfixer un texte au titre de la fenêtre :"
 
-#: plugins/notify.c:531
+#: plugins/notify.c:587
 msgid "_Quote window title"
 msgstr "Mettre le titre de la fenêtre entre guillemets"
 
-#: plugins/notify.c:536
+#: plugins/notify.c:592
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "Envoyer le message \"_URGENT\" au gestionnaire de fenêtres"
 
-#: plugins/notify.c:541
+#: plugins/notify.c:597
 msgid "Insert c_ount of new messages into window title"
 msgstr "Mettre le nombre de nouveaux messages dans le titre de la fenêtre"
 
-#: plugins/notify.c:546
+#: plugins/notify.c:602
 msgid "_Notify even if conversation is in focus"
 msgstr "Notification même si la fenêtre est activée"
 
-#: plugins/notify.c:552
+#. --------------
+#: plugins/notify.c:608
 msgid "Notification Removal"
 msgstr "Suppression de la notification"
 
-#: plugins/notify.c:553
+#: plugins/notify.c:609
 msgid "Remove when conversation window gains _focus"
 msgstr "Supprimer quand la fenêtre devient active"
 
-#: plugins/notify.c:558
+#: plugins/notify.c:614
 msgid "Remove when conversation window _receives click"
 msgstr "Supprimer quand la fenêtre est cliquée"
 
-#: plugins/notify.c:563
+#: plugins/notify.c:619
 msgid "Remove when _typing in conversation window"
 msgstr "Supprimer lors de l'écriture dans la fenêtre"
 
-#: plugins/notify.c:568
+#: plugins/notify.c:624
 msgid "Appl_y"
 msgstr "Appliquer"
 
-#: plugins/autorecon.c:49 plugins/autorecon.c:60
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Quand vous êtes déconnecté, ce module vous reconnecte automatiquement."
 
-#: plugins/autorecon.c:56
+#: plugins/autorecon.c:61
 msgid "Auto Reconnect"
 msgstr "Reconnexion automatique"
 
-#: plugins/timestamp.c:67
+#: plugins/timestamp.c:73
 msgid "Timestamp"
 msgstr "Horodatage"
 
-#: plugins/timestamp.c:69
+#: plugins/timestamp.c:75
 msgid "Adds iChat-style timestamps to conversations every 5 minutes."
 msgstr "Ajoute l'heure dans la conversaition toutes les 5 minutes."
 
-#: plugins/history.c:67
+#: plugins/history.c:72
 msgid "History"
 msgstr "Historique"
 
-#: plugins/history.c:69
+#: plugins/history.c:74
 msgid "Shows recently logged conversations in new conversations "
 msgstr "Affiche l'historique dans les nouvelles conversations "
 
-#: plugins/iconaway.c:47
+#: plugins/iconaway.c:52
 msgid "Iconify on away"
 msgstr "Iconifier lors des absences"
 
-#: plugins/iconaway.c:49 plugins/iconaway.c:60
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
 msgid "Iconifies the away box and the buddy list when you go away."
 msgstr "Met en icone la liste de contacts et le message d'absence."
 
-#: plugins/iconaway.c:56
+#: plugins/iconaway.c:61
 msgid "Iconify On Away"
 msgstr "Iconifier lors des absences"
 
-#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2352
-#: src/protocols/msn/msn.c:2457
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Disponible"
 
@@ -313,7 +321,7 @@
 msgid "Unknown Error Code."
 msgstr "Code d'erreur inconnu"
 
-#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2507
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Status : %s"
@@ -420,7 +428,8 @@
 msgid "Sex"
 msgstr "Sexe"
 
-#: src/protocols/gg/gg.c:739 src/dialogs.c:2044 src/dialogs.c:2748
+#. Line 5
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Ville"
 
@@ -515,9 +524,12 @@
 msgid "Directory Search"
 msgstr "Recherche dans l'annuaire"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
 #: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
-#: src/dialogs.c:2160
 msgid "Change Password"
 msgstr "Changer de mot de passe"
 
@@ -555,27 +567,27 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Erreur lors de la communication avec le serveur ICQ"
 
-#: src/protocols/icq/gaim_icq.c:279 src/protocols/irc/irc.c:1288
-#: src/protocols/oscar/oscar.c:2022 src/protocols/oscar/oscar.c:4636
-#: src/protocols/toc/toc.c:1987 src/buddy_chat.c:317 src/buddy_chat.c:401
-#: src/dialogs.c:1132 src/dialogs.c:2102 src/dialogs.c:2225 src/dialogs.c:2290
-#: src/dialogs.c:2500 src/dialogs.c:2682 src/dialogs.c:2859 src/dialogs.c:2926
-#: src/dialogs.c:3559 src/dialogs.c:3757 src/dialogs.c:3914 src/dialogs.c:4296
-#: src/dialogs.c:4401 src/dialogs.c:5143 src/multi.c:1040 src/multi.c:1139
-#: src/multi.c:1457 src/prpl.c:280 src/prpl.c:638
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
 msgid "Cancel"
 msgstr "Annuler"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
-#: src/protocols/msn/msn.c:1163 src/protocols/msn/msn.c:1318
-#: src/protocols/oscar/oscar.c:2122
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
 msgid "Authorize"
 msgstr "Autoriser"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
-#: src/protocols/msn/msn.c:1163 src/protocols/msn/msn.c:1318
-#: src/protocols/oscar/oscar.c:2122 src/protocols/oscar/oscar.c:2175
-#: src/dialogs.c:2499
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
 msgid "Deny"
 msgstr "Refuser"
 
@@ -583,9 +595,9 @@
 msgid "Send message through server"
 msgstr "Envoyer le message par le serveur"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2641
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
 #: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
-#: src/protocols/oscar/oscar.c:4675 src/protocols/oscar/oscar.c:4727
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
 #: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Obtenir des informations"
@@ -602,7 +614,7 @@
 "(Erreur de conversion du message. Vérifiez les options de codage de "
 "l'éditeur de comptes.)"
 
-#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2351
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "Connexion directe avec %s fermée"
@@ -611,11 +623,12 @@
 msgid "No topic is set"
 msgstr "Pas de sujet"
 
-#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1539
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s a changé le sujet en : %s</B>"
 
+#. RPL_REHASHING
 #: src/protocols/irc/irc.c:1089
 msgid "Rehashing server"
 msgstr "Lecture de la clé du serveur"
@@ -624,6 +637,7 @@
 msgid "IRC Operator"
 msgstr "Opérateur IRC"
 
+#. ERR_NOSUCHNICK
 #: src/protocols/irc/irc.c:1092
 msgid "No such nick/channel"
 msgstr "Le pseudo/canal n'existe pas"
@@ -634,14 +648,17 @@
 msgid "IRC Error"
 msgstr "Erreur IRC"
 
+#. ERR_NOSUCHSERVER
 #: src/protocols/irc/irc.c:1095
 msgid "No such server"
 msgstr "Serveur inconnu"
 
+#. ERR_NONICKNAMEGIVEN
 #: src/protocols/irc/irc.c:1097
 msgid "No nickname given"
 msgstr "Pas de pseudonyme donné"
 
+#. ERR_NOPRIVILEGES
 #: src/protocols/irc/irc.c:1100
 msgid "You're not an IRC operator!"
 msgstr "Vous n'êtes pas opérateur"
@@ -668,14 +685,14 @@
 "Une connexion directe entre les deux machines est nécessaire. Les messages "
 "ne passeront pas par le serveur IRC."
 
-#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2022
-#: src/protocols/oscar/oscar.c:4636
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
 msgid "Connect"
 msgstr "Connecter"
 
-#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:306
-#: src/protocols/msn/msn.c:1327 src/protocols/msn/msn.c:1343
-#: src/protocols/msn/msn.c:1828
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Impossible d'écrire"
 
@@ -689,59 +706,59 @@
 msgid "Kicked by %s: %s"
 msgstr "Expulsé par %s : %s"
 
-#: src/protocols/irc/irc.c:1457 src/protocols/irc/irc.c:2660
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
 msgid "CTCP ClientInfo"
 msgstr "CTCP infos client"
 
-#: src/protocols/irc/irc.c:1463 src/protocols/irc/irc.c:2666
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
 msgid "CTCP UserInfo"
 msgstr "CTCP infos utilisateur"
 
-#: src/protocols/irc/irc.c:1469 src/protocols/irc/irc.c:2672
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
 msgid "CTCP Version"
 msgstr "CTCP Version"
 
-#: src/protocols/irc/irc.c:1489 src/protocols/irc/irc.c:2678
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1969
+#: src/protocols/irc/irc.c:1972
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "Le sujet de %s est %s"
 
-#: src/protocols/irc/irc.c:2061
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Vous avez quitté %s"
 
-#: src/protocols/irc/irc.c:2062
+#: src/protocols/irc/irc.c:2065
 msgid "IRC Part"
 msgstr "IRC Sortir"
 
-#: src/protocols/irc/irc.c:2229
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Canal:"
 
-#: src/protocols/irc/irc.c:2233 src/aim.c:325 src/multi.c:641
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/protocols/irc/irc.c:2647
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "Discussion DCC"
 
-#: src/protocols/irc/irc.c:2718 src/protocols/jabber/jabber.c:2860
-#: src/protocols/msn/msn.c:2905 src/protocols/napster/napster.c:615
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
 msgid "Server:"
 msgstr "Serveur :"
 
-#: src/protocols/irc/irc.c:2724 src/protocols/jabber/jabber.c:4224
-#: src/protocols/msn/msn.c:2911 src/protocols/napster/napster.c:621
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
 msgid "Port:"
 msgstr "Port :"
 
-#: src/protocols/irc/irc.c:2730
+#: src/protocols/irc/irc.c:2733
 msgid "Encoding:"
 msgstr "Codage :"
 
@@ -772,8 +789,8 @@
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/protocols/jabber/jabber.c:1167 src/protocols/jabber/jabber.c:1185
-#: src/buddy.c:2795 src/multi.c:245
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "En ligne"
 
@@ -815,8 +832,8 @@
 msgid "No such user."
 msgstr "Utilisateur inconnu"
 
-#: src/protocols/jabber/jabber.c:1757 src/protocols/msn/msn.c:1353
-#: src/dialogs.c:924
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Contacts"
 
@@ -838,7 +855,7 @@
 
 #: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
 #: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
-#: src/protocols/msn/msn.c:1978 src/protocols/msn/msn.c:2007
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
@@ -850,7 +867,8 @@
 msgid "Requesting Authentication Method"
 msgstr "Requête de méthode d'authentification"
 
-#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1999
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Connexion en cours"
 
@@ -883,8 +901,8 @@
 msgid "View Error Msg"
 msgstr "Voir l'erreur"
 
-#: src/protocols/jabber/jabber.c:3246 src/protocols/oscar/oscar.c:4688
-#: src/buddy_chat.c:895
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Obtenir le message d'absence"
 
@@ -920,7 +938,7 @@
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: src/protocols/jabber/jabber.c:3481 src/dialogs.c:2939
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
@@ -944,7 +962,8 @@
 msgid "Postal Code"
 msgstr "Code postal"
 
-#: src/protocols/jabber/jabber.c:3487 src/dialogs.c:2066 src/dialogs.c:2770
+#. Line 7
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Pays"
 
@@ -952,7 +971,7 @@
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: src/protocols/jabber/jabber.c:3489 src/dialogs.c:2844
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "Email"
 
@@ -976,7 +995,7 @@
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: src/protocols/jabber/jabber.c:3495 src/dialogs.c:2947 src/prefs.c:985
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Description"
 
@@ -1008,336 +1027,336 @@
 msgid "Set User Info"
 msgstr "Editer les informations utilisateur"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Erreur de syntaxe (probablement un bug de Gaim)"
 
-#: src/protocols/msn/msn.c:224
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "Paramètre invalide (probablement un bug de Gaim)"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:228
 msgid "Invalid User"
 msgstr "Nom invalide"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr "Nom de d'adresse machine manquant"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr "Déjà connecté"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:237
 msgid "Invalid Username"
 msgstr "Nom invalide"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Friendly Name"
 msgstr "Alias invalide"
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr "Liste complète"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr "Déjà là"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:249
 msgid "Not on list"
 msgstr "Pas dans la liste"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr "L'utilisateur est déconnecté"
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr "Déjà dans ce mode"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr "Déjà dans la liste opposée"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr "Echec"
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr "Notification de transfert échoué"
 
-#: src/protocols/msn/msn.c:267
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr "Remplissez les champs requis"
 
-#: src/protocols/msn/msn.c:270 src/protocols/oscar/oscar.c:399
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 msgid "Not logged in"
 msgstr "Non connecté"
 
-#: src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:275
 msgid "Internal server error"
 msgstr "Erreur interne du serveur"
 
-#: src/protocols/msn/msn.c:277
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr "Erreur de base de données du serveur"
 
-#: src/protocols/msn/msn.c:280
+#: src/protocols/msn/msn.c:281
 msgid "File operation error"
 msgstr "Erreur de manipulation de fichier"
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:284
 msgid "Memory allocation error"
 msgstr "Erreur d'allocation mémoire"
 
-#: src/protocols/msn/msn.c:287
+#: src/protocols/msn/msn.c:288
 msgid "Server busy"
 msgstr "Serveur occupé"
 
-#: src/protocols/msn/msn.c:290
+#: src/protocols/msn/msn.c:291
 msgid "Server unavailable"
 msgstr "Serveur non disponible"
 
-#: src/protocols/msn/msn.c:293
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr "Notification du serveur distant est coupé"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:297
 msgid "Database connect error"
 msgstr "Erreur de connexion à la base de données"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr "Le serveur va être coupé (abandonnez le navire)"
 
-#: src/protocols/msn/msn.c:303
+#: src/protocols/msn/msn.c:304
 msgid "Error creating connection"
 msgstr "Erreur à l'ouverture de la connexion"
 
-#: src/protocols/msn/msn.c:309
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr "Surcharge de session"
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr "L'utilisateur est trop actif"
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr "Trop de sessions"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr "Non attendu"
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr "Mauvais fichier d'ami"
 
-#: src/protocols/msn/msn.c:325
+#: src/protocols/msn/msn.c:326
 msgid "Authentication failed"
 msgstr "Echec de l'authentification"
 
-#: src/protocols/msn/msn.c:328
+#: src/protocols/msn/msn.c:329
 msgid "Not allowed when offline"
 msgstr "Interdit en dehors de la connexion"
 
-#: src/protocols/msn/msn.c:331
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr "N'accepte plus de nouveaux utilisateurs"
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr "Utilisateur non vérifié"
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:338
 msgid "Unknown Error Code"
 msgstr "Code d'erreur inconnu"
 
-#: src/protocols/msn/msn.c:490
+#: src/protocols/msn/msn.c:491
 #, c-format
 msgid "%s has closed the conversation window"
 msgstr "%s a fermé sa fenêtre de dialogue"
 
-#: src/protocols/msn/msn.c:561
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr "Un message peut avoir été perdu."
 
-#: src/protocols/msn/msn.c:1058
+#: src/protocols/msn/msn.c:1041
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim n'a pas réussi à envoyer un message MSN"
 
-#: src/protocols/msn/msn.c:1059
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr "Erreur de communication avec le serveur standardiste MSN"
 
-#: src/protocols/msn/msn.c:1092 src/protocols/msn/msn.c:1111
-#: src/protocols/msn/msn.c:2282 src/protocols/msn/msn.c:2404
-#: src/protocols/msn/msn.c:2422 src/protocols/msn/msn.c:2542
-#: src/protocols/msn/msn.c:2555 src/protocols/msn/msn.c:2581
-#: src/protocols/msn/msn.c:2638 src/protocols/msn/msn.c:2656
-#: src/protocols/msn/msn.c:2691 src/protocols/msn/msn.c:2725
-#: src/protocols/msn/msn.c:2766 src/protocols/msn/msn.c:2773
-#: src/protocols/msn/msn.c:2786 src/protocols/msn/msn.c:2794
-#: src/protocols/msn/msn.c:2823 src/protocols/msn/msn.c:2832
-#: src/protocols/msn/msn.c:2845 src/protocols/msn/msn.c:2853
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
 msgid "Write error"
 msgstr "Erreur d'écriture"
 
-#: src/protocols/msn/msn.c:1160
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "L'utilisateur %s (%s) veut ajouter %s à sa liste de contacts"
 
-#: src/protocols/msn/msn.c:1210 src/protocols/msn/msn.c:1985
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
 msgid "Unable to write to server"
 msgstr "Impossible de parler au server"
 
-#: src/protocols/msn/msn.c:1317
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "L'utilisateur %s (%s) veut vous ajouter à sa liste de contacts"
 
-#: src/protocols/msn/msn.c:1418
+#: src/protocols/msn/msn.c:1401
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 "Vous avez été déconnecté. Vous vous êtes connecté depuis un autre endroit."
 
-#: src/protocols/msn/msn.c:1553 src/protocols/msn/msn.c:1869
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
 msgid "Got invalid XFR\n"
 msgstr "Invalide XFR\n"
 
-#: src/protocols/msn/msn.c:1593
+#: src/protocols/msn/msn.c:1576
 msgid "Error transfering"
 msgstr "Erreur de transfert"
 
-#: src/protocols/msn/msn.c:1677 src/protocols/msn/msn.c:1916
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 msgid "Error reading from server"
 msgstr "Erreur à la lecture depuis le serveur"
 
-#: src/protocols/msn/msn.c:1761
+#: src/protocols/msn/msn.c:1744
 msgid "Unable to connect to Notification Server"
 msgstr "Impossible de se connecter au server de notification"
 
-#: src/protocols/msn/msn.c:1768
+#: src/protocols/msn/msn.c:1751
 msgid "Unable to talk to Notification Server"
 msgstr "Impossible de parler au server de notification"
 
-#: src/protocols/msn/msn.c:1784
+#: src/protocols/msn/msn.c:1767
 msgid "Protocol not supported"
 msgstr "Protocole non supporté"
 
-#: src/protocols/msn/msn.c:1791
+#: src/protocols/msn/msn.c:1774
 msgid "Unable to request INF\n"
 msgstr "Impossible de demander INF\n"
 
-#: src/protocols/msn/msn.c:1798
+#: src/protocols/msn/msn.c:1781
 msgid "Unable to login using MD5"
 msgstr "Impossible de se connecter en utilisant MD5"
 
-#: src/protocols/msn/msn.c:1805
+#: src/protocols/msn/msn.c:1788
 msgid "Unable to send USR\n"
 msgstr "Impossible d'envoyer USR\n"
 
-#: src/protocols/msn/msn.c:1810
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr "Demande pour envoyer le mot de passe"
 
-#: src/protocols/msn/msn.c:1856
+#: src/protocols/msn/msn.c:1839
 msgid "Unable to send password"
 msgstr "Impossible d'envoyer le mot de passe"
 
-#: src/protocols/msn/msn.c:1861
+#: src/protocols/msn/msn.c:1844
 msgid "Password sent"
 msgstr "Mot de passe envoyé"
 
-#: src/protocols/msn/msn.c:1890
+#: src/protocols/msn/msn.c:1873
 msgid "Unable to transfer"
 msgstr "Impossible de transférer"
 
-#: src/protocols/msn/msn.c:1898
+#: src/protocols/msn/msn.c:1881
 msgid "Unable to parse message"
 msgstr "Impossible d'interprêter le message"
 
-#: src/protocols/msn/msn.c:1991
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr "Synchronisation avec le serveur"
 
-#: src/protocols/msn/msn.c:2353 src/protocols/msn/msn.c:2380
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr "Pas devant l'écran"
 
-#: src/protocols/msn/msn.c:2354 src/protocols/msn/msn.c:2382
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr "Revient de suite"
 
-#: src/protocols/msn/msn.c:2355 src/protocols/msn/msn.c:2384
-#: src/protocols/msn/msn.c:2445
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 msgid "Busy"
 msgstr "Occupé"
 
-#: src/protocols/msn/msn.c:2356 src/protocols/msn/msn.c:2386
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr "Au téléphone"
 
-#: src/protocols/msn/msn.c:2357 src/protocols/msn/msn.c:2388
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr "Parti(e) manger"
 
-#: src/protocols/msn/msn.c:2358 src/protocols/msn/msn.c:2390
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 msgid "Hidden"
 msgstr "Caché"
 
-#: src/protocols/msn/msn.c:2447
+#: src/protocols/msn/msn.c:2428
 msgid "Be right back"
 msgstr "Revient de suite"
 
-#: src/protocols/msn/msn.c:2449
+#: src/protocols/msn/msn.c:2430
 msgid "Away from the computer"
 msgstr "Pas devant l'écran"
 
-#: src/protocols/msn/msn.c:2451
+#: src/protocols/msn/msn.c:2432
 msgid "On the phone"
 msgstr "Au téléphone"
 
-#: src/protocols/msn/msn.c:2453
+#: src/protocols/msn/msn.c:2434
 msgid "Out to lunch"
 msgstr "Parti(e) manger"
 
-#: src/protocols/msn/msn.c:2455 src/prefs.c:748
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
 msgid "Idle"
 msgstr "Inactif"
 
-#: src/protocols/msn/msn.c:2492
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr "Remise à zéro de l'alias"
 
-#: src/protocols/msn/msn.c:2498 src/protocols/oscar/oscar.c:2573
-#: src/protocols/oscar/oscar.c:4701 src/buddy.c:2192
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
 msgid "Send File"
 msgstr "Envoyer un fichier"
 
-#: src/protocols/msn/msn.c:2574
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr "L'alias est trop long."
 
-#: src/protocols/msn/msn.c:2589 src/protocols/msn/msn.c:2610
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 msgid "Set Friendly Name"
 msgstr "Changer l'alias"
 
-#: src/protocols/msn/msn.c:2590
+#: src/protocols/msn/msn.c:2571
 msgid "Set Friendly Name:"
 msgstr "Nouvel alias :"
 
-#: src/protocols/msn/msn.c:2591 src/protocols/msn/msn.c:2611
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr "Remise à zéro de tous les alias"
 
-#: src/protocols/msn/msn.c:2751
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1347,11 +1366,11 @@
 "probablement dire \"%s@hotmail.com\". La liste de permissions n'a pas été "
 "modifiée."
 
-#: src/protocols/msn/msn.c:2754 src/protocols/msn/msn.c:2811
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 msgid "Invalid MSN screenname"
 msgstr "Nom invalide"
 
-#: src/protocols/msn/msn.c:2808
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1361,189 +1380,193 @@
 "probablement dire \"%s@hotmail.com\". La liste d'interdictions n'a pas été "
 "modifiée."
 
-#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4200
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
 #: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Groupe à joindre :"
 
-#: src/protocols/oscar/oscar.c:395
+#: src/protocols/oscar/oscar.c:394
 msgid "Invalid error"
 msgstr "Erreur invalide"
 
+#: src/protocols/oscar/oscar.c:395
+msgid "Invalid SNAC"
+msgstr "SNAC invalide"
+
 #: src/protocols/oscar/oscar.c:396
-msgid "Invalid SNAC"
-msgstr "SNAC invalide"
-
-#: src/protocols/oscar/oscar.c:397
 msgid "Rate to host"
 msgstr "Fréquence vers l'hôte"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:397
 msgid "Rate to client"
 msgstr "Fréquence vers le client"
 
+#: src/protocols/oscar/oscar.c:399
+msgid "Service unavailable"
+msgstr "Service non disponible"
+
 #: src/protocols/oscar/oscar.c:400
-msgid "Service unavailable"
-msgstr "Service non disponible"
-
-#: src/protocols/oscar/oscar.c:401
 msgid "Service not defined"
 msgstr "Service non défini"
 
-#: src/protocols/oscar/oscar.c:402
+#: src/protocols/oscar/oscar.c:401
 msgid "Obsolete SNAC"
 msgstr "SNAC obsolète"
 
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr "Non supporté par l'hôte"
+
 #: src/protocols/oscar/oscar.c:403
-msgid "Not supported by host"
-msgstr "Non supporté par l'hôte"
-
-#: src/protocols/oscar/oscar.c:404
 msgid "Not supported by client"
 msgstr "Non supporté par le client"
 
-#: src/protocols/oscar/oscar.c:405
+#: src/protocols/oscar/oscar.c:404
 msgid "Refused by client"
 msgstr "Refusé par le client"
 
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr "Réponse trop grosse"
+
 #: src/protocols/oscar/oscar.c:406
-msgid "Reply too big"
-msgstr "Réponse trop grosse"
+msgid "Responses lost"
+msgstr "Réponses perdues"
 
 #: src/protocols/oscar/oscar.c:407
-msgid "Responses lost"
-msgstr "Réponses perdues"
+msgid "Request denied"
+msgstr "Requête refusée"
 
 #: src/protocols/oscar/oscar.c:408
-msgid "Request denied"
-msgstr "Requête refusée"
+msgid "Busted SNAC payload"
+msgstr "Charge SNAC incorrecte"
 
 #: src/protocols/oscar/oscar.c:409
-msgid "Busted SNAC payload"
-msgstr "Charge SNAC incorrecte"
-
-#: src/protocols/oscar/oscar.c:410
 msgid "Insufficient rights"
 msgstr "Droits insuffisants"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:410
 msgid "In local permit/deny"
 msgstr "Dans l'autorisation/interdiction locale"
 
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr "Trop méchant (envoyeur)"
+
 #: src/protocols/oscar/oscar.c:412
-msgid "Too evil (sender)"
-msgstr "Trop méchant (envoyeur)"
+msgid "Too evil (receiver)"
+msgstr "Trop méchant (destinataire)"
 
 #: src/protocols/oscar/oscar.c:413
-msgid "Too evil (receiver)"
-msgstr "Trop méchant (destinataire)"
+msgid "User temporarily unavailable"
+msgstr "L'utilisateur est temporairement indisponible."
 
 #: src/protocols/oscar/oscar.c:414
-msgid "User temporarily unavailable"
-msgstr "L'utilisateur est temporairement indisponible."
+msgid "No match"
+msgstr "Pas de résultat"
 
 #: src/protocols/oscar/oscar.c:415
-msgid "No match"
-msgstr "Pas de résultat"
+msgid "List overflow"
+msgstr "Dépassement de liste"
 
 #: src/protocols/oscar/oscar.c:416
-msgid "List overflow"
-msgstr "Dépassement de liste"
+msgid "Request ambiguous"
+msgstr "Requête ambiguë"
 
 #: src/protocols/oscar/oscar.c:417
-msgid "Request ambiguous"
-msgstr "Requête ambiguë"
-
-#: src/protocols/oscar/oscar.c:418
 msgid "Queue full"
 msgstr "File d'attente pleine"
 
-#: src/protocols/oscar/oscar.c:419
+#: src/protocols/oscar/oscar.c:418
 msgid "Not while on AOL"
 msgstr "Impossible sur AOL"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Connexion directe avec %s fermée"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Connexion directe avec %s echoué"
 
-#: src/protocols/oscar/oscar.c:503
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "Erreur à la connexion (rend)\n"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "Erreur majeure à la connexion\n"
 
-#: src/protocols/oscar/oscar.c:515 src/protocols/toc/toc.c:555
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
 #: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Déconnecté"
 
-#: src/protocols/oscar/oscar.c:527 src/protocols/toc/toc.c:805
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez été déconnecté du salon %s."
 
-#: src/protocols/oscar/oscar.c:540
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Les discussions sont inaccessibles pour l'instant."
 
-#: src/protocols/oscar/oscar.c:561 src/protocols/oscar/oscar.c:1888
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
 msgid "Buddy canceled transfer"
 msgstr "Transfert annulé par le contact"
 
-#: src/protocols/oscar/oscar.c:612 src/protocols/oscar/oscar.c:674
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Impossible de se connecter à l'hôte"
 
-#: src/protocols/oscar/oscar.c:620
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Mot de passe envoyé, en attente de réponse\n"
 
-#: src/protocols/oscar/oscar.c:655
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "Erreur interne de connexion\n"
 
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Impossible de se connecter à AIM"
 
-#: src/protocols/oscar/oscar.c:661
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Connexion : %s"
 
-#: src/protocols/oscar/oscar.c:743
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Déconnecté\n"
 
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:910
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Impossible de se connecter"
 
-#: src/protocols/oscar/oscar.c:770
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Connexion établie, cookie envoyé"
 
-#: src/protocols/oscar/oscar.c:811 src/protocols/toc/toc.c:503
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Pseudonyme ou mot de passe incorrect."
 
-#: src/protocols/oscar/oscar.c:816
+#. Suspended account
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Votre compte est actuellement suspendu"
 
-#: src/protocols/oscar/oscar.c:820
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#: src/protocols/oscar/oscar.c:824
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1552,23 +1575,24 @@
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."
 
-#: src/protocols/oscar/oscar.c:829
+#. client too old
+#: src/protocols/oscar/oscar.c:828
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La version du client que vous utilisez est trop ancienne. Veuillez la mettre "
 "à jour sur %s"
 
-#: src/protocols/oscar/oscar.c:834 src/protocols/toc/toc.c:586
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Echec de l'authentification"
 
-#: src/protocols/oscar/oscar.c:856
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Erreur interne"
 
-#: src/protocols/oscar/oscar.c:949 src/protocols/oscar/oscar.c:976
-#: src/protocols/oscar/oscar.c:1060
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -1577,36 +1601,36 @@
 "Vous risquez être déconnecté sous peu. Essayer d'utiliser TOC en attendant. "
 "Regardez %s pour plus d'informations."
 
-#: src/protocols/oscar/oscar.c:951 src/protocols/oscar/oscar.c:978
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim n'a pas réussi à récupérer un code de connexion AIM."
 
-#: src/protocols/oscar/oscar.c:1062
+#: src/protocols/oscar/oscar.c:1061
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Impossible de récupérer un code de connexion valide."
 
-#: src/protocols/oscar/oscar.c:1500 src/protocols/oscar/oscar.c:4502
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Connexion directe avec %s établie"
 
-#: src/protocols/oscar/oscar.c:1610
+#: src/protocols/oscar/oscar.c:1609
 msgid "Transfer timed out"
 msgstr "Le transfert est mort"
 
-#: src/protocols/oscar/oscar.c:1632
+#: src/protocols/oscar/oscar.c:1631
 msgid "Couldn't open listener to send file"
 msgstr "Impossible d'ouvrir la connexion d'écoute pour envoyer le fichier"
 
-#: src/protocols/oscar/oscar.c:1633
+#: src/protocols/oscar/oscar.c:1632
 msgid "File transfer aborted"
 msgstr "Transfert de fichier annulé"
 
-#: src/protocols/oscar/oscar.c:1832 src/protocols/oscar/oscar.c:1852
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
 msgid "(There was an error receiving this message)"
 msgstr "(Erreur pendant la réception du message)"
 
-#: src/protocols/oscar/oscar.c:2022
+#: src/protocols/oscar/oscar.c:2020
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -1616,7 +1640,7 @@
 "d'images. Votre adresse IP sera révélée et ceic peut être considéré comme un "
 "danger."
 
-#: src/protocols/oscar/oscar.c:2118
+#: src/protocols/oscar/oscar.c:2116
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason: %"
@@ -1625,15 +1649,15 @@
 "L'utilisateur %lu veut vous ajouter à sa liste de contacts pour la raison "
 "suivante : %s"
 
-#: src/protocols/oscar/oscar.c:2118 src/protocols/oscar/oscar.c:2129
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
 msgid "No reason given."
 msgstr "Pas de raison"
 
-#: src/protocols/oscar/oscar.c:2122
+#: src/protocols/oscar/oscar.c:2120
 msgid "Authorization Request"
 msgstr "Demande d'autorisation"
 
-#: src/protocols/oscar/oscar.c:2129
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1644,18 +1668,19 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2130
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr "Autorisation ICQ refusée"
 
-#: src/protocols/oscar/oscar.c:2136
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "L'utilisateur %lu a accepté votre requête de le rajouter à votre liste de "
 "contacts."
 
-#: src/protocols/oscar/oscar.c:2143
+#: src/protocols/oscar/oscar.c:2141
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -1668,7 +1693,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2151
+#: src/protocols/oscar/oscar.c:2149
 #, c-format
 msgid ""
 "You have received an ICQ email\n"
@@ -1689,74 +1714,75 @@
 "5=%s\n"
 "6=%s\n"
 
-#: src/protocols/oscar/oscar.c:2171
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "L'utilisateur ICQ %lu vous a envoyé un contact : %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2175
+#: src/protocols/oscar/oscar.c:2174
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "Voulez vous l'ajouter à votre liste de contacts ?"
 
 #: src/protocols/oscar/oscar.c:2254
-#, c-format
-msgid "You missed %d message from %s because it was invalid."
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
 msgstr "Vous avez raté %d message de %s car le message était invalide."
 
 #: src/protocols/oscar/oscar.c:2255
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
 msgstr "Vous avez raté %d messages de %s car ils étaient invalides."
 
 #: src/protocols/oscar/oscar.c:2264
-#, c-format
-msgid "You missed %d message from %s because it was too large."
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
 msgstr "Vous avez raté %d message de %s car le message était trop gros."
 
 #: src/protocols/oscar/oscar.c:2265
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
 msgstr "Vous avez raté %d messages de %s car ils étaient trop gros."
 
 #: src/protocols/oscar/oscar.c:2274
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
+#, fuzzy, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
 msgstr "Vous avez raté %d message de %s car le quota limite a été dépassé."
 
 #: src/protocols/oscar/oscar.c:2275
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr "Vous avez raté %d messages de %s car le quota limite a été dépassé."
 
 #: src/protocols/oscar/oscar.c:2284
-#, c-format
-msgid "You missed %d message from %s because he/she was too evil."
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
 msgstr "Vous avez raté %d message de %s car il a été trop méchant(?)."
 
 #: src/protocols/oscar/oscar.c:2285
-#, c-format
-msgid "You missed %d messages from %s because he/she was too evil."
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
 msgstr "Vous avez raté %d message de %s car il a été trop méchant(?)."
 
 #: src/protocols/oscar/oscar.c:2294
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
 msgstr "Vous avez raté %d message de %s car vous avez été trop méchant(?)."
 
 #: src/protocols/oscar/oscar.c:2295
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr "Vous avez raté %d messages de %s car vous avez été trop méchant(?)."
 
 #: src/protocols/oscar/oscar.c:2303
-#, c-format
-msgid "You missed %d message from %s for an unknown reason."
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Vous avez raté %d message de %s pour des raisons inconnues."
 
 #: src/protocols/oscar/oscar.c:2304
-#, c-format
-msgid "You missed %d messages from %s for an unknown reason."
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Vous avez raté %d messages de %s pour des raisons inconnues."
 
 #: src/protocols/oscar/oscar.c:2342
@@ -1788,6 +1814,7 @@
 msgid "No reason was given."
 msgstr "Pas de raison"
 
+#. Data is assumed to be the destination sn.
 #: src/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "Your message to %s did not get sent:"
@@ -1798,68 +1825,68 @@
 msgid "User information for %s unavailable:"
 msgstr "Les informations de %s ne sont pas disponibles :"
 
-#: src/protocols/oscar/oscar.c:2558 src/buddy.c:2177
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Icone du contact"
 
-#: src/protocols/oscar/oscar.c:2561 src/buddy.c:2180
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Voix"
 
-#: src/protocols/oscar/oscar.c:2564 src/buddy.c:2183
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "Transfert d'image"
 
-#: src/protocols/oscar/oscar.c:2567 src/buddy.c:500 src/buddy.c:2186
-#: src/buddy.c:2531
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Discussion"
 
-#: src/protocols/oscar/oscar.c:2570 src/buddy.c:2189
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Recevoir un fichier"
 
-#: src/protocols/oscar/oscar.c:2577 src/buddy.c:2196
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Jeux"
 
-#: src/protocols/oscar/oscar.c:2580 src/buddy.c:2199
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Bourse"
 
-#: src/protocols/oscar/oscar.c:2583 src/buddy.c:2202
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Envoyer sa liste de contacts"
 
-#: src/protocols/oscar/oscar.c:2586 src/buddy.c:2205
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "Bug d'EveryBuddy"
 
-#: src/protocols/oscar/oscar.c:2589 src/buddy.c:2208
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "Utilisateur AP"
 
-#: src/protocols/oscar/oscar.c:2592 src/buddy.c:2211
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "RTF ICQ"
 
-#: src/protocols/oscar/oscar.c:2595 src/buddy.c:2214
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nihiliste"
 
-#: src/protocols/oscar/oscar.c:2598 src/buddy.c:2217
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "Relai de serveur ICQ"
 
-#: src/protocols/oscar/oscar.c:2601 src/buddy.c:2220
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ inconnu"
 
-#: src/protocols/oscar/oscar.c:2604 src/buddy.c:2223
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Cryptage Trillian"
 
-#: src/protocols/oscar/oscar.c:2656
+#: src/protocols/oscar/oscar.c:2655
 msgid ""
 "<I>Unable to display information because it was sent in an unknown encoding."
 "</I>"
@@ -1867,22 +1894,7 @@
 "<I>Impossible d'afficher les informations à cause d'un codage de caractères "
 "inconnu</I>"
 
-#: src/protocols/oscar/oscar.c:2663
-msgid ""
-"<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>Légende :</I><br><br> <IMG SRC=\"free_icon."
-"gif \"> : Utilisateur normal d'AIM<br> <IMG \"SRC=\"aol_icon.gif\"> : "
-"Utilisateur d'AOL <br> <IMG SRC=\"dt_icon.gif\"> : Utilisateur d'AIM "
-"(évaluation)<br> <IMG SRC=\"admin_icon.gif \"> : Administrateur <br> <IMG "
-"SRC=\"ab_icon.gif\"> : Agent interactif ActiveBuddy<br> <IMG SRC="
-"\"wireless_icon.gif\"> : Utilisateur d'appareil Portable<br>"
-
-#: src/protocols/oscar/oscar.c:2691
+#: src/protocols/oscar/oscar.c:2677
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -1895,27 +1907,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:2723
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>L'utilisateur n'a pas de message d'absence</i>"
 
-#: src/protocols/oscar/oscar.c:2735
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Possibilités du client: "
 
-#: src/protocols/oscar/oscar.c:2743
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Pas d'informations fournies</i>"
 
-#: src/protocols/oscar/oscar.c:2768
+#: src/protocols/oscar/oscar.c:2751
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'être coupée"
 
-#: src/protocols/oscar/oscar.c:3026
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr "Erreur de limite de quota"
 
-#: src/protocols/oscar/oscar.c:3027
+#: src/protocols/oscar/oscar.c:3011
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -1923,15 +1935,15 @@
 "Le dernier message n'a pas été envoyé car vous avez depassé le quota limite. "
 "Veuillez attendre 10 secondes et réessayer."
 
-#: src/protocols/oscar/oscar.c:3478
+#: src/protocols/oscar/oscar.c:3463
 msgid "Account Confirmation Requested"
 msgstr "Confirmation de compte demandée"
 
-#: src/protocols/oscar/oscar.c:3505
+#: src/protocols/oscar/oscar.c:3490
 msgid "Error Changing Account Info"
 msgstr "Erreur en changeant les informations du compte"
 
-#: src/protocols/oscar/oscar.c:3508
+#: src/protocols/oscar/oscar.c:3493
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1940,7 +1952,7 @@
 "Erreur 0x%04x : Impossible d'afficher le nom parce que la version demandée "
 "diffère de l'originale."
 
-#: src/protocols/oscar/oscar.c:3511
+#: src/protocols/oscar/oscar.c:3496
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1949,7 +1961,7 @@
 "Erreur 0x%04x : Impossible d'afficher le nom parce que la version demandée "
 "se finit par une espace."
 
-#: src/protocols/oscar/oscar.c:3514
+#: src/protocols/oscar/oscar.c:3499
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1958,7 +1970,7 @@
 "Erreur 0x%04x : Impossible d'afficher le nom parce que la version demandée "
 "est trop longue"
 
-#: src/protocols/oscar/oscar.c:3517
+#: src/protocols/oscar/oscar.c:3502
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -1967,7 +1979,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "une requête en attente pour ce nom."
 
-#: src/protocols/oscar/oscar.c:3520
+#: src/protocols/oscar/oscar.c:3505
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -1976,7 +1988,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "trop de noms associés à cette adresse."
 
-#: src/protocols/oscar/oscar.c:3523
+#: src/protocols/oscar/oscar.c:3508
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -1985,12 +1997,12 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'elle "
 "est invalide."
 
-#: src/protocols/oscar/oscar.c:3526
+#: src/protocols/oscar/oscar.c:3511
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erreur 0x%04x : Erreur inconnue."
 
-#: src/protocols/oscar/oscar.c:3536
+#: src/protocols/oscar/oscar.c:3521
 #, c-format
 msgid ""
 "Your screen name is currently formated as follows:\n"
@@ -1999,20 +2011,20 @@
 "Votre nom est actuellement affiché comme cela :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3537 src/protocols/oscar/oscar.c:3543
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
 msgid "Account Info"
 msgstr "Infos du compte"
 
-#: src/protocols/oscar/oscar.c:3542
+#: src/protocols/oscar/oscar.c:3527
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "L'adresse électronique de %s est %s"
 
-#: src/protocols/oscar/oscar.c:3735
+#: src/protocols/oscar/oscar.c:3720
 msgid "Unable to set AIM profile."
 msgstr "Impossible d'envoyer le profil AIM"
 
-#: src/protocols/oscar/oscar.c:3736
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -2022,7 +2034,7 @@
 "connexion. Le profil n'a pas été changé. Réessayez une fois la connexion "
 "complète."
 
-#: src/protocols/oscar/oscar.c:3742
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
@@ -2031,11 +2043,11 @@
 "La taille maximale (%d caractères) a été dépassée. Le profil a été tronqué "
 "lors de la mise à jour."
 
-#: src/protocols/oscar/oscar.c:3779
+#: src/protocols/oscar/oscar.c:3764
 msgid "Unable to set AIM away message."
 msgstr "Impossible de mettre le message d'absence AIM"
 
-#: src/protocols/oscar/oscar.c:3780
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -2045,7 +2057,7 @@
 "connexion. Vous êtes toujours \"En ligne.\" Réessayez une fois la connexion "
 "complète."
 
-#: src/protocols/oscar/oscar.c:3796
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
@@ -2054,7 +2066,7 @@
 "La taille maximale (%d caractères) a été dépassée. Le message d'absence a "
 "été tronqué lors de la mise à jour."
 
-#: src/protocols/oscar/oscar.c:4183
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -2064,20 +2076,20 @@
 "%d. Jusqu'à ce que vous soyez en dessous de la limite, certains amis ne "
 "s'afficheront pas online"
 
-#: src/protocols/oscar/oscar.c:4204 src/protocols/toc/toc.c:1148
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Echange:"
 
-#: src/protocols/oscar/oscar.c:4625
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Impossible d'ouvrir une connexion directe"
 
-#: src/protocols/oscar/oscar.c:4635
+#: src/protocols/oscar/oscar.c:4620
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Connexion directe avec %s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: src/protocols/oscar/oscar.c:4621
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -2085,7 +2097,7 @@
 "Cela révèle votre adresse IP et peut être considéré comme un danger. Voulez-"
 "vous continuer ?"
 
-#: src/protocols/oscar/oscar.c:4650
+#: src/protocols/oscar/oscar.c:4635
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
@@ -2094,7 +2106,7 @@
 "<B>UIN :</B> %s<BR><B>Status :</B> %s<BR><HR><BR><I>Le client distant ne "
 "supporte pas l'envoi de messages de status.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4657
+#: src/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
@@ -2103,15 +2115,15 @@
 "<B>UIN :</B> %s<BR><B>Status :</B> %s<BR><HR><BR><I>L'utilisateur n'a pas de "
 "message de status.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4682
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "Obtenir le status"
 
-#: src/protocols/oscar/oscar.c:4695
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Connexion directe"
 
-#: src/protocols/oscar/oscar.c:4709
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Obtenir les possibilités"
 
@@ -2353,7 +2365,7 @@
 msgid "About Gaim v%s"
 msgstr "À propos de Gaim v%s"
 
-#: src/about.c:111
+#: src/about.c:112
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -2363,37 +2375,37 @@
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr et Gadu-Gadu. Il est écrit en Gtk+ "
 "et est sous la licence GPL. <BR><BR>"
 
-#: src/about.c:121
+#: src/about.c:122
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC :</FONT> #gaim sur irc.freenode.net<BR><BR>"
 
-#: src/about.c:125
+#: src/about.c:126
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Programmeurs actifs :</FONT><BR>"
 
-#: src/about.c:127
+#: src/about.c:128
 msgid ""
 "  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
 "A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
 "\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
 msgstr ""
 "  Rob Flynn (mainteneur) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
-"A>&gt;<BR>  Sean Egan (programmeur) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
-"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
-
-#: src/about.c:135
+"A>&gt;<BR>  Sean Egan (programmeur) &lt;<A HREF=\"mailto:bj91704@binghamton."
+"edu\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+
+#: src/about.c:136
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Patcheurs fous :</FONT><BR>"
 
-#: src/about.c:143
+#: src/about.c:144
 msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Version Win32 :</FONT><BR>"
 
-#: src/about.c:150
+#: src/about.c:151
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Programmeurs retraités :</FONT><BR>"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid ""
 "  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
 "\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
@@ -2403,8 +2415,8 @@
 "\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (auteur initial) &lt;<A "
 "HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
 
-#: src/about.c:173 src/dialogs.c:1523 src/dialogs.c:4180 src/prpl.c:493
-#: src/prpl.c:740 src/server.c:1160
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
 msgid "Close"
 msgstr "Fermer"
 
@@ -2440,22 +2452,22 @@
 msgid "Set All Away"
 msgstr "Absent partout"
 
-#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1107
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Groupe"
 
 #: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
-#: src/buddy_chat.c:869
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "Message"
 
-#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:886 src/buddy_chat.c:1597
-#: src/conversation.c:3072
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1099 src/dialogs.c:3743
-#: src/dialogs.c:3756
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
@@ -2551,7 +2563,8 @@
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Liste de contacts"
 
-#: src/buddy.c:2628 src/conversation.c:2196
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Fichier"
 
@@ -2643,184 +2656,184 @@
 msgid "Edit Buddies"
 msgstr "Contacts"
 
-#: src/buddy_chat.c:275
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Joindre une discussion"
 
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Joindre une discussion en tant que :"
 
-#: src/buddy_chat.c:313
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Joindre"
 
-#: src/buddy_chat.c:402 src/buddy_chat.c:405 src/buddy_chat.c:1452
-#: src/buddy_chat.c:1547
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/buddy_chat.c:421 src/dialogs.c:1711 src/dialogs.c:3733
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Contact"
 
-#: src/buddy_chat.c:426
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Message"
 
-#: src/buddy_chat.c:463
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Inviter le contact dans une discussion"
 
-#: src/buddy_chat.c:876
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Ne plus ignorer"
 
-#: src/buddy_chat.c:878 src/prefs.c:280
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: src/buddy_chat.c:954 src/buddy_chat.c:1093 src/buddy_chat.c:1659
-#: src/buddy_chat.c:1692
+#. don't remove them from ignored in case they re-enter
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s dans le salon"
 
-#: src/buddy_chat.c:963
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s est entré dans le salon."
 
-#: src/buddy_chat.c:965
+#: src/buddy_chat.c:959
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] est entré dans le salon."
 
-#: src/buddy_chat.c:1044
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est désormais connu sous le nom de %s"
 
-#: src/buddy_chat.c:1102
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a quitté le salon (%s)."
 
-#: src/buddy_chat.c:1104
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s a quitté le salon."
 
-#: src/buddy_chat.c:1210
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Groupes de discussion"
 
-#: src/buddy_chat.c:1290
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Sujet :"
 
-#: src/buddy_chat.c:1329
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "Personne dans ce salon"
 
-#: src/buddy_chat.c:1436 src/buddy_chat.c:1546 src/buddy_chat.c:1579
-#: src/conversation.c:3031
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/buddy_chat.c:1594 src/conversation.c:3063
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "Donner un avertissement"
 
-#: src/buddy_chat.c:1600 src/conversation.c:3082
+#: src/buddy_chat.c:1592 src/conversation.c:2925
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/conversation.c:511
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Sauver la conversation"
-
-#: src/conversation.c:559
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Insérer image"
 
-#: src/conversation.c:1421
+#: src/conversation.c:1305
 msgid "Unable to send message.  The message is too large"
 msgstr "Impossible d'envoyer le message : trop gros"
 
-#: src/conversation.c:1425
+#: src/conversation.c:1309
 msgid "Unable to send message"
 msgstr "Impossible d'envoyer le message"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2043
 msgid "_Save Conversation"
 msgstr "_Sauver la conversation"
 
-#: src/conversation.c:2202
+#: src/conversation.c:2045
 msgid "View _History"
 msgstr "Voir l'_historique"
 
-#: src/conversation.c:2209
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
 msgid "Insert _URL"
 msgstr "Insérer _un lien"
 
-#: src/conversation.c:2210
+#: src/conversation.c:2053
 msgid "Insert _Image"
 msgstr "Insérer une _image"
 
-#: src/conversation.c:2215
+#: src/conversation.c:2058
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2063
 msgid "Options"
 msgstr "Options"
 
-#: src/conversation.c:2225
+#. Logging
+#: src/conversation.c:2068
 msgid "Enable _Logging"
 msgstr "Activer l'_archivage"
 
-#: src/conversation.c:2243
+#: src/conversation.c:2086
 msgid "Enable _Sounds"
 msgstr "Activer les _sons"
 
-#: src/conversation.c:2755 src/conversation.c:2757 src/conversation.c:2768
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
 msgid " [TYPING]"
 msgstr " [en train d'écrire]"
 
-#: src/conversation.c:2758 src/conversation.c:2760 src/conversation.c:2772
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
 msgid " [TYPED]"
 msgstr " [a fini d'écrire]"
 
-#: src/conversation.c:2846
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversations"
 
-#: src/conversation.c:2959
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Envoyer le message en tant que: "
 
-#: src/conversation.c:3583
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Sauvegarder l'icone"
 
-#: src/conversation.c:3617
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Désactiver l'animation"
 
-#: src/conversation.c:3624
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Activer l'animation"
 
-#: src/conversation.c:3630
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Cacher l'icone"
 
-#: src/conversation.c:3636
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Sauvegarder l'icone sous..."
 
-#: src/dialogs.c:424
+#: src/dialogs.c:422
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -2834,308 +2847,324 @@
 "Ceci augmentera le niveau d'avertissement de %s. Cet utilisateur sera plus "
 "sévèrement limité pour sa fréquence d'envoi de messages.\n"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:431
 msgid "Warn _anonymously?"
 msgstr "Donner un _avertissement anonyme ?"
 
-#: src/dialogs.c:440
+#: src/dialogs.c:438
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Les avertissements anonymes sont moins durs.</b>"
 
-#: src/dialogs.c:460
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Suppression de '%s' de la liste de contacts\n"
 
-#: src/dialogs.c:708
+#: src/dialogs.c:706
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "Nom du destinataire pour le message\n"
 
-#: src/dialogs.c:724 src/dialogs.c:818
+#: src/dialogs.c:722 src/dialogs.c:816
 msgid "_Screenname:"
 msgstr "P_seudonyme :"
 
-#: src/dialogs.c:737 src/dialogs.c:831
+#: src/dialogs.c:735 src/dialogs.c:829
 msgid "_Account:"
 msgstr "_Compte :"
 
-#: src/dialogs.c:806
+#: src/dialogs.c:804
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "Nom de l'utilisateur à afficher\n"
 
-#: src/dialogs.c:972
+#: src/dialogs.c:956
+#, fuzzy
+msgid "Gaim - Add Group"
+msgstr "Gaim - Ajouter un contact"
+
+#: src/dialogs.c:973
 msgid "Please enter the name of the group to be added.\n"
 msgstr "Nom du groupe à ajouter\n"
 
-#: src/dialogs.c:981
+#: src/dialogs.c:982 src/dialogs.c:4356
 msgid "_Group:"
 msgstr "_Groupe :"
 
-#: src/dialogs.c:1068
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ajouter un contact"
 
-#: src/dialogs.c:1079
-msgid "Add Buddy"
-msgstr "Ajouter un contact"
-
-#: src/dialogs.c:1089
-msgid "Contact"
-msgstr "Contact"
-
-#: src/dialogs.c:1115
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Pseudonyme :"
+
+#. Set up stuff for the account box
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Ajouter à"
 
-#: src/dialogs.c:1413
+#: src/dialogs.c:1468
 msgid "Gaim - Privacy"
 msgstr "Gaim - Filtres"
 
-#: src/dialogs.c:1424
-msgid "Privacy settings are affected immediately."
+#: src/dialogs.c:1479
+#, fuzzy
+msgid "Changes to privacy settings take effect immediately."
 msgstr "Les filtres sont utilisés immédiatement."
 
-#: src/dialogs.c:1432
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Mettre en place un filtre pour:"
 
-#: src/dialogs.c:1451
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Permettre à tous les utiliseurs de me contacter"
 
-#: src/dialogs.c:1452
-msgid "Allow only the users below"
-msgstr "Autoriser les utiliseurs ci-dessous"
-
-#: src/dialogs.c:1453
+#: src/dialogs.c:1509
 msgid "Allow only users on my buddy list"
 msgstr "Autoriser les utiliseurs de ma liste de contacts"
 
-#: src/dialogs.c:1455
-msgid "Allow List"
-msgstr "List de permission"
-
-#: src/dialogs.c:1486
+#: src/dialogs.c:1513
+msgid "Allow only the users below"
+msgstr "Autoriser les utiliseurs ci-dessous"
+
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Interdire à tous"
 
-#: src/dialogs.c:1487
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Bloquer les utilisateurs ci-dessous"
 
-#: src/dialogs.c:1489
-msgid "Block List"
-msgstr "Liste d'interdiction"
-
-#: src/dialogs.c:1542
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Choisissez un contact pour la création d'une alerte"
 
-#: src/dialogs.c:1681
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nouvelle alerte"
 
-#: src/dialogs.c:1691
+#. <pounce type="who">
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Alerter qui"
 
-#: src/dialogs.c:1702
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Compte"
 
-#: src/dialogs.c:1728
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "Alerter quand"
 
-#: src/dialogs.c:1738
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Alerter à la connexion"
 
-#: src/dialogs.c:1747
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Alerter au retour d'absence"
 
-#: src/dialogs.c:1756
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Alerter lorsque le contact redevient actif"
 
-#: src/dialogs.c:1765
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "Alerter quand le contact vous écrit"
 
-#: src/dialogs.c:1775
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Action de l'alerte"
 
-#: src/dialogs.c:1786
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "Ouvrir la fenêtre de message"
 
-#: src/dialogs.c:1795
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Faire apparaître la notification"
 
-#: src/dialogs.c:1804 src/prefs.c:296
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Envoyer un message"
 
-#: src/dialogs.c:1825
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Exécuter une commande lors de l'alerte"
 
-#: src/dialogs.c:1847
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Jouer un son lors de l'alerte"
 
-#: src/dialogs.c:1869
+#. </pounce type="action">
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Réutiliser cette alerte après activation"
 
-#: src/dialogs.c:1889
+#: src/dialogs.c:1967
 msgid "_Save"
 msgstr "_Sauvegarder"
 
-#: src/dialogs.c:1895
+#: src/dialogs.c:1973
 msgid "C_ancel"
 msgstr "_Annuler"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Donner vos informations personnelles"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Informations de l'annuaire"
 
-#: src/dialogs.c:1996
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Autoriser les recherches sur le web de vos informations"
 
-#: src/dialogs.c:1999 src/dialogs.c:2700
+#. Line 1
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Prénom"
 
-#: src/dialogs.c:2010 src/dialogs.c:2712
+#. Line 2
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Deuxième prénom"
 
-#: src/dialogs.c:2022 src/dialogs.c:2724
+#. Line 3
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/dialogs.c:2033 src/dialogs.c:2736
+#. Line 4
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Nom de jeune fille"
 
-#: src/dialogs.c:2055 src/dialogs.c:2759
+#. Line 6
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Etat"
 
-#: src/dialogs.c:2098 src/dialogs.c:2286 src/dialogs.c:3547 src/dialogs.c:4189
-#: src/dialogs.c:5151
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Les nouveaux mots de passe différent"
 
-#: src/dialogs.c:2125
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Remplissez tous les champs"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Changement de mot de passe"
 
-#: src/dialogs.c:2179
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Mot de passe courant"
 
-#: src/dialogs.c:2193
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 
-#: src/dialogs.c:2207
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: src/dialogs.c:2221 src/dialogs.c:2379 src/dialogs.c:2681 src/dialogs.c:2855
-#: src/dialogs.c:2925 src/dialogs.c:4301 src/dialogs.c:4406
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:2249
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Changer les informations utilisateur"
 
-#: src/dialogs.c:2364
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Voici les résultats de votre recherche: "
 
-#: src/dialogs.c:2497
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Autoriser"
 
-#: src/dialogs.c:2537
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ajouter autorisation"
 
-#: src/dialogs.c:2539
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ajouter refus"
 
-#: src/dialogs.c:2598
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Enregistrer la conversation"
 
-#: src/dialogs.c:2676 src/dialogs.c:2837
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Rechercher un contact"
 
-#: src/dialogs.c:2804
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - trouver un Contact d'après ses infos"
 
-#: src/dialogs.c:2831
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Trouver un contact d'après son email"
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:2997
 msgid "Insert Link"
 msgstr "Insérer un lien"
 
-#: src/dialogs.c:2971
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Ajouter une adresse internet"
 
-#: src/dialogs.c:3074 src/dialogs.c:3094
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Changer la couleur du texte"
 
-#: src/dialogs.c:3126 src/dialogs.c:3146
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Changer la couleur du fond"
 
-#: src/dialogs.c:3221 src/dialogs.c:3245
+#: src/dialogs.c:3284 src/dialogs.c:3308
 msgid "Select Font"
 msgstr "Changer la police"
 
-#: src/dialogs.c:3322
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importer dans:"
 
-#: src/dialogs.c:3346
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importer la liste de contact"
 
-#: src/dialogs.c:3407
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3470
 msgid "You cannot save an away message with a blank title"
 msgstr "Vous ne pouvez créer un message d'absence avec un titre vide."
 
-#: src/dialogs.c:3408
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
@@ -3143,97 +3172,101 @@
 "Donnez un titre au message ou cliquez \"Utiliser\" pour utiliser ce message "
 "sans le sauver."
 
-#: src/dialogs.c:3415
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "Vous ne pouvez créer un message d'absence vide"
 
-#: src/dialogs.c:3478
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Nouveau message d'absence"
 
-#: src/dialogs.c:3487
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Nouveau message d'absence"
 
-#: src/dialogs.c:3500
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Titre : "
 
-#: src/dialogs.c:3551
+#: src/dialogs.c:3614
 msgid "Save & Use"
 msgstr "Sauvegarder et utiliser"
 
-#: src/dialogs.c:3555
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/dialogs.c:3689
+#. show everything
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Souriez !"
 
-#: src/dialogs.c:3778
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Donner un alias"
 
-#: src/dialogs.c:3816 src/dialogs.c:3823
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Impossible de parler à %s"
 
-#: src/dialogs.c:3847
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Sauver les fichiers de log"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3940
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Impossible de supprimer %s"
 
-#: src/dialogs.c:3904
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Effacer les logs ?"
 
-#: src/dialogs.c:3919
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "Ok"
 
-#: src/dialogs.c:4100
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Date"
 
-#: src/dialogs.c:4163
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Conversation"
 
-#: src/dialogs.c:4184
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/dialogs.c:4266
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Renommer groupe"
 
-#: src/dialogs.c:4275
-msgid "Rename Group"
-msgstr "Renommer un groupe"
-
-#: src/dialogs.c:4282 src/dialogs.c:4387
-msgid "New name:"
-msgstr "Nouveau nom :"
-
-#: src/dialogs.c:4371
+#: src/dialogs.c:4347
+#, fuzzy
+msgid "Please enter a new name for the selected group.\n"
+msgstr "Nom du groupe à ajouter\n"
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Renommer un contact"
 
-#: src/dialogs.c:4380
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Renommer un contact"
 
-#: src/dialogs.c:4464
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "Nouveau nom :"
+
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Selectionnez un script perl"
 
-#: src/gaimrc.c:1347
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Impossible d'ouvrir le fichier de configuration %s"
@@ -3429,6 +3462,8 @@
 msgid "Interface Options"
 msgstr "Interface"
 
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
 #: src/prefs.c:183
 msgid "Show _debug window"
 msgstr "Afficher la fenêtre de _debug"
@@ -3765,6 +3800,7 @@
 msgid "Pa_ssword"
 msgstr "_Mot de passe"
 
+#. Registered default browser is used by Windows
 #: src/prefs.c:577
 msgid "Browser Selection"
 msgstr "Navigateur"
@@ -4074,7 +4110,7 @@
 msgid "Gaim - Preferences"
 msgstr "Gaim - Préférences"
 
-#: src/prefs.c:1566
+#: src/prefs.c:1565
 msgid "Gaim - Debug Window"
 msgstr "Gaim - Fenêtre de debug"
 
@@ -4149,24 +4185,24 @@
 msgid "Please enter your password"
 msgstr "Entrez votre mot de passe"
 
-#: src/server.c:649
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d messages)"
 
-#: src/server.c:655
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:967
+#: src/server.c:966
 msgid "Yes"
 msgstr "Oui"
 
-#: src/server.c:968
+#: src/server.c:967
 msgid "No"
 msgstr "Non"
 
-#: src/server.c:1164
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Plus d'informations"
 
@@ -4210,3 +4246,34 @@
 msgid "Someone says your name in chat"
 msgstr "Quelqu'un dit votre nom dans la discussion"
 
+#~ msgid ""
+#~ "<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>Légende :</I><br><br> <IMG SRC=\"free_icon."
+#~ "gif \"> : Utilisateur normal d'AIM<br> <IMG \"SRC=\"aol_icon.gif\"> : "
+#~ "Utilisateur d'AOL <br> <IMG SRC=\"dt_icon.gif\"> : Utilisateur d'AIM "
+#~ "(évaluation)<br> <IMG SRC=\"admin_icon.gif \"> : Administrateur <br> <IMG "
+#~ "SRC=\"ab_icon.gif\"> : Agent interactif ActiveBuddy<br> <IMG SRC="
+#~ "\"wireless_icon.gif\"> : Utilisateur d'appareil Portable<br>"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Sauver la conversation"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Ajouter un contact"
+
+#~ msgid "Contact"
+#~ msgstr "Contact"
+
+#~ msgid "Allow List"
+#~ msgstr "List de permission"
+
+#~ msgid "Block List"
+#~ msgstr "Liste d'interdiction"
+
+#~ msgid "Rename Group"
+#~ msgstr "Renommer un groupe"
--- a/po/hu.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/hu.po	Sun Jan 05 23:21:50 2003 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.60\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\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"
@@ -13,357 +13,530 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "Tvol"
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "Vissza"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+#, fuzzy
+msgid "Auto-login"
+msgstr "Automatikus bejelentkezs"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "Kijelentkezs"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Hangok"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "Fikok"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "Preferencik"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "Gaim nvjegy"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Kilp"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - Hangok belltsa"
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "Buddy Ikon"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Csevegs partnerrel"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 #, fuzzy
 msgid "Gaim Chat"
 msgstr "Gaim - Csevegs"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr "Bezr"
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 #, fuzzy
 msgid "Chat Rooms"
 msgstr "Csevegs belltsai"
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Hozzad"
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Elvtolt"
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr ""
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr ""
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr ""
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr ""
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr ""
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr ""
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 #, fuzzy
 msgid "(No"
 msgstr "Nem"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 #, fuzzy
 msgid "Change"
 msgstr "Csatorna:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "Nem sikerl rni a fjlba %s ."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "%s bejelentkezett."
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "IM ablak"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "Csoportos cseveg ablak"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "Elugr figyelmeztets"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "Elugr figyelmeztets"
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "Nem sikerl kapcsoldni"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "Prba"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "Minden trsalgs megjelentse egy ablakban"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Elrhet"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr "Elrhet csak bartoknak"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr "Tvol"
-
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr "Tvol csak bartoknak"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 msgid "Invisible"
 msgstr "Lthatatlan"
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "Lthatatlan csak bartoknak"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "Nem elrhet"
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "A gpnevet nem sikerlt megllaptani"
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "Nem sikerl a kiszolglhoz kapcsoldni"
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "rvnytelen vlasz a kiszolgltl"
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "Hiba a foglalat olvassakor."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 msgid "Error while writing to socket."
 msgstr "Hiba a foglalatra irskor."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 msgid "Authentication failed."
 msgstr "Azonosts sikertelen"
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "Ismeretlen hiba kd"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "llapot: %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr "Becenv:"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu felhasznl"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "Nem tud kapcsoldni"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "Foglalatot nem lehet olvasni"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "Nem sikerl kapcsoldni"
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "Adat olvassa"
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "??? kzfogs"
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr "Kiszolgl kulcs olvassa"
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "Kulcs csere"
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "Kritikus hiba a GG program knyvtrban\n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "Sikertelen a kiszolgl ping-etse"
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "Klds zenetknt"
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr "GG kiszolgl keresse"
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "rvnytelen a megadott Gadu-Gadu UIN"
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Kapcsolat a %s-hoz sikertelen"
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "Sikertelen a kiszolgl ping-etse"
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "Klds zenetknt"
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr "GG kiszolgl keresse"
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "rvnytelen a megadott Gadu-Gadu UIN"
+
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "rvnytelen Gadu-Gadu UIN-re prblsz meg zenetet kldeni."
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "Nem sikerl a keress eredmnyt lekrdezni"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu keres motor"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Aktv"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "igen"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "nem"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "Keresztnv"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "Vezetknv"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "Becenv"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "Szletett"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "Frfi/n"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Vros"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Nincs trolva partner lista a kiszolgln. Sajnlom!"
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Nem tudom a partner listt importlni a kiszolglrl"
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Partner lista sikeresen tovbbtva a kiszolglra"
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Nem sikerl a partner lista tovbbtsa a kiszolglra"
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Partner lista sikeresen trlve a kiszolglrl"
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Nem sikerl a partner lista trlse a kiszolglrl"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "Jelsz sikeresen megvltoztatva"
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Jelszt nem sikerlt megvltoztatni"
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "Nem tudom a partner listt importlni a kiszolglrl"
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "Nem sikerlt megnyitni a kzvetlen IM-et"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Foglalatot nem lehet olvasni"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "Knyvtr keresse"
 
@@ -371,358 +544,488 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Jelsz megvltoztatsa"
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "Partner lista importlsa a kiszolglrl"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "Partner lista exportlsa a kiszolglra"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "Partner lista trlse a kiszolglrl"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "Nem sikerl olvasni a fjlt %s."
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr "Becenv:"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu felhasznl"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "Mgsem"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "Elutast"
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "zenet kldse a kiszolgln keresztl"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Informcigyjts"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Gaim szerint"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCC csevegs a %s-vel bezrult"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "Kapcsolat megszakadt"
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s megvltoztatta a tmt a kvetkezre: %s</B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "Kiszolgl kulcs olvassa"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "IRC hiba"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "Nincs ilyen becenv/csatorna"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "IRC hiba"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "Nincs ilyen kiszolgl"
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
 msgstr "Nincs becenv megadva"
 
-#: src/protocols/irc/irc.c:976
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 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 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "Kapcsoldva"
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Sikertelen rs"
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "Kizrtak a kvetkezrl %s: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "Kizr %s: %s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "Felhasznl adatai"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Elhagytad a kvetkezt csatornt %s"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "IRC terlet"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Csatorna:"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Jelsz:"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC csevegs"
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "Kiszolgl:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "Foglalatot nem lehet olvasni"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "Foglalatot nem lehet olvasni"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Elrhet"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr "Tvol a gptl"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr "Ne zavarj"
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber hiba"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Ismeretlen hiba kd"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, 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:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "Nincs ilyen felhasznl"
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Partnerek"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr "Azonosts"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "Ismeretlen bejelentkezsi hiba"
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Jelsz sikeresen megvltoztatva"
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "Kapcsolat megszakadt"
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Nem sikerl kapcsoldni"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "Kapcsoldva"
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "Azonostsi mdszer lekrdezse"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Kapcsolatfelvtel"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 msgid "Jabber Error"
 msgstr "Jabber hiba"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "Szoba:"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr "Kiszolgl:"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "Kezel:"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "Nem sikerl kapcsoldni"
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 #, fuzzy
 msgid "Chats"
 msgstr "Csevegs"
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Napl"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Tvol zenet lekrdezse"
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Elugr figyelmeztets"
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "Teljes nv"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "Csaldnv"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "Keresztnv"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "Becenv"
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Utca"
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "Tovbbi cm"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "Helysg"
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr "Rgi"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "Irnytszm"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Orszg"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "Telefonszm"
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "Szervezet neve"
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "Szervezeti egysg"
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Titulus"
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "Szletett"
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Lers"
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -730,397 +1033,601 @@
 "A kvetkez krdsek kzl csak azokra adj vlaszt, melyek nem rintenek "
 "knyelmetlenl."
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "Azonost"
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCard szerkesztse"
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "Kiszolgl regisztrci sikerlt!"
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "Ismeretlen regisztrcis hiba"
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "Felhasznli adatok"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 #, fuzzy
 msgid "Invalid User"
 msgstr "rvnytelen nv"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr ""
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 #, fuzzy
 msgid "Invalid Username"
 msgstr "rvnytelen nv"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 #, fuzzy
 msgid "Invalid Friendly Name"
 msgstr "rvnytelen nv"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 #, fuzzy
 msgid "Not on list"
 msgstr "Kapcsolat megszakadt"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 #, fuzzy
 msgid "Not logged in"
 msgstr "%s bejelentkezett."
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 #, fuzzy
 msgid "Internal server error"
 msgstr "Bels hiba"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 #, fuzzy
 msgid "File operation error"
 msgstr "bels kapcsolat hiba\n"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "komoly hiba a kapcsolatban\n"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 #, fuzzy
 msgid "Server busy"
 msgstr "Kiszolgl:"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 #, fuzzy
 msgid "Server unavailable"
 msgstr "Nem elrhet"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 #, fuzzy
 msgid "Database connect error"
 msgstr "bels kapcsolat hiba\n"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 #, fuzzy
 msgid "Error creating connection"
 msgstr "g003: Hiba a kapcsolat megnyitsa kzben.\n"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 #, fuzzy
 msgid "Too many sessions"
 msgstr "Tl sok egyezsg."
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Azonosts sikertelen"
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 #, fuzzy
 msgid "Not allowed when offline"
 msgstr "Nincs hang bejelentkezskor"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 #, fuzzy
 msgid "Unknown Error Code"
 msgstr "Ismeretlen hiba kd"
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim nem tudta az zenetet elkldeni"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "AOL hiba"
+
+#: src/protocols/msn/msn.c:1143
 #, 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:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Nem sikerl a kiszolglhoz kapcsoldni"
+
+#: src/protocols/msn/msn.c:1300
 #, 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:1179
+#: src/protocols/msn/msn.c:1401
 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:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Hiba a foglalat olvassakor."
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "Nem sikerl a kiszolglhoz kapcsoldni"
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "Nem sikerl a kiszolglhoz kapcsoldni"
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Protokol esemnyek"
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "Nem sikerlt megnyitni a kzvetlen IM-et"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "Nem sikerlt az AIM-re bejelentkezni"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "zenetet nem lehet elkldeni: tl nagy"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Foglalatot nem lehet olvasni"
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 #, fuzzy
 msgid "Password sent"
 msgstr "Jelsz: "
 
-#: src/protocols/msn/msn.c:1752
-#, fuzzy
-msgid "Unable to write to server"
-msgstr "Nem sikerl a kiszolglhoz kapcsoldni"
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "Sikertelen rs"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "zenetet nem lehet elkldeni: tl nagy"
+
+#: src/protocols/msn/msn.c:1974
 #, fuzzy
 msgid "Synching with server"
 msgstr "Regisztrci a kiszolglval"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 #, fuzzy
 msgid "Busy"
 msgstr "Partner"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 #, fuzzy
 msgid "Hidden"
 msgstr "Ikon elrejtse"
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+msgid "Be right back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2430
+msgid "Away from the computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2432
+msgid "On the phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2434
+msgid "Out to lunch"
+msgstr ""
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr "Inaktv: "
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "Fjl kldse"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Vezetknv"
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Kperny neve: "
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr "rvnytelen nv"
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Melyik csoporthoz kapcsoldsz"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "rvnytelen nv"
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "rvnytelen nv"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Nem elrhet"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Szolgltats tmenetileg nem elrhet"
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Kzvetlen IM %s-(val/vel) bezrult"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Kzvetlen IM %s-(val/vel) megszakadt"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "hiba a kapcsolatban\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "komoly hiba a kapcsolatban\n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Lekapcsoldva"
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Kilptl a kvetkez cseveg szobbl %s."
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Csevegs jelenleg nem elrhet"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Nem sikerlt a tvoli gphez kapcsoldni"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Jelsz elkldve, vlaszra vrok\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "bels kapcsolat hiba\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Nem sikerlt az AIM-re bejelentkezni"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Bejelentkezve: %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Kijelentkezve.\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Nem sikerlt kapcsoldni"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Kapcsolat ltrejtt, cookie elkldve"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Hibs becenv vagy jelsz."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Fik jelenleg felfggesztve."
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "Szolgltats tmenetileg nem elrhet."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1129,46 +1636,83 @@
 "folytatod,mg tbbet kell majd vrnod."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Az gyfl program verzja rgi. Krlek frisstsd"
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Azonosts megszakadt"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Bels hiba"
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim nem tudta az zenetet elkldeni"
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim nem tudta az zenetet elkldeni"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Kzvetlen IM kapcsolat %s-(val/vel) ltrejtt"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+msgid "Transfer timed out"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "Nem lehet a konfigurcis fjlt %s megnyitni."
+
+#: src/protocols/oscar/oscar.c:1632
+msgid "File transfer aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr "%s felhasznl szeretne tged a partnerei kzz felvenni."
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+msgid "No reason given."
+msgstr "Nincs magyarzat."
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Gaim - ICQ azonosts elutastva"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1178,234 +1722,266 @@
 "%lu felhasznl elutastotta a krsed a kvetkez magyarzattal:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-msgid "No reason given."
-msgstr "Nincs magyarzat."
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 #, fuzzy
 msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ azonosts elutastva"
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, 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:1587
+#: src/protocols/oscar/oscar.c:2141
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
 #, c-format
-msgid "You missed %d message from %s because it was invalid."
+msgid ""
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
+#, c-format
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"Fel kvnod venni ezt a partnert a listdra?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
 msgstr "Nem kaptl meg %d zenetet %s-tl mert rvnytelen volt."
 
-#: src/protocols/oscar/oscar.c:1588
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
 msgstr "Nem kaptl meg %d zeneteket %s-tl mert rvnytelenek voltak."
 
-#: src/protocols/oscar/oscar.c:1597
-#, c-format
-msgid "You missed %d message from %s because it was too large."
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu 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:1598
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu 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: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:1607
+#: src/protocols/oscar/oscar.c:2274
 #, fuzzy, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
+msgid ""
+"You missed %hu message 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
 # #, 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:1608
-#, c-format
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu 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:1617
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr "Nem kaptl meg %d zenetet %s-tl,mert nagyon durva szveg."
+
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
 msgstr "Nem kaptl meg %d zenetet %s-tl,mert nagyon durva szveg."
 
-#: src/protocols/oscar/oscar.c:1618
-#, 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:1627
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu 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:1628
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu 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:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgstr "Nem kaptl meg %d zenetet %s-tl ismeretlen okokbl."
+
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
+msgstr "Nem kaptl meg %d zenetet %s-tl ismeretlen okokbl."
+
+#: src/protocols/oscar/oscar.c:2342
 #, 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:1636
-#, 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:1637
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
-msgstr "Nem kaptl meg %d zenetet %s-tl ismeretlen okokbl."
-
-#: src/protocols/oscar/oscar.c:1705
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
+#, fuzzy, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>llapot:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1707
-#, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+#: src/protocols/oscar/oscar.c:2389
+#, fuzzy, c-format
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>llapot:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1736
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC hiba: %s\n"
 
-#: src/protocols/oscar/oscar.c:1755
-#, 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:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "Ismeretlen bejelentkezsi hiba"
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "Nincs magyarzat."
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "zeneted %s-nak/nek nem lett elkldve: %s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "Felhasznl informci %s nem elrhet: %s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Buddy Ikon"
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Hang"
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "IM kp"
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Csevegs"
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Fjl letltse"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr "Fjl kldse"
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Jtkok"
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Kszlet"
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Partner lista kldse"
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy hiba"
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "AP felhasznl"
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "ICQ kiszolgl kzvett"
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ ismeretlen"
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Trillian titkosts"
 
-#: src/protocols/oscar/oscar.c:1886
+#: src/protocols/oscar/oscar.c:2655
 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 ""
-"<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:1914
-#, c-format
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "Felhasznl : <B>%s</B>  %s <BR>\n"
 "Figyelmeztetsi szint : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>Felhasznl nem rendelkezik zenettel tvollt esetre</i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "gyfl kpessgei: "
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Nincs informci megadva</i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "A kapcsolat valsznleg megszakadt."
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
@@ -1414,55 +1990,118 @@
 "Az utols zenet nem lett elkldve mert a korltot meghaladtad. Krlek vrj "
 "10 msodpercet s prbld jra."
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "Gaim - ICQ azonosts elutastva"
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "Gaim - ICQ azonosts elfogadva"
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "g003: Hiba a kapcsolat megnyitsa kzben.\n"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "Fik"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "Nem sikerl olvasni a fjlt %s."
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim nem tudta az zenetet elkldeni"
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1471,153 +2110,154 @@
 "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:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Vlts:"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Nem sikerlt megnyitni a kzvetlen IM-et"
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
 #, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4621
 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:3586
-#, c-format
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
+#, fuzzy, 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>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><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:3593
-#, c-format
+#: src/protocols/oscar/oscar.c:4642
+#, fuzzy, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><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:3618
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "Sttsz zenet lekrdezse"
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Kzvetlen IM"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Lehetsgek lekrdezse"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Nem sikerl rni a fjlba %s ."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Nem sikerl olvasni a fjlt %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "zenet tl hossz, az utols %s bjt levgva."
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s jelenleg nincs bejelentkezve."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s figyelmeztetse nincs engedlyezve."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Egy zenet el lett dobva, tllped a kiszolgl tviteli sebessgt."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Nem lehet %s-(ban/ben) csevegni."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Tl gyorsan kldesz zenetet %s-(nak/nek)."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Lemaradtl egy IM-rl %s-(val/vel) mert tl nagy volt."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Lemaradtl egy IM-rl %s-(val/vel) mert tl gyorsan kldte."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "Hiba."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "Tl sok egyezsg."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "Tovbbi opci szksges"
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "Szolgltats tmenetileg nem elrhet"
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "E-mail keress elutastva."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Kulcssz figyelmen kvl hagyva."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "Nincs kulcssz"
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "Felhasznlnak nincsen knyvtr informcija."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "Orszg nem tmogatott"
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Ismeretlen hiba: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "Szolgltats tmenetileg nem elrhet."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "A figyelmeztetsi szint tl magas ahoz hogy bejelentkezz."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1625,37 +2265,37 @@
 "Tl gyakran jelentkezel ki/be. Vrj tt percet s prbld jra. Ha tovbb "
 "folytatod akkor mg tovbb kell majd vrnod."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Egy ismeretlen hiba bejelentkezs kzben: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Ismeretlen hiba %d trtnt. Informci: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "Kapcsolat lezrva"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "Vlaszra vrok ..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC jra aktv. Most mr kldhetsz zeneteket."
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "Jelsz vltoztats sikeres"
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -1666,281 +2306,252 @@
 "minden neki kldtt zenetet s kizrhat hogyha kldesz egy zenetet Gaim "
 "megakadlyozza ezt. Ez csak ideiglenes, lgy trelemmel."
 
-#: src/protocols/toc/toc.c:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "Knyvtr lekrdezse"
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "Port"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "tvitelhez nem sikerlt kapcsolatot ltrehozni!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "tvitelhez nem sikerlt kapcsolatot ltrehozni!"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "tvitelhez nem sikerlt kapcsolatot ltrehozni!"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - Ments mint..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s felkri %s-t a kvetkez %d fjl fogadsra: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1963
+#: src/protocols/toc/toc.c:1980
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s felkri %s-t a kvetkez %d fjlok fogadsra: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s felkr hogy kldj neki egy fjlt"
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr "Elfogad"
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "zeneted nem lett elkldve."
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZHely:"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Osztly:"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "Pldny:"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "Cmzett:"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Gaim v%s"
 
-#: src/about.c:135
+#: src/about.c:112
 #, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim AOL protokolt tmogat gyfl szoftver. Gtk+ segtsgvel s a GPL "
 "licensznek megfelelen kszl.\n"
 "\n"
 "URL: "
 
-#: src/about.c:137
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
+#: src/about.c:122
+#, fuzzy
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "\n"
 "\n"
 "IRC: #gaim a irc.openprojects.net cmen"
 
-#: src/about.c:147
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-msgstr ""
-"Aktv fejlesztk\n"
-"====================\n"
-"Rob Flynn (karbantart) [ rob@marko.net ]\n"
-"Sean Egan (kdol)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Patch ksztk\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Visszavonult fejlesztk\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (eredeti szerz)   [ markster@marko.net ]"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "Web cm"
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr "Kijelentkezs"
-
-#: src/aim.c:162
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "Bezr"
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "Add meg a belpsi neved"
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Bejelentkezs"
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "Kperny neve: "
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr "Jelsz: "
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "Kilp"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr "Fikok"
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr "Bejelentkezs"
-
-#: src/aim.c:354
-msgid "About"
-msgstr "Nvjegy"
-
-#: src/aim.c:355
-msgid "Options"
-msgstr "Belltsok"
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr "Pluginek"
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr "Preferencik"
-
-#: src/aim.c:841 src/multi.c:1481
-#, fuzzy
-msgid "Auto-login"
-msgstr "Automatikus bejelentkezs"
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - Tvol!"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "jra itt!"
 
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr "Vissza"
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "j zenet tvollt esetre"
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "Tvollt zenetnek eltvoltsa"
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Tvol mindenhonnan"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Csoport"
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Informci"
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "lnv"
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr "j figyelmeztets"
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "Napl"
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "tnevez"
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "lnv trlse"
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr "j"
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "Figyelmeztets trlse"
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 zenet)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "Szerkesztshez kattints"
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Bejelentkezve: %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Figyelmeztetsek: %d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Lehetsgek: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1951,943 +2562,877 @@
 "Kperny neve: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "Inaktv: "
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s bejelentkezett."
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s kijelentkezett."
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Partner adatai"
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "Azonnali zenet kldse"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "j csevegs/kapcsolds csevegshez"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Tvollt zenetnek aktivlsa"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - Partner lista"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Fjl"
 
-#: src/buddy.c:2667
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr "Partner felvtele"
 
-#: src/buddy.c:2669
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr "Csatlakozs egy csevegshez"
 
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr "j azonnali zenet"
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "j zenet tvollt esetre"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr "Felhasznl adatai"
 
-#: src/buddy.c:2678
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "Partner lista importlsa"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "Ikon elrejtse"
+
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "Eszkzk"
 
-#: src/buddy.c:2706
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "Fikok"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Preferencik"
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Protokol esemnyek"
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "Biztonsg"
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "Napl megtekintse"
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr "Script betltse"
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "sszes script eltvoltsa"
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr "Scriptek listja"
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Sg"
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 msgid "Online Help"
 msgstr "Sg"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 msgid "Debug Window"
 msgstr "Nyomkvet ablak"
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "Gaim nvjegy"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "Partner lista"
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "j partner felvtele"
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "j csoport felvtele"
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "Kivlasztott partner/csoport trlse"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Partnerek szerkesztse"
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - Partner lista"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Csatlakozs csevegshez"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Csatlakozs mint:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr "Mgsem"
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Csatlakozs"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Invitl"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Partner"
 
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "zenet"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Partner inivitlsa a szobba"
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Vissza"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "tlp"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s a szobban"
 
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s belpett a szobba."
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s belpett a szobba."
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ezentl %s nven szerepel"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s elhagyta a szobt (%s)."
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s elhagyta a szobt."
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Csoportos csevegs"
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Tma:"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0 tartzkodnak a szobban"
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr "Pletyka"
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Kld"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
-msgid "Block"
-msgstr "Tilt"
-
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "Figyelmeztet"
 
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Trsalgs mentse"
-
-#: src/conversation.c:492
+#: src/buddy_chat.c:1592 src/conversation.c:2925
+msgid "Block"
+msgstr "Tilt"
+
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Kp beszrsa"
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "zenetet nem lehet elkldeni: tl nagy"
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "zenetet nem lehet elkldeni: tl nagy"
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr "Jelenleg %d, "
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "Pozci belltsa %d-(ra/re)\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr "Kvr szveg"
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr "Kvr"
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr "Dlt szveg"
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr "Dlt"
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr "Alhzott szveg"
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr "Alhzott"
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr "thzott szveg"
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr "thzott"
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "Betmret cskkentse"
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr "Kicsi"
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "Norml mret"
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr "Norml"
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr "Betmret nvelse"
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr "Nagy"
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "Bettpus vlaszts"
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr "Bettpus"
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "Szveg szne"
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr "Szn"
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr "Httr szn"
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "Trsalgs mentse"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "Hivatkozs beszrsa"
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr "Hivatkozs"
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr "Mosolyg arc beszrsa"
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "Mosolyg"
-
-#: src/conversation.c:2272
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "IM kp beszrsa"
 
-#: src/conversation.c:2272
-msgid "Image"
-msgstr "Kp"
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "Bezr"
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "Belltsok"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "Naplzs bekapcsolsa"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr "Naplzs"
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr "Trsalgs mentse"
-
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr "Ments"
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
-msgstr ""
-
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr "Hang"
-
-#: src/conversation.c:2782
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "Hangok engedlyezse"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - Trsalgsok"
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "zenet kldse mint: "
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Ikon mentse"
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Animci kikapcsolsa"
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Animci bekapcsolsa"
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Ikon elrejtse"
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Ikon mentse mint"
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "Gaim - Felhasznl figyelmeztetse?"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "Tnyleg akarod %s-t figyelmeztetni?"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "Figyelmeztets nv nlkl?"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "A nvtelen figyelmeztetsek nem olyan kellemetlenek."
 
-#: src/dialogs.c:471
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "'%s' elvtoltsa a listrl.\n"
 
-#: src/dialogs.c:496
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - Eltvoltsam %s-t?"
-
-#: src/dialogs.c:509
-msgid "Remove Buddy"
-msgstr "Partner trlse"
-
-#: src/dialogs.c:519
-#, c-format
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "Kperny neve:"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
+msgstr "Fik:"
+
+#: src/dialogs.c:804
 msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
-msgstr ""
-"Elkvnod tvoltani '%s'-t a partnereid kzl.\n"
-"Folytatni akarod?"
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr "Elfogad"
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "Rendben"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - IM felhasznl"
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr "IM kicsoda:"
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "Felhasznl:"
-
-#: src/dialogs.c:816
-msgid "Account:"
-msgstr "Fik:"
-
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "Gaim -  Felhasznl adatai"
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr "Csoport felvtele"
-
-#: src/dialogs.c:1004
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - Csoport felvtele"
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "Csoport"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Partner felvtele"
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr "Partner felvtele"
-
-#: src/dialogs.c:1110
-msgid "Contact"
-msgstr "Kapcsolattart"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Kperny neve: "
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Hozzad a kvetkezhz"
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Tvol!"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
-msgstr ""
-
-#: src/dialogs.c:1451
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Biztonsgi belltsa a kvetkez?re"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Mindenki kapcsolatba lphet velem"
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "Csak a kvetkez felhasznlk engedlyezse"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "Csak a kvetkez felhasznlk engedlyezse"
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr "Engedlyezettek"
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Minden felhasznl elutastsa"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "A kvetkez felhasznlk tiltsa"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "Tilt lista"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Add meg a figyelmeztetst"
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - j figyelmeztets"
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Kit figyelmeztetsz"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Fik"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "Mikor"
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Bejelentkezskor"
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Ha a tvollt megsznik"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Ha az inaktv llapot megsznik"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "Ha a partner szveget r nekem"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Figyelmeztetskor"
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "IM ablak megnyitsa"
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Elugr figyelmeztets"
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "zenet kldse"
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Parancs vgrehajtsa"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Hang lejtszsa"
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Figyelmeztets mentse aktivls utn"
 
-#: src/dialogs.c:1971
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr "Ments"
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "Mgsem"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Knyvtr adatainak belltsa"
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Knyvtr adatai"
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Web keresk megtallhatjk az adataimat"
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Keresztnv"
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Kzps nv"
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Vezetknv"
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Lenykori nv"
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "llam"
 
-#: src/dialogs.c:2126
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr "Ments"
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "j jelszavak nem egyeznek"
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Minden mezt ki kell tlteni"
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Jelsz megvltoztatsa"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Eredeti jelsz"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "j jelsz"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "j jelsz (mgegyszer)"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "Rendben"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Felhasznli adatok belltsa"
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "A keress eredmnyei a kvetkezk: "
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Engedlyez"
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr "Elutast"
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Engedly felvtele"
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Elutasts felvtele"
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Trsalgs naplzsa"
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Partner keresse"
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Partner keresse adatok alapjn"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Partner keresse email cm alapjn"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "Hivatkozs beszrsa"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - URL felvtele"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Szveg sznnek kivlasztsa"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Httr szn kivlasztsa"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "Bettpus vlaszts"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importls a kvetkezbe:"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Partner lista importlsa"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "Cm nlkl zenetet nem hozhatsz ltre"
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "res zenetet nem hozhatsz ltre"
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - j tvollt zenet"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "j tvollt zenet"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Tvollt fejlce: "
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "Ment s alkalmaz"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Alkalmaz"
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "Ment s alkalmaz"
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Mosolyog!"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr "Partner lneve"
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Partner lneve"
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "Nem sikerlt a tvoli gphez kapcsoldni"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Napl mentse"
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "Nem lehet a konfigurcis fjlt %s megnyitni."
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Tnyleg trlni akarod a naplt?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "Rendben"
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Dtum"
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Trsalgs"
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Trlse"
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Csoport tnevezse"
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr "Csoport tnevezse"
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
-msgid "New name:"
-msgstr "j nv:"
-
-#: src/dialogs.c:4484
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Partner tnevezse"
 
-#: src/dialogs.c:4494
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Partner tnevezse"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "j nv:"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Perl sciprt kivlasztsa"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nem lehet a konfigurcis fjlt %s megnyitni."
 
-#: src/html.c:183
+#: src/html.c:185
 #, c-format
 msgid "Received: '%s'\n"
 msgstr "Fogadva: '%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Hiba a kapcsolat megnyitsa kzben.\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim nem tudta az zenetet elkldeni"
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "Kperny neve:"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "Protokol:"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Ikon betltse"
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "Ikon file:"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Tallz"
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "Trl"
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "Bettpusok belltsa"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "Kperny neve:"
 
-#: src/multi.c:559
+#: src/multi.c:653
 msgid "Alias:"
 msgstr "lnv:"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "Jelsz mentse"
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Automatikus bejelentkezs"
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "j levl figyelmeztetsek"
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "Proxy belltsok"
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "j levl figyelmeztetsek"
+
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Belltsok"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "Regisztrci a kiszolglval"
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Fik mdostsa"
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "Jelsz megadsa"
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Jelsz:"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "Bejelentkezs"
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "Protokol esemnyek"
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2895,40 +3440,45 @@
 "Nem jelentkezhetsz be ezzel a fikkal. Nincs vagy nem a megfelel protokol "
 "van betltdve ami ezt a funckit vgrehajtan."
 
-#: src/multi.c:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Biztos hogy trlni akarod %s?"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "Trls"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Fik szerkesztse"
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr "Mindent kivlaszt"
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr "Automatikus kivlaszts"
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "Nincs kivlaszts"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "Mdost"
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "Be/Ki jelentkezs"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr "Trls"
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "Nincs"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Bejelentkezve: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Fik szerkesztse"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "Mgsem"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -2937,533 +3487,555 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nem tudott bejelentkezni"
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "Bejelentkezsi hiba"
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 msgid "Notice"
 msgstr "Figyelmeztets"
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s kilpett"
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr "Hiba a kapcsolatban"
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim - Plugin lista"
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - Pluginek"
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-msgid "Loaded Plugins"
-msgstr "Pluginek betltse"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr "Mindent kivlaszt"
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr "Elrsi t:"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr "Betlts"
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "Plugin betltse fjlbl"
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr "Konfigurci"
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "A kivlasztott plugin opcii"
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr "jra betlt"
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "A kivlasztott plugin jboli betltse"
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr "Eltvolts"
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "A kivlasztott plugin eltvoltsa"
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "Ablak bezrsa"
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr "ltalnos belltsok"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "Nyomkvet ablak mutatsa"
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "Szegly nlkli gombok hasznlata"
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "llam"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr "Kvr"
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr "Dlt"
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr "Alhzott"
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr "thzott szveg"
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr "Mgsem"
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "Mosolyg arc beszrsa"
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "Mosolyg arc beszrsa"
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr "Szn"
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "Szveg szne"
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "Httr szn"
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr "Partnerek megjelentsei"
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "Mosoly megjelentse kpknt"
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "Id?pont megjelentse zeneteknl"
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "URL-ek mutatsa hivatkozsknt"
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "Helytelen szavak kiemelse"
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "Szinek figyelmenkvl hagysa"
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "Bettpus figyelmenkvl hagysa"
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "Betmretek figyelmenkivl hagysa"
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "TiK zenetek figyelmenkvl hagysa"
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "Enter zenetet kld"
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "Control-Enter zenet kld"
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "IM ablak"
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "Escape ablakot bezrja"
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "Control-W ablak bezrsa"
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Control-{B/I/U/S} HTML cmkket szr be"
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "Control-(szm) mosoly beszrsa"
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr "Alul"
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "IM/Informci/Csevegs gombok elrejtse"
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "Kpek mutatsa gombokon"
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "Partner lista"
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "Ablak mretek/pozck mentse"
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr "Csoportok megjelentsei"
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "Elrhet partnerek nlkli csoportok elrejtse"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "Szmok megjelentse a csoportokban"
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr "Partnerek megjelentsei"
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 #, fuzzy
 msgid "Show buddy type _icons"
 msgstr "Partner tpusnak megfelel? ikonok hasznlata"
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "Figyelmeztetsi szint megjelentse"
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "Inaktv id? megjelentse"
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 #, fuzzy
 msgid "Grey i_dle buddies"
 msgstr "Inaktv partnerek szrkn"
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "IM ablak"
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "Gombok megjelentse: "
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "Kpek"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "Szveg"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "Kpek s szveg"
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "j ablak szlessge:"
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "j ablak magassga:"
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "Input doboz magassga:"
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "Ablak elrejtse kldskor"
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "Ikonok"
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "Ikon elrejtse"
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "Ikon animci tiltsa"
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "Bejelentkezsek megjelentse ablakban"
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr "Elugr figyelmeztets"
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "Partnerek figyelmeztetse gpelskor"
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "Kiegszts"
 
-#: src/prefs.c:505
-#, fuzzy
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "Becenv kiegsztse TAB-al"
 
-#: src/prefs.c:506
-#, fuzzy
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "Rgi stlus kiegszts TAB-al"
 
-#: src/prefs.c:509
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr "Csatlakoz=kilp pertnerek mutatsa ablakban"
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Fl elhelyezse"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr "Fell"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "Alul"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr "Bal oldalon"
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "Jobb oldalon"
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "Minden egy ablakban trtn megjelentse"
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 #, fuzzy
 msgid "Show a_liases in tabs/titles"
 msgstr "lnevek megjelentse a cmben/fleken"
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr "Csevegs"
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "Minden egy ablakban trtn megjelentse"
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Csevegsek megjelentse ugyabban az ablakban"
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr "Partner lista"
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "Proxy tpusa"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Proxy tpusa"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Nincs Proxy"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Proxy kiszolgl"
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr "Gpnv"
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr "Felhasznl"
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr "Jelsz"
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "Bngsz?"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr "Egyni"
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr "Proxy belltsok"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "j ablak el?ugrik (alaprtelmezsben)"
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr "zenetek"
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr "j azonnali zenet"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "Trsalgsok naplzsa"
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr "HTML elemek nem kerljenek a naplzsra"
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "Napl megtekintse"
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "Partnerek be/kilpsnek naplzsa"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Partnerek (in)aktivitsnak naplzsa"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "Partnerek jelen/tvolltnek naplzsa"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Belps/tvollt/inaktivits naplzsa"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Minden belp partner kln naplfjlba"
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "Hangok belltsa"
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "Nincs hang bejelentkezskor"
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "Hang lejtszsa mialatt tvol van"
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr "Lejtszs mdja"
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "Lejtszs mdja"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "Bels hiba"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3472,156 +4044,225 @@
 "Parancs\n"
 "(%s fjl nv megadshoz)"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "zenet kldse megsznteti a tvollt llapott"
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "j zenetk vrakozsi sorba kerljenek ha tvol van"
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "j trsalgs figyelmenkvl hagysa ha tvol van"
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "Nem kld automatikus vlaszokat"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "Nem kld automatikus vlaszokat"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "Automatikus vlaszok kldse csak inaktv llapotban"
 
-#: src/prefs.c:828
-#, fuzzy
-msgid "Idle"
-msgstr "Inaktv: "
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "Nem kld automatikus vlaszokat"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr "Nincs"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Gaim szerint"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "X szerint"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "IM ablak"
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr "Tvol"
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "Tvollt zenetek"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Hangok belltsa"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 msgid "Test"
 msgstr "Prba"
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "Kivlaszt..."
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr "Szerkeszt"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 #, fuzzy
 msgid "Interface"
 msgstr "Pldny:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr "Bettpus"
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr "zenetek"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "IM ablak"
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "Csoportos cseveg ablak"
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "Bngsz?"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "Naplzs"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr "Hangok"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr "Hangok"
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Tvollt fejlce: "
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "Tvollt zenetek"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr "Pluginek"
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencik"
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Gaim nyomkvet ablak"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
-msgstr ""
-
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"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."
-
-#: src/prpl.c:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "Nyomkvet ablak"
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3629,33 +4270,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s hasznlta %s-t, mely el lett tvoltva. %s nem elrhet."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "Elfogadja?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "Gaim - "
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - j levl"
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "Level megnyitsa"
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, 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:590
+#: src/prpl.c:634
 msgid ""
 "\n"
 "\n"
@@ -3665,93 +4301,406 @@
 "\n"
 "Fel kvnod venni ezt a partnert a listdra?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 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:670
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr "Gaim - Regisztrci"
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr "Regisztrcis adatok"
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 msgid "Register"
 msgstr "Regisztrci"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Krjk adja meg jelszavt"
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d zenetek)"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 zenet)"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr "Igen"
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr "Nem"
 
-#: src/server.c:1101
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Tovbbi informci"
 
-#: src/sound.c:63
+#: src/sound.c:68
 #, fuzzy
 msgid "Buddy logs in"
 msgstr "Buddy Ikon"
 
-#: src/sound.c:64
+#: src/sound.c:69
 #, fuzzy
 msgid "Buddy logs out"
 msgstr "Partner lista"
 
-#: src/sound.c:65
+#: src/sound.c:70
 #, fuzzy
 msgid "Message received"
 msgstr "zenet hiba"
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr ""
 
-#: src/sound.c:67
+#: src/sound.c:72
 #, fuzzy
 msgid "Message sent"
 msgstr "zenetek"
 
-#: src/sound.c:68
+#: src/sound.c:73
 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 "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:75
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:76
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ 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?"
+
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "Nem kaptl meg %d zenetet %s-tl,mert nagyon durva szvegek."
+
+#~ 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 ""
+#~ "<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>"
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Gaim - ICQ azonosts elfogadva"
+
+#~ 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?"
+
+#~ msgid ""
+#~ "Active Developers\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Crazy Patch Writers\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Retired Developers\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+#~ msgstr ""
+#~ "Aktv fejlesztk\n"
+#~ "====================\n"
+#~ "Rob Flynn (karbantart) [ rob@marko.net ]\n"
+#~ "Sean Egan (kdol)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Patch ksztk\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Visszavonult fejlesztk\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (eredeti szerz)   [ markster@marko.net ]"
+
+#~ msgid "Web Site"
+#~ msgstr "Web cm"
+
+#~ msgid "Password: "
+#~ msgstr "Jelsz: "
+
+#~ msgid "About"
+#~ msgstr "Nvjegy"
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr "Script betltse"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "sszes script eltvoltsa"
+
+#~ msgid "List Scripts"
+#~ msgstr "Scriptek listja"
+
+#~ msgid "Whisper"
+#~ msgstr "Pletyka"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Trsalgs mentse"
+
+#~ msgid "Currently at %d, "
+#~ msgstr "Jelenleg %d, "
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "Pozci belltsa %d-(ra/re)\n"
+
+#~ msgid "Bold Text"
+#~ msgstr "Kvr szveg"
+
+#~ msgid "Bold"
+#~ msgstr "Kvr"
+
+#~ msgid "Italics Text"
+#~ msgstr "Dlt szveg"
+
+#~ msgid "Italics"
+#~ msgstr "Dlt"
+
+#~ msgid "Underline Text"
+#~ msgstr "Alhzott szveg"
+
+#~ msgid "Underline"
+#~ msgstr "Alhzott"
+
+#~ msgid "Strike through Text"
+#~ msgstr "thzott szveg"
+
+#~ msgid "Strike"
+#~ msgstr "thzott"
+
+#~ msgid "Decrease font size"
+#~ msgstr "Betmret cskkentse"
+
+#~ msgid "Small"
+#~ msgstr "Kicsi"
+
+#~ msgid "Normal font size"
+#~ msgstr "Norml mret"
+
+#~ msgid "Normal"
+#~ msgstr "Norml"
+
+#~ msgid "Increase font size"
+#~ msgstr "Betmret nvelse"
+
+#~ msgid "Big"
+#~ msgstr "Nagy"
+
+#~ msgid "Font"
+#~ msgstr "Bettpus"
+
+#~ msgid "Text Color"
+#~ msgstr "Szveg szne"
+
+#~ msgid "Background Color"
+#~ msgstr "Httr szn"
+
+#~ msgid "Link"
+#~ msgstr "Hivatkozs"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "Mosolyg arc beszrsa"
+
+#~ msgid "Smiley"
+#~ msgstr "Mosolyg"
+
+#~ msgid "Image"
+#~ msgstr "Kp"
+
+#~ msgid "Sound"
+#~ msgstr "Hang"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - Felhasznl figyelmeztetse?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "Tnyleg akarod %s-t figyelmeztetni?"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - Eltvoltsam %s-t?"
+
+#~ msgid "Remove Buddy"
+#~ msgstr "Partner trlse"
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "Elkvnod tvoltani '%s'-t a partnereid kzl.\n"
+#~ "Folytatni akarod?"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - IM felhasznl"
+
+#~ msgid "IM who:"
+#~ msgstr "IM kicsoda:"
+
+#~ msgid "User:"
+#~ msgstr "Felhasznl:"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim -  Felhasznl adatai"
+
+#~ msgid "Add Group"
+#~ msgstr "Csoport felvtele"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Partner felvtele"
+
+#~ msgid "Contact"
+#~ msgstr "Kapcsolattart"
+
+#~ msgid "Allow List"
+#~ msgstr "Engedlyezettek"
+
+#~ msgid "Block List"
+#~ msgstr "Tilt lista"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "Partner lneve"
+
+#~ msgid "Rename Group"
+#~ msgstr "Csoport tnevezse"
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim nem tudta az zenetet elkldeni"
+
+#~ msgid "Select All"
+#~ msgstr "Mindent kivlaszt"
+
+#~ msgid "Select Autos"
+#~ msgstr "Automatikus kivlaszts"
+
+#~ msgid "Select None"
+#~ msgstr "Nincs kivlaszts"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "Be/Ki jelentkezs"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim - Plugin lista"
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - Pluginek"
+
+#~ msgid "Loaded Plugins"
+#~ msgstr "Pluginek betltse"
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr "Mindent kivlaszt"
+
+#~ msgid "Filepath:"
+#~ msgstr "Elrsi t:"
+
+#~ msgid "Load"
+#~ msgstr "Betlts"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "Plugin betltse fjlbl"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurci"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "A kivlasztott plugin opcii"
+
+#~ msgid "Reload"
+#~ msgstr "jra betlt"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "A kivlasztott plugin jboli betltse"
+
+#~ msgid "Unload"
+#~ msgstr "Eltvolts"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "A kivlasztott plugin eltvoltsa"
+
+#~ msgid "Close this window"
+#~ msgstr "Ablak bezrsa"
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "Szegly nlkli gombok hasznlata"
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "TiK zenetek figyelmenkvl hagysa"
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Gaim nyomkvet ablak"
+
+#~ 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 ""
+#~ "A olyan protokolt prblt meg betlteni melynek verzija nem egyezik meg "
+#~ "a program verzival."
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s hasznlta %s-t, mely el lett tvoltva. %s nem elrhet."
+
+#~ msgid "Accept?"
+#~ msgstr "Elfogadja?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Gadu-Gadu hiba"
 
@@ -3776,18 +4725,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "Jelszvltoztats megszakadt (%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "Nincs ilyen becenv/csatorna"
-
-#~ msgid "IRC Error"
-#~ msgstr "IRC hiba"
-
-#~ msgid "No such server"
-#~ msgstr "Nincs ilyen kiszolgl"
-
-#~ msgid "IRC Part"
-#~ msgstr "IRC terlet"
-
 #, fuzzy
 #~ msgid "Password Change Error!"
 #~ msgstr "Gaim - Jelsz megvltoztatsa"
@@ -3803,9 +4740,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "MSn hiba"
 
-#~ msgid "Invalid name"
-#~ msgstr "rvnytelen nv"
-
 #~ msgid "Chat Error!"
 #~ msgstr "Hiba csevegs kzben!"
 
@@ -3821,9 +4755,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "Ismeretlen ok"
 
-#~ msgid "AOL error"
-#~ msgstr "AOL hiba"
-
 #~ msgid "Error"
 #~ msgstr "Hiba"
 
@@ -3925,15 +4856,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "Inaktv id? jelentse"
 
-#~ msgid "None"
-#~ msgstr "Nincs"
-
-#~ msgid "Gaim Use"
-#~ msgstr "Gaim szerint"
-
-#~ msgid "X Use"
-#~ msgstr "X szerint"
-
 #~ msgid "Opera"
 #~ msgstr "Opera"
 
@@ -3953,9 +4875,6 @@
 #~ "Nem mindegyik protokol tudja ezeket a proxy belltsokat hasznlni. "
 #~ "Olvasd el a README fjlt a rszletekrt."
 
-#~ msgid "No Proxy"
-#~ msgstr "Nincs Proxy"
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -3968,12 +4887,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Partnet lista belltsai"
 
-#~ msgid "Tab Placement:"
-#~ msgstr "Fl elhelyezse"
-
-#~ msgid "Top"
-#~ msgstr "Fell"
-
 #~ msgid "Raise Buddy List on Signons and Signoffs"
 #~ msgstr "Partner lista megjelentse be/kijelentkezskor"
 
@@ -3992,42 +4905,18 @@
 #~ msgid "IM Options"
 #~ msgstr "IM belltsok"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "Gombok megjelentse: "
-
-#~ msgid "Pictures And Text"
-#~ msgstr "Kpek s szveg"
-
-#~ msgid "Pictures"
-#~ msgstr "Kpek"
-
-#~ msgid "Text"
-#~ msgstr "Szveg"
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "Minden trsalgs megjelentse egy ablakban"
-
 #~ msgid "Window Sizes"
 #~ msgstr "Ablak mretek"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Fl elhelyezkedse"
 
-#~ msgid "Left"
-#~ msgstr "Bal oldalon"
-
-#~ msgid "Right"
-#~ msgstr "Jobb oldalon"
-
 #~ msgid "Chat Options"
 #~ msgstr "Csevegs belltsai"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Trsalgsok megjelents ugyanabban az ablakban"
 
-#~ msgid "Font Options"
-#~ msgstr "Bettpusok belltsa"
-
 #~ msgid "Italic Text"
 #~ msgstr "Dlt szveg"
 
@@ -4061,11 +4950,5 @@
 #~ msgid "Conversations"
 #~ msgstr "Trsalgsok"
 
-#~ msgid "Enable sounds"
-#~ msgstr "Hangok engedlyezse"
-
 #~ msgid "KFM"
 #~ msgstr "KFM"
-
-#~ msgid "Manual"
-#~ msgstr "Egyni"
--- a/po/it.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/it.po	Sun Jan 05 23:21:50 2003 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.53\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\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,361 +13,534 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "Assente"
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "Tornato"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+#, fuzzy
+msgid "Auto-login"
+msgstr "Auto Login"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "Abbandona"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Suoni"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "Accounts"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "Preferenze"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "Informazioni su Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Esci"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - Configurazione Suoni"
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "Icona della persona"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Ciatta con Contatto"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 #, fuzzy
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr "Chiudi"
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 #, fuzzy
 msgid "Chat Rooms"
 msgstr "Opzioni di Chat"
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Aggiungi"
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Elimina"
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr ""
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr ""
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr ""
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr ""
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr ""
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr ""
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 #, fuzzy
 msgid "(No"
 msgstr "No"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 #, fuzzy
 msgid "Change"
 msgstr "Canale:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "Impossibile scrivere il file %s."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "%s entrato."
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "Finestra di IM"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "Finestra chat gruppo"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "Notifica Popup"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "Notifica Popup"
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "Impossibile connettersi"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "Testo"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "Tutte le conversazioni in una finestra a schede"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Presente"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr "Presente solo per gli amici"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr "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 "Away for friends only"
+msgstr "Assente solo per gli amici"
+
+#: src/protocols/gg/gg.c:77
+msgid "Invisible"
+msgstr "Invisibile"
+
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "Invisibile solo per gli amici"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "Occupato"
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "Nome host sconosciuto."
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "Non riesco a collegarmi al server"
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "Risposta non valida dal server"
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "Errore di lettura dal socket."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 #, fuzzy
 msgid "Error while writing to socket."
 msgstr "Errore di scrittura nel socket."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autentificazione fallita."
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "Codice di errore sconosciuto."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr "Soprannome:"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Utente Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "Non riesco a collegarmi"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "Non riesco a leggere il socket"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "Non riesco a collegarmi"
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "Lettura dati in corso"
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "Handshake compensatore (NdT: non so!!!)"
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr "Lettura chiave server in corso"
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "Scambio delle key hash (NdT: mah!)"
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "Errore critico nelle librerie GG\n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "Non riesco a fare il ping al server"
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "Spedisci come messaggio"
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr "Ricerca del server GG in corso"
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "UIN di Gadu-Gadu sbagliato"
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connessione fallita a %s"
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "Non riesco a fare il ping al server"
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "Spedisci come messaggio"
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr "Ricerca del server GG in corso"
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "UIN di Gadu-Gadu sbagliato"
+
+#: src/protocols/gg/gg.c:604
 #, fuzzy
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Stai tentando di spedire un messaggio a un UIN Gadu-Gadu sbagliato!"
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "Risultati della ricerca non disponibili"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Motore di ricerca Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Attivo"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "si"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "no"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "Nome al secolo"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "Cognome"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "Soprannome"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "Anno di nascita"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "Sesso :9"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Citt"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Sul server non c' nessuna lista contatti :("
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Non posso importare lista contatti dal server"
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Lista contatti trasferita sul server"
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Impossibile trasferire lista contatti nel server"
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Lista contatti eliminata dal server"
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Impossibile eliminare lista contatti dal server"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "Password cambiata!"
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Impossibile cambiare password"
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "Non posso importare lista contatti dal server"
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "Impossibile aprire un canale diretto di IM"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Non riesco a leggere il socket"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "Cerca directory"
 
@@ -375,167 +548,302 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Cambia password"
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "Importa lista contatti da server"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "Esporta lista contatti sul server"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "Elimina lista contatti dal server"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "Impossibile leggere il file %s."
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr "Soprannome:"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Utente Gadu-Gadu"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "Nega"
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 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:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Prendi informazioni"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Uso di Gaim"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, fuzzy, c-format
 msgid "DCC Chat with %s closed"
 msgstr " stato chiuso il canale diretto con %s"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "Connessione chiusa."
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s ha cambiato l'argomento in: %s<B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "Lettura chiave server in corso"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "Errore IRC"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "Non esiste quel soprannome/canale"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "Errore IRC"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "Il server non esiste"
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
 msgstr "Nessun soprannome dato"
 
-#: src/protocols/irc/irc.c:976
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 msgid ""
-"%s has requested a DCC chat.  Would you like to establish the direct "
-"connection?"
-msgstr ""
-
-#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "Connesso"
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Impossibile scrivere"
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "Sei stato cacciato da %s: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "Cacciato da %s: %s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "Vedi info utente"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Disconnesso da %s"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "Parte IRC"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Canale:"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Password:"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 #, fuzzy
 msgid "DCC Chat"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "Porta"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "Non riesco a leggere il socket"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "Non riesco a leggere il socket"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 #, fuzzy
 msgid "Unknown"
 msgstr "ICQ sconosciuto"
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Presente"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr "Assente ovunque"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Errore messaggio"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Codice di errore sconosciuto."
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -543,196 +851,192 @@
 "\n"
 "Vuoi aggiungerli alla tua lista dei contatti?"
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "Il server non esiste"
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Contatti"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr "Autentificazione"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "Errore di login sconosciuto"
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Password cambiata!"
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 #, fuzzy
 msgid "Connection lost"
 msgstr "Connessione chiusa."
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Impossibile connettersi"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "Connesso"
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "Richiesta metodo autentificazione in corso"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 #, fuzzy
 msgid "Jabber Error"
 msgstr "Errore messaggio"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "Stanza:"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "Gestisci:"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "Impossibile connettersi"
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Vedi i log"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Prendi messaggio di Assente"
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Notifica Popup"
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "Nome al secolo"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "Cognome"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "Nome assegnato"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Indirizzo"
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "Indirizzo per esteso"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "Localit"
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr "Regione"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "Codice Postale"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Paese"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "Telefono"
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "Nome dell'organizzazione"
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "Divisione"
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Titolo"
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr "Posizione"
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -740,397 +1044,601 @@
 "Tutti i dati qui sotto sono opzionali. Inserisci solo le informazioni che "
 "ritieni opportune"
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "Identit"
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Edita la vCard Jabber"
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "Sei stato registrato sul server!"
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "Errore di registrazione sconosciuto"
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "Imposta informazioni utente"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 #, fuzzy
 msgid "Invalid User"
 msgstr "Nome non valido"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr ""
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 #, fuzzy
 msgid "Invalid Username"
 msgstr "Nome non valido"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 #, fuzzy
 msgid "Invalid Friendly Name"
 msgstr "Nome non valido"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 #, fuzzy
 msgid "Not on list"
 msgstr "Connessione chiusa."
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 #, fuzzy
 msgid "Not logged in"
 msgstr "%s entrato."
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 #, fuzzy
 msgid "Internal server error"
 msgstr "Errore interno"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 #, fuzzy
 msgid "File operation error"
 msgstr "errore interno di connessione\n"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "grave errore di connessione\n"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 #, fuzzy
 msgid "Server busy"
 msgstr "Server:"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 #, fuzzy
 msgid "Server unavailable"
 msgstr "Occupato"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 #, fuzzy
 msgid "Database connect error"
 msgstr "errore interno di connessione\n"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 #, fuzzy
 msgid "Error creating connection"
 msgstr "g003: Errore apertura connessione.\n"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 #, fuzzy
 msgid "Too many sessions"
 msgstr "Troppe corrispondenze."
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autentificazione fallita."
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 #, fuzzy
 msgid "Not allowed when offline"
 msgstr "Nessun suono quando entri"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 #, fuzzy
 msgid "Unknown Error Code"
 msgstr "Codice di errore sconosciuto."
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim non riesce a spedire il messaggio"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "Errore AOL"
+
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Non riesco a collegarmi al server"
+
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1179
+#: src/protocols/msn/msn.c:1401
 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:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Errore di lettura dal socket."
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "Non riesco a collegarmi al server"
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "Non riesco a collegarmi al server"
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Azioni protocollo"
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "Impossibile aprire un canale diretto di IM"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "Impossibile entrare in AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "Messaggio non spedito: troppo lungo"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Non riesco a leggere il socket"
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 #, fuzzy
 msgid "Password sent"
 msgstr "Password: "
 
-#: src/protocols/msn/msn.c:1752
-#, fuzzy
-msgid "Unable to write to server"
-msgstr "Non riesco a collegarmi al server"
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "Impossibile scrivere"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "Messaggio non spedito: troppo lungo"
+
+#: src/protocols/msn/msn.c:1974
 #, fuzzy
 msgid "Synching with server"
 msgstr "Registro dal server"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 #, fuzzy
 msgid "Busy"
 msgstr "Contatto"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 #, fuzzy
 msgid "Hidden"
 msgstr "Nascondi icona"
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+msgid "Be right back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2430
+msgid "Away from the computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2432
+msgid "On the phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2434
+msgid "Out to lunch"
+msgstr ""
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr "A riposo: "
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "Invia file"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Cognome"
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Account: "
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr "Nome non valido"
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Con quale gruppo vuoi ciattare:"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "Nome non valido"
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Nome non valido"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Occupato"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Il servizio di Dir  temporaneamente inaccessibile."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr " stato chiuso il canale diretto con %s"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, fuzzy, c-format
 msgid "Direct IM with %s failed"
 msgstr " stato chiuso il canale diretto con %s"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "errore di connessione (rend?)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "grave errore di connessione\n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Disconnesso."
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Sei stato disconnesso dalla chat room %s."
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "La chat al momento non  disponibile"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Impossibile connettersi all'host"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Password inviata; attendo la risposta\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "errore interno di connessione\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Impossibile entrare in AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Collegato: %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Scollegato.\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Impossibile connettersi"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Connessione effettuata: spedito il cookie"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Soprannome o password sbagliati."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Il tuo account al momento  sospeso"
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "Il servizio  temporaneamente inaccesibile."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1139,48 +1647,89 @@
 "dopo riprova. Se continui, dovrai aspettare anche pi a lungo."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versione del client che stai usando  troppo vecchia. Aggiornalo alla "
 "versione "
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Autentificazione fallita"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Errore interno"
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim non riesce a spedire il messaggio"
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim non riesce a spedire il messaggio"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Aperto il canale diretto con %s"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+msgid "Transfer timed out"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "File di configurazione %s non aperto."
+
+#: src/protocols/oscar/oscar.c:1632
+msgid "File transfer aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr ""
+"\n"
+"\n"
+"Vuoi aggiungerli alla tua lista dei contatti?"
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+#, fuzzy
+msgid "No reason given."
+msgstr "Nessun soprannome dato"
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Autentificazione fallita."
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1188,230 +1737,261 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-#, fuzzy
-msgid "No reason given."
-msgstr "Nessun soprannome dato"
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:2141
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
 #, 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:1588
-#, 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:1597
+msgid ""
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
-msgid "You missed %d message from %s because it was too large."
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"Vuoi aggiungerli alla tua lista dei contatti?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "Hai perso %d messaggio da %s perch non valido."
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "Hai perso %d messaggi da %s perch non validi."
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
 msgstr "Hai perso %d messaggio da %s perch era troppo lungo."
 
-#: src/protocols/oscar/oscar.c:1598
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
 msgstr "Hai perso %d messaggi da %s perch troppo lunghi."
 
-#: src/protocols/oscar/oscar.c:1607
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu 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:1608
-#, c-format
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr ""
 "Hai perso %d messaggi da %s perch  stato superata la frequenza massima di "
 "messaggi."
 
-#: src/protocols/oscar/oscar.c:1617
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr "Hai perso %d messaggio da %s perch era troppo cattivo."
+
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
 msgstr "Hai perso %d messaggio da %s perch era troppo cattivo."
 
-#: src/protocols/oscar/oscar.c:1618
-#, 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:1627
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
 msgstr "Hai perso %d messaggio da %s perch sei troppo molesto."
 
-#: src/protocols/oscar/oscar.c:1628
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu 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:1636
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Hai perso %d messaggio da %s: non chiedermi perch, non lo so."
 
-#: src/protocols/oscar/oscar.c:1637
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Non  Winzozz, per hai perso %d messaggi da %s e non so il perch."
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2342
+#, c-format
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1707
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1736
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC ha inviato un errore: %s\n"
 
-#: src/protocols/oscar/oscar.c:1755
-#, 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:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "Errore di login sconosciuto"
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "Nessun soprannome dato"
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "Il tuo messaggio a %s non  stato spedito: %s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "Le informazioni dell'utente %s non sono disponibili: %s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Icona della persona"
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Voce"
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "Immagine di IM"
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Prendi file"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr "Invia file"
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Giochi"
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Scorte"
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Invia lista contatti"
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "Baco di EveryBuddy"
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "Utente AP"
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nichilista"
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "Trasmissione al server ICQ"
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ sconosciuto"
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Criptaggio trilliano (?)"
 
-#: src/protocols/oscar/oscar.c:1886
-#, fuzzy
+#: src/protocols/oscar/oscar.c:2655
 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 ""
-"<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
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Livello di avviso : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>L'utente non ha messaggio di Assente</i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Potenzialit del client: "
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Nessuna informazione fornita</i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "La connessione potrebbe essersi interrotta."
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
@@ -1420,209 +2000,272 @@
 "L'ultimo messaggio non  stato inviato perch ne hai spediti con troppa "
 "frequenza. Aspetta 10 secondi e riprova."
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "Autentificazione fallita."
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "Autentificazione fallita."
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "g003: Errore apertura connessione.\n"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "Account"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "Impossibile leggere il file %s."
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim non riesce a spedire il messaggio"
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, 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:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Scambia:"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Impossibile aprire un canale diretto di IM"
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4621
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
 #, 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 ""
-"Hai scelto di aprire in canale diretto di IM con %s. In questo modo gli "
-"permetterai di vedere il tuo indirizzo IP, rischiando per la sicurezza del "
-"tuo sistema. Vuoi continuare?"
-
-#: src/protocols/oscar/oscar.c:3586
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4642
 #, 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:3593
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3618
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4667
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Prendi messaggio di Assente"
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "IM diretto"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Prendi le potenzialit"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossibile scrivere il file %s."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossibile leggere il file %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Messaggio troppo lungo: troncati ultimi %s byte."
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s non  al momento connesso."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Avviso di %s non permesso."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Hai mollato un nuovo messaggio, stai raggiungendo il limite di velocit del "
 "server."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Non  disponibile la chat in %s."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Stai spedendo i messaggi a %s troppo velocemente."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Hai perso un messaggio da %s perch era troppo grande."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Perso un messaggio da %s perch spedito troppo velocemente."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "Fallimento."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "Troppe corrispondenze."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "Necessito di pi qualificatori."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "Il servizio di Dir  temporaneamente inaccessibile."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "Vista della e-mail ristretta."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Parola chiave ignorata."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "Nessuna parola chiave."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "L'utente non ha informazioni della directory."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "Paese non supportato."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Guasto sconosciuto: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "Il servizio  temporaneamente inaccesibile."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Il tuo livello di avviso  attualmente troppo alto per essere connesso."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1630,38 +2273,38 @@
 "Ti sei connesso e disconnesso troppo di frequente. Aspetta dieci minuti e "
 "riprova. Se continui potresti dover aspettare ancora pi a lungo."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Si  verificato un errore di connessione sconosciuto: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, fuzzy, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Si  verificato l'errore sconosciuto %d. Info: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "Connessione chiusa."
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "In attesa di risposta..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC  ritornato dalla pausa. Ora puoi rispedire il messaggio."
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Cambio password effettuato"
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -1673,77 +2316,101 @@
 "messaggio. Gaim previene la continuazione. Questo  solo temporaneo, basta "
 "attendere un po'."
 
-#: src/protocols/toc/toc.c:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "Prendi le info di Dir"
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "Porta"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "Impossibile connettersi per trasferire file!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "Impossibile connettersi per trasferire file!"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "Impossibile connettersi per trasferire file!"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - Salva come..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, 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:1963
+#: src/protocols/toc/toc.c:1980
 #, 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:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ti chiede di mandargli un file"
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr "Accetta"
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "Il tuo messaggio non  stato inviato."
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "Zlocate"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Classe:"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "Istanza:"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "Recipiente:"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Informazioni su Gaim v. %s"
 
-#: src/about.c:135
+#: src/about.c:112
 #, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim  un programma che supporta il protocollo di AOL Instant Messenger.  "
 "scritto\n"
@@ -1752,204 +2419,151 @@
 "\n"
 "URL: "
 
-#: src/about.c:137
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
+#: src/about.c:122
+#, fuzzy
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "\n"
 "\n"
 "IRC: #gaim su irc.openprojects.net"
 
-#: src/about.c:147
-#, fuzzy
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-msgstr ""
-"Sviluppatori Attivi\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Folli che scrivono le Patch\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Mark Doliner\n"
-"\n"
-"Sviluppatori ritirati\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "Sito Web"
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr "Abbandona"
-
-#: src/aim.c:162
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "Chiudi"
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "Inserisci il tuo account"
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Login"
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "Account: "
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr "Password: "
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "Esci"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr "Accounts"
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr "Entra"
-
-#: src/aim.c:354
-msgid "About"
-msgstr "Informazioni"
-
-#: src/aim.c:355
-msgid "Options"
-msgstr "Opzioni"
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr "Plugins"
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: src/aim.c:841 src/multi.c:1481
-#, fuzzy
-msgid "Auto-login"
-msgstr "Auto Login"
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - Assente!"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "Sono tornato!"
 
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr "Tornato"
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "Nuovo msg di Assente"
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "Rimuovi msg di Assente"
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Tutti come Assente"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Gruppo"
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Informazioni"
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr "Aggiungi salto a Contatto"
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "Vedi i log"
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "Rinomina"
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "Cancella Alias"
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr "Nuovo salto a Contatto"
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "Rimuovi salto a Contatto"
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 messaggio)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[Clicca per modificare]"
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Entrato in: %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Avvisi: %d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Potenzialit: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1960,950 +2574,881 @@
 "Account: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "A riposo: "
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s entrato."
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s uscito."
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Informazioni Contatto selezionato."
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "Invia un messaggio"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "Inizia/unisciti a chat con Contatto"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Attiva messaggio di Assente"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - Lista Contatti"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "File"
 
-#: src/buddy.c:2667
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr "Aggiungi Contatto"
 
-#: src/buddy.c:2669
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr "Unisciti a una chat"
 
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr "Nuovo messaggio"
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "Nuovo msg di Assente"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr "Vedi info utente"
 
-#: src/buddy.c:2678
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "Importa lista contatti"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "Nascondi icona"
+
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "Strumenti"
 
-#: src/buddy.c:2706
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr "Salto a Contatto"
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "Accounts"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Preferenze"
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Azioni protocollo"
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "Privacy"
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "Vedi log di sistema"
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr "Esegui script"
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "Anunulla tutti gli script"
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr "Elenco script"
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 #, fuzzy
 msgid "Online Help"
 msgstr "Presente"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 #, fuzzy
 msgid "Debug Window"
 msgstr "Mostra finestra debug"
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "Informazioni su Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "Lista contatti"
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "Aggiungi nuovo contatto"
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "Aggiungio nuovo gruppo"
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "Elimina Contatto/Gruppo selezionato"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Modifica Contatti"
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - Lista Contatti"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Unisciti a chat"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Unisciti a chat come:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr "Annulla"
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Inserisciti"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Invita"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Contatto"
 
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invita Contatto nella stanza di chat"
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Rimuovi Ignora"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Ignora"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s nella stanza"
 
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s  entrato nella stanza."
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s  entrato nella stanza."
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s  ora visto come %s"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha lasciato la stanza (%s)."
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha lasciato la stanza."
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Chat in gruppo"
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Argomento:"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "Nessuno in stanza"
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr "Msg privato"
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Invia"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
+#: src/buddy_chat.c:1586 src/conversation.c:2906
+msgid "Warn"
+msgstr "Avviso"
+
+#: src/buddy_chat.c:1592 src/conversation.c:2925
 msgid "Block"
 msgstr "Blocca"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
-msgid "Warn"
-msgstr "Avviso"
-
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Salva la conversazione"
-
-#: src/conversation.c:492
+#: src/conversation.c:443
 #, fuzzy
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Utente IM"
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "Messaggio non spedito: troppo lungo"
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "Messaggio non spedito: troppo lungo"
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr "Al momento a %d, "
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "Imposta posizione a %d\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr "Testo Grassetto"
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr "Grassetto"
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr "Testo Corsivo"
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr "Corsivo"
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr "Testo Sottolineato"
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr "Sottolineato"
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr "Testo barrato"
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr "Barrato"
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "Riduci font"
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr "Piccolo"
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "Font normale"
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr "Normale"
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr "Ingrandisci font"
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr "Grande"
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "Seleziona font"
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr "Font"
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "Colore testo"
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr "Colore"
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr "Colore sfondo"
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "Salva la conversazione"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "Inserisci link"
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr "Link"
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr "Inserisci faccina"
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "Faccine"
-
-#: src/conversation.c:2272
-#, fuzzy
-msgid "Insert IM Image"
-msgstr "Immagine di IM"
-
-#: src/conversation.c:2272
-#, fuzzy
-msgid "Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "Immagine di IM"
 
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "Chiudi"
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "Opzioni"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "Abilita i log"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr "Log"
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr "Salva la conversazione"
-
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr "Salva"
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
-msgstr ""
-
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr "Suoni"
-
-#: src/conversation.c:2782
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "Abilita suoni"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversazioni"
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Manda messaggio come: "
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Salva icona"
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Disabilita animazione"
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Abilita animazione"
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Nascondi icona"
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Salva icona come..."
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "Gaim - Avvisa l'utente?"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "Vuoi davvero avvisare %s?"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "Avvisa come anonimo?"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "Gli avvisi anonimi sono meno aggressivi."
 
-#: src/dialogs.c:471
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Rimozione di '%s' da lista contatti.\n"
 
-#: src/dialogs.c:496
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - Rimuovi %s?"
-
-#: src/dialogs.c:509
-msgid "Remove Buddy"
-msgstr "Rimuovi Contatto"
-
-#: src/dialogs.c:519
-#, c-format
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "Nome account:"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
+msgstr "Account"
+
+#: src/dialogs.c:804
 msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
-msgstr ""
-"Stai per rimuovere '%s' dalla\n"
-"lista dei contatti. Vuoi continuare?"
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr "Accetta"
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - Utente IM"
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr "IM chi:"
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "Utente:"
-
-#: src/dialogs.c:816
-#, fuzzy
-msgid "Account:"
-msgstr "Account"
-
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "Gaim - Vedi info utente"
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr "Aggiungi Gruppo"
-
-#: src/dialogs.c:1004
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - Aggiungi Gruppo"
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "Gruppo"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Aggiungi Contatto"
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr "Aggiungi Contatto"
-
-#: src/dialogs.c:1110
-msgid "Contact"
-msgstr "Contatto"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Account: "
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Aggiungi a"
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Assente!"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
-msgstr ""
-
-#: src/dialogs.c:1451
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Imposta privacy per:"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Permetti a tutti di contattarmi"
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "Permetti solo agli utenti sotto"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "Permetti solo agli utenti sotto"
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr "Permetti alla lista"
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Nega a tutti"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Blocca gli utenti qui sotto"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "Lista dei bloccati"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Inserisci un contatto al salto."
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuovo Salto a Contatto"
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Salto a chi"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Account"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "Salto dove"
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Salto appena entrato"
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Salto appena tornato da Assente"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Salto appena tornato da Riposo"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "Salta quando Contatto ti scrive"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Azioni di salto"
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "Apri finestra di IM"
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Notifica Popup"
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Invia messaggio"
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Esegui il comando al salto"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Suona al salto"
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Salva questo salto dopo attivazione"
 
-#: src/dialogs.c:1971
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr "Salva"
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "Annulla"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Imposta Dir Info"
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Info Directory"
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Metti le tue info a disposizione nel Web"
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Nome"
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Secondo nome"
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Cognome"
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Nome da nubile"
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Stato civile"
 
-#: src/dialogs.c:2126
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr "Salva"
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Le nuove password non coincidono"
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Riempi completamente i campi"
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Cambio password"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Password attuale"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Nuova password"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Nuova password (di nuovo)"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "OK"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Imposta info utente"
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Sotto i risultati della ricerca: "
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Autorizza"
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr "Nega"
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Aggiugni Autorizzazione"
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Aggiungi Diniego"
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Registro Conversazione"
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Cerca Contatto"
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Cerca Contatto da Info"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Cerca Contatto da E-mail"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "Inserisci link"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Aggiungi URL"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Seleziona colore testo"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Seleziona colore sfondo"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "Seleziona font"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importa in:"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importa lista dei contatti"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "Non puoi creare un messaggio di Assente con titolo vuoto"
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "Non puoi creare un messaggio di Assente vuoto"
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuovo messaggio di Assente"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Nuovo messaggio di Assente"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Titolo di Assente: "
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "Salva & Usa"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Utilizzo"
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "Salva & Usa"
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Sorridi!"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr "Alias Contatto"
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias Contatto"
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "Impossibile connettersi all'host"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Salva file di log"
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "File di configurazione %s non aperto."
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Cancello davvero il log?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "Va bene!"
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Conversazione"
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Rinomina Gruppo"
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr "Rinomina Gruppo"
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
-msgid "New name:"
-msgstr "Nuovo nome:"
-
-#: src/dialogs.c:4484
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Rinomina Contatto"
 
-#: src/dialogs.c:4494
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Rinomina Contatto"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "Nuovo nome:"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Seleziona script Perl"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "File di configurazione %s non aperto."
 
-#: src/html.c:183
+#: src/html.c:185
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
 msgstr "Ricevuto: '%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Errore apertura connessione.\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim non riesce a spedire il messaggio"
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "Nome account:"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "Protocollo:"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Carica Icona Contatto"
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "File icona Contatto:"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Esamina"
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "Reimposta"
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "Opzioni font"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "Nome account:"
 
-#: src/multi.c:559
+#: src/multi.c:653
 #, fuzzy
 msgid "Alias:"
 msgstr "Alias"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "Memorizzo password"
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Auto Login"
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "Notifica nuova mail"
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "Opzioni Proxy"
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "Notifica nuova mail"
+
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Opzioni"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "Registro dal server"
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Modifica Account"
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "Inserisci password"
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Password:"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "Entra"
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "Azioni protocollo"
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2911,40 +3456,45 @@
 "Non puoi entrare con questo account; non hai caricato il protocollo giusto "
 "oppure quel protocollo non ha una funzione di login."
 
-#: src/multi.c:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sei sicuro che vuoi eliminare %s?"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "Elimina"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editore Account"
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr "Seleziona tutti"
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr "Seleziona gli Auto"
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "Annulla selezione"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "Modifica"
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "Entra/Esci"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr "Elimina"
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "Nessuno"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Collegato: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Editore Account"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "Annulla"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -2953,535 +3503,556 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s non riesce a entrare"
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "Errore di iscrizione"
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 msgid "Notice"
 msgstr "Notifica"
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s non riesce a entrare"
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 #, fuzzy
 msgid "Connection Error"
 msgstr "Connessione chiusa."
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim - Lista Plugins"
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - Plugins"
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-#, fuzzy
-msgid "Loaded Plugins"
-msgstr "Plugins"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr "Seleziona tutti"
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr "Locazione file:"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr "Carica"
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "Carica plugin da file"
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr "Configura"
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "Configura impostazioni plugin selezionato"
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr "Ricarica"
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "Ricarica plugin selezionato"
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr "Scarica"
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "Scarica plugin selezionato"
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "Chiudi finestra"
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr "Opzioni generali"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "Mostra finestra debug"
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "Bottoni senza bordo"
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "Stato civile"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr "Grassetto"
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr "Corsivo"
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr "Sottolineato"
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr "Testo barrato"
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr "Annulla"
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "Inserisci faccina"
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "Inserisci faccina"
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr "Colore"
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "Colore testo"
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "Colore sfondo"
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr "Visualizzazioni Contatto"
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "Mostra faccine grafiche"
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "Mostra tempo nei messaggi"
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "Mostra URL come link"
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "Evidenzia parole errate"
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "Ignora i colori"
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "Ignora il seme dei font"
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "Ignora la dimensione dei font"
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "Ignora messaggi automatizzati TiK"
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "Tasto 'Invio' manda messaggio"
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl-Invio manda messaggio"
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "Finestra di IM"
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "Esc chiude la finestra"
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "Esc chiude la finestra"
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Ctrl-{B/I/U/S} inserisce tag HTML"
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "Ctrl-(numero) inserisce faccina"
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr "In basso"
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "Nascondi bottoni IM/Info/Chat"
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "Mostra figure su bottoni"
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "Finestra lista contatti"
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "Salva posiz./dimens. finestra"
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "Evidenzia finestra ad un evento"
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr "Visualizzazioni Gruppo"
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "Nascondi gruppi senza contatti collegati"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "Mostra numeri nei gruppi"
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr "Visualizzazioni Contatto"
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 #, fuzzy
 msgid "Show buddy type _icons"
 msgstr "Mostra tipo icone di contatto"
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "Mostra livelli di avviso"
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "Mostra tempi di Riposo"
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 #, fuzzy
 msgid "Grey i_dle buddies"
 msgstr "Ingrigisci contatti in Riposo"
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "Finestra di IM"
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "Mostra i bottoni come: "
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "Figure"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "Testo"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "Testo e Figure"
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "Nuova larghezza finestra:"
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "Nuova altezza finestra:"
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "Altezza campo di testo:"
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "Evidenzia finestra ad un evento"
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "Nascondi finestra dopo l'invio"
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "Icone Contatti"
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "Nascondi Icone Contatti"
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "Disabilita animazione"
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "Mostra account nella finestra"
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr "Notifica Popup"
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "Notifica a contatti che stai scrivendo"
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "Completamento col TAB"
 
-#: src/prefs.c:505
-#, fuzzy
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "Il tasto TAB completa il nome"
 
-#: src/prefs.c:506
-#, fuzzy
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "Completamento di TAB all'antica"
 
-#: src/prefs.c:509
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr "Mostra chi entra/esce dalla finestra"
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Posizione linguetta"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr "In alto"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "In basso"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr "A sinistra"
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "A destra"
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "Tutte le chat in una finestra a schede"
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 #, fuzzy
 msgid "Show a_liases in tabs/titles"
 msgstr "Alias nelle linguette/titoli schede"
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr "Chat"
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "Tutte le chat in una finestra a schede"
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Tutte le chat in una finestra a schede"
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr "Lista contatti"
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "Tipo di Proxy"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Tipo di Proxy"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Nessun Proxy"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Server Proxy"
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr "Host"
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr "Porta"
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr "Utente"
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr "Password"
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "Browser"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr "Manuale"
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr "Opzioni Proxy"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "Crea nuova finestra di default"
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr "Messaggi"
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr "Nuovo messaggio"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "Log di tutte le conversazioni"
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr "Elimina HTML da log"
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "Vedi log di sistema"
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "Log quando i contatti entrano/escono"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Log quando contatti dis/attivano Riposo"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "Log quando contatti dis/attivano Assente"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Log tuoi stati di Ingresso/Riposo/Assente"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "File di log individuale per ogni contatto"
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "Opzioni suoni"
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "Nessun suono quando entri"
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "Suona quando Assente"
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr "Opzioni suoni"
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "Opzioni suoni"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "Errore interno"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3490,159 +4061,226 @@
 "Comando per suonare i file dei suoni\n"
 "(%s per il nome del file, interno se vuoto)"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "Spedire un messaggio rimuove stato Assente"
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "Accoda nuovi messaggi se sei Assente"
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "Ignora nuove conversazioni se Assente"
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "Non rispondere in automatico"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "Non rispondere in automatico"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "Auto-rispondi solo quando a Riposo"
 
-#: src/prefs.c:828
-#, fuzzy
-msgid "Idle"
-msgstr "A riposo: "
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "Non rispondere in automatico"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr "Nessuno"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Uso di Gaim"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "Uso di X"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "Finestra di IM"
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr "Assente"
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "Messaggio di Assente"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Configurazione Suoni"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Test"
 msgstr "Testo"
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "Scegli..."
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr "Modifica"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 #, fuzzy
 msgid "Interface"
 msgstr "Istanza:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr "Font"
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr "Messaggi"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "Finestra di IM"
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "Finestra chat gruppo"
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "Browser"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "Log"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr "Suoni"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr "Eventi"
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Titolo di Assente: "
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "Messaggio di Assente"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr "Plugins"
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferenze"
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Finestra di output del debug di Gaim"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
-msgstr ""
-
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"not the same version I cannot safely tell you which one it was. Needless to "
-"say, it was not successfully loaded."
-msgstr ""
-"Hai tentato di caricare un protocollo che noon  stato compilato per la "
-"stessa versione del sorgente di questa applicazione. Sfortunatamente, per "
-"questo motivo non ti posso dire con certezza qual'. Inutile dire che non  "
-"stato caricato."
-
-#: src/prpl.c:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "Mostra finestra debug"
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3650,33 +4288,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s stava usando %s, che  stato rimosso. %s ora  disconnesso."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "Accetti?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nuova mail"
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "Apri la mail"
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, 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:590
+#: src/prpl.c:634
 #, fuzzy
 msgid ""
 "\n"
@@ -3687,7 +4320,7 @@
 "\n"
 "Vuoi aggiungerli alla tua lista dei contatti?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3695,88 +4328,399 @@
 "Attualmente c' nessun protocollo che ti permetta di registrarti con nuovi "
 "account."
 
-#: src/prpl.c:670
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrazione"
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr "Informazioni sulla registrazione"
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 msgid "Register"
 msgstr "Registra"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Inserisci la password"
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d messaggi)"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 messaggio)"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr "Si"
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1101
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Informazioni in pi"
 
-#: src/sound.c:63
+#: src/sound.c:68
 #, fuzzy
 msgid "Buddy logs in"
 msgstr "Icona della persona"
 
-#: src/sound.c:64
+#: src/sound.c:69
 #, fuzzy
 msgid "Buddy logs out"
 msgstr "Suona quando un contatto esce"
 
-#: src/sound.c:65
+#: src/sound.c:70
 #, fuzzy
 msgid "Message received"
 msgstr "Suona quando ricevi un messaggio"
 
-#: src/sound.c:66
+#: src/sound.c:71
 #, fuzzy
 msgid "Message received begins conversation"
 msgstr "Suona ad un messaggio di inizio conversazione"
 
-#: src/sound.c:67
+#: src/sound.c:72
 #, fuzzy
 msgid "Message sent"
 msgstr "Messaggi"
 
-#: src/sound.c:68
+#: src/sound.c:73
 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 "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:75
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:76
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "Hai perso %d messaggi da %s perch erano troppo cattivi."
+
+#, 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>"
+#~ 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>"
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Autentificazione fallita."
+
+#~ 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 ""
+#~ "Hai scelto di aprire in canale diretto di IM con %s. In questo modo gli "
+#~ "permetterai di vedere il tuo indirizzo IP, rischiando per la sicurezza "
+#~ "del tuo sistema. Vuoi continuare?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Active Developers\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Crazy Patch Writers\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Retired Developers\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+#~ msgstr ""
+#~ "Sviluppatori Attivi\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Folli che scrivono le Patch\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Sviluppatori ritirati\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+
+#~ msgid "Web Site"
+#~ msgstr "Sito Web"
+
+#~ msgid "Password: "
+#~ msgstr "Password: "
+
+#~ msgid "About"
+#~ msgstr "Informazioni"
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr "Esegui script"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "Anunulla tutti gli script"
+
+#~ msgid "List Scripts"
+#~ msgstr "Elenco script"
+
+#~ msgid "Whisper"
+#~ msgstr "Msg privato"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Salva la conversazione"
+
+#~ msgid "Currently at %d, "
+#~ msgstr "Al momento a %d, "
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "Imposta posizione a %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr "Testo Grassetto"
+
+#~ msgid "Bold"
+#~ msgstr "Grassetto"
+
+#~ msgid "Italics Text"
+#~ msgstr "Testo Corsivo"
+
+#~ msgid "Italics"
+#~ msgstr "Corsivo"
+
+#~ msgid "Underline Text"
+#~ msgstr "Testo Sottolineato"
+
+#~ msgid "Underline"
+#~ msgstr "Sottolineato"
+
+#~ msgid "Strike through Text"
+#~ msgstr "Testo barrato"
+
+#~ msgid "Strike"
+#~ msgstr "Barrato"
+
+#~ msgid "Decrease font size"
+#~ msgstr "Riduci font"
+
+#~ msgid "Small"
+#~ msgstr "Piccolo"
+
+#~ msgid "Normal font size"
+#~ msgstr "Font normale"
+
+#~ msgid "Normal"
+#~ msgstr "Normale"
+
+#~ msgid "Increase font size"
+#~ msgstr "Ingrandisci font"
+
+#~ msgid "Big"
+#~ msgstr "Grande"
+
+#~ msgid "Font"
+#~ msgstr "Font"
+
+#~ msgid "Text Color"
+#~ msgstr "Colore testo"
+
+#~ msgid "Background Color"
+#~ msgstr "Colore sfondo"
+
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "Inserisci faccina"
+
+#~ msgid "Smiley"
+#~ msgstr "Faccine"
+
+#, fuzzy
+#~ msgid "Image"
+#~ msgstr "Immagine di IM"
+
+#~ msgid "Sound"
+#~ msgstr "Suoni"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - Avvisa l'utente?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "Vuoi davvero avvisare %s?"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - Rimuovi %s?"
+
+#~ msgid "Remove Buddy"
+#~ msgstr "Rimuovi Contatto"
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "Stai per rimuovere '%s' dalla\n"
+#~ "lista dei contatti. Vuoi continuare?"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - Utente IM"
+
+#~ msgid "IM who:"
+#~ msgstr "IM chi:"
+
+#~ msgid "User:"
+#~ msgstr "Utente:"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim - Vedi info utente"
+
+#~ msgid "Add Group"
+#~ msgstr "Aggiungi Gruppo"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Aggiungi Contatto"
+
+#~ msgid "Contact"
+#~ msgstr "Contatto"
+
+#~ msgid "Allow List"
+#~ msgstr "Permetti alla lista"
+
+#~ msgid "Block List"
+#~ msgstr "Lista dei bloccati"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "Alias Contatto"
+
+#~ msgid "Rename Group"
+#~ msgstr "Rinomina Gruppo"
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim non riesce a spedire il messaggio"
+
+#~ msgid "Select All"
+#~ msgstr "Seleziona tutti"
+
+#~ msgid "Select Autos"
+#~ msgstr "Seleziona gli Auto"
+
+#~ msgid "Select None"
+#~ msgstr "Annulla selezione"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "Entra/Esci"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim - Lista Plugins"
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - Plugins"
+
+#, fuzzy
+#~ msgid "Loaded Plugins"
+#~ msgstr "Plugins"
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr "Seleziona tutti"
+
+#~ msgid "Filepath:"
+#~ msgstr "Locazione file:"
+
+#~ msgid "Load"
+#~ msgstr "Carica"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "Carica plugin da file"
+
+#~ msgid "Configure"
+#~ msgstr "Configura"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "Configura impostazioni plugin selezionato"
+
+#~ msgid "Reload"
+#~ msgstr "Ricarica"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "Ricarica plugin selezionato"
+
+#~ msgid "Unload"
+#~ msgstr "Scarica"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "Scarica plugin selezionato"
+
+#~ msgid "Close this window"
+#~ msgstr "Chiudi finestra"
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "Bottoni senza bordo"
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "Ignora messaggi automatizzati TiK"
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "Evidenzia finestra ad un evento"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Finestra di output del debug di Gaim"
+
+#~ 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 ""
+#~ "Hai tentato di caricare un protocollo che noon  stato compilato per la "
+#~ "stessa versione del sorgente di questa applicazione. Sfortunatamente, per "
+#~ "questo motivo non ti posso dire con certezza qual'. Inutile dire che non "
+#~ " stato caricato."
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s stava usando %s, che  stato rimosso. %s ora  disconnesso."
+
+#~ msgid "Accept?"
+#~ msgstr "Accetti?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Errore Gadu-Gadu"
 
@@ -3801,18 +4745,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "Password NON cambiata (%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "Non esiste quel soprannome/canale"
-
-#~ msgid "IRC Error"
-#~ msgstr "Errore IRC"
-
-#~ msgid "No such server"
-#~ msgstr "Il server non esiste"
-
-#~ msgid "IRC Part"
-#~ msgstr "Parte IRC"
-
 #, fuzzy
 #~ msgid "Password Change Error!"
 #~ msgstr "Gaim - Cambio password"
@@ -3828,9 +4760,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "Errore MSN"
 
-#~ msgid "Invalid name"
-#~ msgstr "Nome non valido"
-
 #~ msgid "Chat Error!"
 #~ msgstr "Errore di chat!"
 
@@ -3846,9 +4775,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "Motivo sconosciuto."
 
-#~ msgid "AOL error"
-#~ msgstr "Errore AOL"
-
 #~ msgid "Error"
 #~ msgstr "Errore"
 
@@ -3952,15 +4878,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "Rapporto tempi Riposo"
 
-#~ msgid "None"
-#~ msgstr "Nessuno"
-
-#~ msgid "Gaim Use"
-#~ msgstr "Uso di Gaim"
-
-#~ msgid "X Use"
-#~ msgstr "Uso di X"
-
 #~ msgid "Opera"
 #~ msgstr "Opera"
 
@@ -3980,9 +4897,6 @@
 #~ "Non tutti i protocolli usano queste opzioni proxy. Leggi il file README "
 #~ "per i dettagli."
 
-#~ msgid "No Proxy"
-#~ msgstr "Nessun Proxy"
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -3995,13 +4909,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Opzioni lista contatti"
 
-#, fuzzy
-#~ msgid "Tab Placement:"
-#~ msgstr "Posizione linguetta"
-
-#~ msgid "Top"
-#~ msgstr "In alto"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Opzioni conversazione"
 
@@ -4017,42 +4924,18 @@
 #~ msgid "IM Options"
 #~ msgstr "Opzioni IM"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "Mostra i bottoni come: "
-
-#~ msgid "Pictures And Text"
-#~ msgstr "Testo e Figure"
-
-#~ msgid "Pictures"
-#~ msgstr "Figure"
-
-#~ msgid "Text"
-#~ msgstr "Testo"
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "Tutte le conversazioni in una finestra a schede"
-
 #~ msgid "Window Sizes"
 #~ msgstr "Dimensione finestra"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Posizione linguetta"
 
-#~ msgid "Left"
-#~ msgstr "A sinistra"
-
-#~ msgid "Right"
-#~ msgstr "A destra"
-
 #~ msgid "Chat Options"
 #~ msgstr "Opzioni di Chat"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Tutte le conversazioni in una finestra a schede"
 
-#~ msgid "Font Options"
-#~ msgstr "Opzioni font"
-
 #~ msgid "Italic Text"
 #~ msgstr "Testo corsivo"
 
@@ -4087,15 +4970,9 @@
 #~ msgid "Conversations"
 #~ msgstr "Conversazioni"
 
-#~ msgid "Enable sounds"
-#~ msgstr "Abilita suoni"
-
 #~ msgid "KFM"
 #~ msgstr "KFM"
 
-#~ msgid "Manual"
-#~ msgstr "Manuale"
-
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "Suona quando un contatto entra"
 
--- a/po/ja.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/ja.po	Sun Jan 05 23:21:50 2003 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim version CVS-20021114\n"
-"POT-Creation-Date: 2002-12-14 01:21+0900\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\n"
 "PO-Revision-Date: 2002-12-14 10:55+0900\n"
 "Last-Translator: Taku YASUI <tach@debian.or.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -14,111 +14,127 @@
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/docklet/docklet.c:92 src/multi.c:251
-msgid "Auto-login"
-msgstr "ư"
-
-#: plugins/docklet/docklet.c:117
+#: plugins/docklet/docklet.c:119
 msgid "New..."
 msgstr "..."
 
-#: plugins/docklet/docklet.c:121 src/protocols/gg/gg.c:75
-#: src/protocols/jabber/jabber.c:1165 src/buddy.c:499 src/buddy.c:2538
-#: src/buddy.c:2668 src/prefs.c:725
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
 msgid "Away"
 msgstr "Υ"
 
-#: plugins/docklet/docklet.c:125 src/away.c:484
+#: plugins/docklet/docklet.c:129 src/away.c:485
 msgid "Back"
 msgstr ""
 
-#: plugins/docklet/docklet.c:130 src/buddy.c:2654
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+msgid "Auto-login"
+msgstr "ư"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
 msgid "Signoff"
 msgstr "󥪥"
 
-#: plugins/docklet/docklet.c:138
+#: plugins/docklet/docklet.c:151
 msgid "Mute Sounds"
 msgstr "ò"
 
-#: plugins/docklet/docklet.c:143
-msgid "Accounts"
-msgstr ""
-
-#: plugins/docklet/docklet.c:154
-msgid "About"
-msgstr "Gaim ɥååȤˤĤ"
-
-#: plugins/docklet/docklet.c:382
-msgid "Docklet Configuration"
-msgstr "ɥååȤ"
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr " (_A)"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr " (_P) ..."
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "GaimˤĤ"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Ĥ"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - "
 
 #. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
 #. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
 #. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
-#: plugins/docklet/docklet.c:391
-msgid "_Hide new messages until docklet is clicked"
+#: plugins/docklet/docklet.c:409
+#, fuzzy
+msgid "_Hide new messages until tray icon is clicked"
 msgstr "ɥååȤåޤǡå򱣤"
 
-#: plugins/docklet/docklet.c:403
+#: plugins/docklet/docklet.c:421
 msgid "Tray Icon"
 msgstr "ȥ쥤"
 
-#: plugins/docklet/docklet.c:405 plugins/docklet/docklet.c:416
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+#, fuzzy
 msgid ""
 "Interacts with a System Tray applet (in GNOME or KDE, for example) to "
 "display the current status of Gaim, allow fast access to commonly used "
-"functions, and to toggle display of the buddy list or login window."
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
 msgstr ""
 "Gaim θߤξɽꡢŪѤ뵡ǽˤФ䤯\n"
 "ꡢͧãꥹȤȥ󥦥ɥɽڤؤΤˡʤȤ\n"
 "GNOME  KDE Ρ˥ƥȥ쥤ץåȤȾȤꤷޤ"
 
-#: plugins/docklet/docklet.c:406
+#: plugins/docklet/docklet.c:424
 msgid "Robert McQueen &lt;robot101@debian.org>"
 msgstr "Robert McQueen &lt;robot101@debian.org>"
 
-#: plugins/docklet/docklet.c:412
-msgid "System Tray Docklet"
+#: plugins/docklet/docklet.c:430
+#, fuzzy
+msgid "System Tray Icon"
 msgstr "ƥȥ쥤ɥåå"
 
-#: plugins/chatlist.c:69 src/buddy_chat.c:281
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "֥å"
 
-#: plugins/chatlist.c:162 plugins/chatlist.c:164 plugins/chatlist.c:353
-#: plugins/chatlist.c:355
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Gaim å"
 
-#: plugins/chatlist.c:304
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "åȥ롼"
 
-#: plugins/chatlist.c:316
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr ""
 
 #. buttons
-#: plugins/chatlist.c:317 src/protocols/icq/gaim_icq.c:279
-#: src/protocols/oscar/oscar.c:2110 src/buddy.c:494 src/buddy.c:2766
-#: src/buddy_chat.c:908 src/buddy_chat.c:1565 src/conversation.c:2441
-#: src/conversation.c:3020 src/dialogs.c:1115 src/dialogs.c:1457
-#: src/dialogs.c:1491 src/dialogs.c:2494 src/prpl.c:638
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "ɲ"
 
-#: plugins/chatlist.c:318 src/buddy.c:496 src/buddy.c:2768
-#: src/buddy_chat.c:906 src/buddy_chat.c:1567 src/conversation.c:2427
-#: src/conversation.c:3017 src/dialogs.c:1461 src/dialogs.c:1495
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr ""
 
-#: plugins/chatlist.c:334
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "äǤåȤΰ"
 
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "äƤåȤΰ"
 
@@ -151,8 +167,122 @@
 msgid "Change"
 msgstr "ѹ"
 
-#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:1867
-#: src/protocols/msn/msn.c:1968
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "%sե񤭹ޤ"
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "󤷤Ƥޤ"
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "IM ɥ"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "åȥɥ"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "ݥåץå"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "ݥåץå"
+
+#: plugins/notify.c:609
+#, fuzzy
+msgid "Remove when conversation window gains _focus"
+msgstr "%s ϲåɥĤޤ"
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+#, fuzzy
+msgid "Remove when _typing in conversation window"
+msgstr "%s ϲåɥĤޤ"
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "³Ǥޤ"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "ƥ"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+#, fuzzy
+msgid "History"
+msgstr "ҥȥ򸫤 (_H)"
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "ʹβäǤϼưʤ (_N)"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Ļ"
 
@@ -204,165 +334,167 @@
 msgid "Unknown Error Code."
 msgstr "ǽʥ"
 
-#: src/protocols/gg/gg.c:285 src/protocols/msn/msn.c:1998
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
 
-#: src/protocols/gg/gg.c:306
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "³Ǥޤ"
 
-#: src/protocols/gg/gg.c:313
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "åȤɤޤ"
 
-#: src/protocols/gg/gg.c:426
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "³Ǥޤ"
 
-#: src/protocols/gg/gg.c:439
-msgid "Reading data"
-msgstr "ǡɤ߹"
-
 #: src/protocols/gg/gg.c:442
+msgid "Reading data"
+msgstr "ǡɤ߹"
+
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:445
-msgid "Reading server key"
-msgstr "Хɤ߹"
-
 #: src/protocols/gg/gg.c:448
+msgid "Reading server key"
+msgstr "Хɤ߹"
+
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "ϥå奭θ"
 
-#: src/protocols/gg/gg.c:457
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "GG饤֥̿Ūʥ顼\n"
 
-#: src/protocols/gg/gg.c:477 src/protocols/gg/gg.c:577
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s ؤ³˼Ԥޤ"
 
-#: src/protocols/gg/gg.c:528
+#: src/protocols/gg/gg.c:531
 msgid "Unable to ping server"
 msgstr "pingǤޤ"
 
-#: src/protocols/gg/gg.c:540
+#: src/protocols/gg/gg.c:543
 msgid "Send as message"
 msgstr "å"
 
-#: src/protocols/gg/gg.c:548
+#: src/protocols/gg/gg.c:551
 msgid "Looking up GG server"
 msgstr "GGи"
 
-#: src/protocols/gg/gg.c:551
+#: src/protocols/gg/gg.c:554
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "̵Gadu-Gadu UINǤ"
 
-#: src/protocols/gg/gg.c:601
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "̵Gadu-Gadu UIN˥åȤƤޤ"
 
-#: src/protocols/gg/gg.c:664
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "̤ޤǤ"
 
-#: src/protocols/gg/gg.c:669
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 󥸥"
 
-#: src/protocols/gg/gg.c:694
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "ͭ"
 
-#: src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "Ϥ"
 
-#: src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr ""
 
-#: src/protocols/gg/gg.c:699
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:703
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:708
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "̾"
 
-#: src/protocols/gg/gg.c:712
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "˥å"
 
-#: src/protocols/gg/gg.c:719 src/protocols/gg/gg.c:722
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "ǯ"
 
-#: src/protocols/gg/gg.c:728 src/protocols/gg/gg.c:730
-#: src/protocols/gg/gg.c:732
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr ""
 
 #. Line 5
-#: src/protocols/gg/gg.c:736 src/dialogs.c:2027 src/dialogs.c:2730
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Į"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:771
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu о¸줿ͧãꥹȤϤޤ"
 
-#: src/protocols/gg/gg.c:774
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "ФͧãꥹȤμߤǤޤǤ"
 
-#: src/protocols/gg/gg.c:821
+#: src/protocols/gg/gg.c:824
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Gadu-Gadu ФؤͧãꥹȤžޤ"
 
-#: src/protocols/gg/gg.c:826
+#: src/protocols/gg/gg.c:829
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "ͧãꥹȤ Gadu-Gadu ФؤžǤޤ"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:835
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Gadu-Gadu ФͧãꥹȤޤ"
 
-#: src/protocols/gg/gg.c:837
+#: src/protocols/gg/gg.c:840
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Gadu-Gadu ФͧãꥹȤǤޤ"
 
-#: src/protocols/gg/gg.c:843
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "ѥѹǤޤ"
 
-#: src/protocols/gg/gg.c:848
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "ѥѹǤޤǤ"
 
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Gadu-Gadu ФȤ̿˥顼"
 
-#: src/protocols/gg/gg.c:960
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
-msgstr "Gaim  Gadu-Gadu HTTP ФȤ꤬̿ȯᡢ׵᤬λǤޤǤȤǤ⤦ɻƤߤƤ"
-
-#: src/protocols/gg/gg.c:987
+msgstr ""
+"Gaim  Gadu-Gadu HTTP ФȤ꤬̿ȯᡢ׵᤬λǤޤ"
+"ǤȤǤ⤦ɻƤߤƤ"
+
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu ͧãꥹȤޤ"
 
-#: src/protocols/gg/gg.c:988
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -370,26 +502,26 @@
 "Gaim  Gadu-Gadu ͧãꥹȥФ³ǤޤǤȤǤ⤦ٻ"
 "ƤߤƤ"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1048
 msgid "Couldn't export buddy list"
 msgstr "ͧãꥹȤΥݡȤǤޤǤ"
 
-#: src/protocols/gg/gg.c:1046 src/protocols/gg/gg.c:1068
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim  ͧãꥹȥФ³ǤޤǤȤǤ⤦ٻƤߤƤ"
 ""
 
-#: src/protocols/gg/gg.c:1067
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu ͧãꥹȤǤޤ"
 
-#: src/protocols/gg/gg.c:1115
+#: src/protocols/gg/gg.c:1118
 msgid "Unable to access directory"
 msgstr "ǥ쥯ȥ˥Ǥޤ"
 
-#: src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -397,11 +529,11 @@
 "Gaim ϥǥ쥯ȥꥵФ³ǤʤäΤǡǥ쥯ȥ򸡺Ǥޤ"
 "ǤȤǤ⤦ٻƤߤƤ"
 
-#: src/protocols/gg/gg.c:1148
+#: src/protocols/gg/gg.c:1151
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Gadu-Gadu ΥѥɤѹǤޤ"
 
-#: src/protocols/gg/gg.c:1149
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -409,7 +541,7 @@
 "Gaim  Gadu-Gadu Ф³˥顼ȯᡢѥɤѹǤ"
 "ޤǤȤǤ⤦ٻƤߤƤ"
 
-#: src/protocols/gg/gg.c:1159 src/protocols/gg/gg.c:1176
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "ǥ쥯ȥ긡"
 
@@ -417,29 +549,28 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1161 src/protocols/gg/gg.c:1178
-#: src/protocols/jabber/jabber.c:4144 src/protocols/jabber/jabber.c:4157
-#: src/dialogs.c:2143
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "ѥѹ"
 
-#: src/protocols/gg/gg.c:1163 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "Ф֥ꥹȤΥݡ"
 
-#: src/protocols/gg/gg.c:1165 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "Ф֥ꥹȤ򥨥ݡ"
 
-#: src/protocols/gg/gg.c:1167 src/protocols/gg/gg.c:1182
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "Ф֥ꥹȤ"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1214
 msgid "Unable to access user profile."
 msgstr "桼ץե˥Ǥޤ"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -447,11 +578,11 @@
 "Gaim ϥǥ쥯ȥꥵФؤ³˥顼ȯᡢΥ桼Υץ"
 "ե˥ǤޤǤȤǤ⤦ٻƤߤƤ"
 
-#: src/protocols/gg/gg.c:1290
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
 msgid "Nick:"
 msgstr "˥å:"
 
-#: src/protocols/gg/gg.c:1291
+#: src/protocols/gg/gg.c:1294
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 桼"
 
@@ -459,27 +590,27 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "ICQ Фؤ³˥顼ȯޤ"
 
-#: src/protocols/icq/gaim_icq.c:279 src/protocols/irc/irc.c:1288
-#: src/protocols/oscar/oscar.c:1985 src/protocols/oscar/oscar.c:4479
-#: src/protocols/toc/toc.c:1985 src/buddy_chat.c:313 src/buddy_chat.c:401
-#: src/dialogs.c:1111 src/dialogs.c:2081 src/dialogs.c:2204 src/dialogs.c:2263
-#: src/dialogs.c:2483 src/dialogs.c:2664 src/dialogs.c:2837 src/dialogs.c:2908
-#: src/dialogs.c:3540 src/dialogs.c:3729 src/dialogs.c:3905 src/dialogs.c:4287
-#: src/dialogs.c:4392 src/dialogs.c:5135 src/multi.c:1036 src/multi.c:1135
-#: src/prpl.c:276 src/prpl.c:638
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
 msgid "Cancel"
 msgstr ""
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
-#: src/protocols/msn/msn.c:878 src/protocols/msn/msn.c:1033
-#: src/protocols/oscar/oscar.c:2026
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
 msgid "Authorize"
 msgstr "ǧ"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
-#: src/protocols/msn/msn.c:878 src/protocols/msn/msn.c:1033
-#: src/protocols/oscar/oscar.c:2026 src/protocols/oscar/oscar.c:2110
-#: src/dialogs.c:2475 src/dialogs.c:2482
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
 msgid "Deny"
 msgstr ""
 
@@ -487,13 +618,18 @@
 msgid "Send message through server"
 msgstr "зͳǥå"
 
-#: src/protocols/icq/gaim_icq.c:467 src/protocols/irc/irc.c:2638
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
 #: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
-#: src/protocols/oscar/oscar.c:4518 src/protocols/oscar/oscar.c:4570
-#: src/protocols/toc/toc.c:1257
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr ""
 
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Gaim ˡ"
+
 #: src/protocols/irc/irc.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
@@ -502,7 +638,7 @@
 "ʤΥåѴݤ˥顼ȯޤȥǥ '"
 "󥳡' ץǧƤ"
 
-#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2348
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCCå %s Ĥޤ"
@@ -511,7 +647,7 @@
 msgid "No topic is set"
 msgstr "ȥԥåꤵƤޤ"
 
-#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1539
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%sΥȥԥåѤޤ: %s</B>"
@@ -573,14 +709,14 @@
 "2 Υԥ塼ľ³򤹤ɬפޤå IRC Ф"
 "ͳޤ"
 
-#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:1985
-#: src/protocols/oscar/oscar.c:4479
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
 msgid "Connect"
 msgstr "³"
 
-#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:276
-#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1058
-#: src/protocols/msn/msn.c:1543
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "񤭹ޤ"
 
@@ -594,48 +730,63 @@
 msgid "Kicked by %s: %s"
 msgstr "%sˤ꽳ޤ: %s"
 
-#: src/protocols/irc/irc.c:1457 src/protocols/irc/irc.c:2657
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
 msgid "CTCP ClientInfo"
 msgstr "CTCP 饤Ⱦ"
 
-#: src/protocols/irc/irc.c:1463 src/protocols/irc/irc.c:2663
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
 msgid "CTCP UserInfo"
 msgstr "CTCP 桼"
 
-#: src/protocols/irc/irc.c:1469 src/protocols/irc/irc.c:2669
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
 msgid "CTCP Version"
 msgstr "CTCP С"
 
-#: src/protocols/irc/irc.c:1489 src/protocols/irc/irc.c:2675
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1969
+#: src/protocols/irc/irc.c:1972
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "%s Υȥԥå %s Ǥ"
 
-#: src/protocols/irc/irc.c:2061
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "%s ȴޤ"
 
-#: src/protocols/irc/irc.c:2062
+#: src/protocols/irc/irc.c:2065
 msgid "IRC Part"
 msgstr "IRC ȴ"
 
-#: src/protocols/irc/irc.c:2229
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "ͥ:"
 
-#: src/protocols/irc/irc.c:2233 src/aim.c:310 src/multi.c:637
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "ѥ:"
 
-#: src/protocols/irc/irc.c:2644
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC å"
 
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr ":"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "ݡֹ"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
 #: src/protocols/jabber/jabber.c:972
 msgid "Unable to change password."
 msgstr "ѥɤѹǤޤ"
@@ -662,8 +813,8 @@
 msgid "Unknown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1167 src/protocols/jabber/jabber.c:1185
-#: src/buddy.c:2801 src/multi.c:241
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "饤"
 
@@ -704,8 +855,8 @@
 msgid "No such user."
 msgstr "Τ褦ʥ桼Ϥޤ"
 
-#: src/protocols/jabber/jabber.c:1757 src/protocols/msn/msn.c:1068
-#: src/dialogs.c:908
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "ͧã"
 
@@ -721,13 +872,13 @@
 msgid "Password successfully changed."
 msgstr "ѥɤѹޤ"
 
-#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4072
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "³ڤޤ"
 
 #: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
-#: src/protocols/jabber/jabber.c:4074 src/protocols/jabber/jabber.c:4120
-#: src/protocols/msn/msn.c:1693 src/protocols/msn/msn.c:1722
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "³Ǥޤ"
 
@@ -740,7 +891,7 @@
 msgstr "ǧ׵"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1714
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "³"
 
@@ -757,10 +908,6 @@
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2860
-msgid "Server:"
-msgstr ":"
-
 #: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "ϥɥ:"
@@ -777,8 +924,8 @@
 msgid "View Error Msg"
 msgstr "顼򸫤"
 
-#: src/protocols/jabber/jabber.c:3246 src/protocols/oscar/oscar.c:4531
-#: src/buddy_chat.c:895
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Υʥå"
 
@@ -798,272 +945,272 @@
 msgid "Cancel Presence Notification"
 msgstr "¸Τ"
 
-#: src/protocols/jabber/jabber.c:3472
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "̾"
 
-#: src/protocols/jabber/jabber.c:3473
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "̾"
 
-#: src/protocols/jabber/jabber.c:3474
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "̾"
 
-#: src/protocols/jabber/jabber.c:3475
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "˥å͡"
 
-#: src/protocols/jabber/jabber.c:3476 src/dialogs.c:2921
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3477
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3478
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "¾"
 
-#: src/protocols/jabber/jabber.c:3479
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3480
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3481
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "͹ֹ"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3482 src/dialogs.c:2049 src/dialogs.c:2752
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3483
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "ֹ"
 
-#: src/protocols/jabber/jabber.c:3484 src/dialogs.c:2826
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "᡼륢ɥ쥹"
 
-#: src/protocols/jabber/jabber.c:3485
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "ȿ̾"
 
-#: src/protocols/jabber/jabber.c:3486
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "°"
 
-#: src/protocols/jabber/jabber.c:3487
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3488
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3489
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3490 src/dialogs.c:2929 src/prefs.c:979
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3515
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 "ΥƥϤ٤ƥץǤŬ˴Ϥޤ"
 
-#: src/protocols/jabber/jabber.c:3516
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "桼 ID"
 
-#: src/protocols/jabber/jabber.c:3928
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCardˤäƳȯ줿"
 
-#: src/protocols/jabber/jabber.c:4002
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "ФϿޤ"
 
-#: src/protocols/jabber/jabber.c:4029
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "Ͽ顼"
 
-#: src/protocols/jabber/jabber.c:4138 src/protocols/jabber/jabber.c:4153
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "桼Ͽ"
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "󥿥å顼(¿ʬGAIMΥХ)"
 
-#: src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "ʥѥ᡼(¿ʬGAIMΥХ)"
 
-#: src/protocols/msn/msn.c:197
+#: src/protocols/msn/msn.c:228
 msgid "Invalid User"
 msgstr "̵ʥ桼"
 
-#: src/protocols/msn/msn.c:200
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr "FQDNޤ"
 
-#: src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr "Ǥ˥󤷤Ƥޤ"
 
-#: src/protocols/msn/msn.c:206
+#: src/protocols/msn/msn.c:237
 msgid "Invalid Username"
 msgstr "̵ʥ桼̾"
 
-#: src/protocols/msn/msn.c:209
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Friendly Name"
 msgstr "̵ͧ̾"
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr "ꥹȤäѤǤ"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr "Ǥˤˤޤ"
 
-#: src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:249
 msgid "Not on list"
 msgstr "ꥹȤˤޤ"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr "桼ե饤Ǥ"
 
-#: src/protocols/msn/msn.c:224
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr "Υ⡼ɤˤǤˤޤ"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr "ȿХꥹȤˤǤˤޤ"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr "åܡɼ"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr "ž"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr "ɬפʥեɤޤ"
 
-#: src/protocols/msn/msn.c:240 src/protocols/oscar/oscar.c:390
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 msgid "Not logged in"
 msgstr "󤷤Ƥޤ"
 
-#: src/protocols/msn/msn.c:244
+#: src/protocols/msn/msn.c:275
 msgid "Internal server error"
 msgstr "顼"
 
-#: src/protocols/msn/msn.c:247
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr "ǡ١Х顼"
 
-#: src/protocols/msn/msn.c:250
+#: src/protocols/msn/msn.c:281
 msgid "File operation error"
 msgstr "ե顼"
 
-#: src/protocols/msn/msn.c:253
+#: src/protocols/msn/msn.c:284
 msgid "Memory allocation error"
 msgstr "ݥ顼"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:288
 msgid "Server busy"
 msgstr "Хӥ"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:291
 msgid "Server unavailable"
 msgstr "Фդޤ"
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr "ԥΡƥե󥵡Ф󤷤Ƥޤ"
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:297
 msgid "Database connect error"
 msgstr "ǡ١³顼Ǥ"
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr "Фߤޤ(æФޤ礦)"
 
-#: src/protocols/msn/msn.c:273
+#: src/protocols/msn/msn.c:304
 msgid "Error creating connection"
 msgstr "³ϥ顼"
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr "åٲ"
 
-#: src/protocols/msn/msn.c:282
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr "桼ƥ֤ޤ"
 
-#: src/protocols/msn/msn.c:285
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr "å¿Ǥ"
 
-#: src/protocols/msn/msn.c:288
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr "ͽۤƤʤǡ"
 
-#: src/protocols/msn/msn.c:291
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr "ͧե"
 
-#: src/protocols/msn/msn.c:295
+#: src/protocols/msn/msn.c:326
 msgid "Authentication failed"
 msgstr "ǧڼ"
 
-#: src/protocols/msn/msn.c:298
+#: src/protocols/msn/msn.c:329
 msgid "Not allowed when offline"
 msgstr "ե饤ΤȤˤϤǤޤ"
 
-#: src/protocols/msn/msn.c:301
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr "桼դƤʤ"
 
-#: src/protocols/msn/msn.c:304
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr "桼ǧǤޤ"
 
-#: src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:338
 msgid "Unknown Error Code"
 msgstr "ʥ顼"
 
-#: src/protocols/msn/msn.c:453
+#: src/protocols/msn/msn.c:491
 #, c-format
 msgid "%s has closed the conversation window"
 msgstr "%s ϲåɥĤޤ"
 
-#: src/protocols/msn/msn.c:524
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr "MSN åǤʤä⤷ޤ"
 
-#: src/protocols/msn/msn.c:773
+#: src/protocols/msn/msn.c:1041
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim  MSN åޤǤ"
 
-#: src/protocols/msn/msn.c:774
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
@@ -1071,163 +1218,168 @@
 "Gaim  MSN åܡɥФ̿ݤ˥顼ȯޤۤɤ"
 "ɻƤߤƤ"
 
-#: src/protocols/msn/msn.c:807 src/protocols/msn/msn.c:826
-#: src/protocols/msn/msn.c:1797 src/protocols/msn/msn.c:1915
-#: src/protocols/msn/msn.c:1933 src/protocols/msn/msn.c:2033
-#: src/protocols/msn/msn.c:2046 src/protocols/msn/msn.c:2072
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2147
-#: src/protocols/msn/msn.c:2182 src/protocols/msn/msn.c:2216
-#: src/protocols/msn/msn.c:2257 src/protocols/msn/msn.c:2264
-#: src/protocols/msn/msn.c:2277 src/protocols/msn/msn.c:2285
-#: src/protocols/msn/msn.c:2314 src/protocols/msn/msn.c:2323
-#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2344
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
 msgid "Write error"
 msgstr "񤭹ߥ顼"
 
-#: src/protocols/msn/msn.c:875
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "桼 %s (%s)  %s ͧãꥹȤɲääƤޤ"
 
-#: src/protocols/msn/msn.c:925 src/protocols/msn/msn.c:1700
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
 msgid "Unable to write to server"
 msgstr "Фؽ񤭹ߤǤޤ"
 
-#: src/protocols/msn/msn.c:1032
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "桼 %s (%s) ʤͧãꥹȤɲääƤޤ"
 
-#: src/protocols/msn/msn.c:1133
+#: src/protocols/msn/msn.c:1401
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "㤦³ᡢǤޤ"
 
-#: src/protocols/msn/msn.c:1268 src/protocols/msn/msn.c:1584
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
 msgid "Got invalid XFR\n"
 msgstr " XFR\n"
 
-#: src/protocols/msn/msn.c:1308
+#: src/protocols/msn/msn.c:1576
 msgid "Error transfering"
 msgstr "ž顼"
 
-#: src/protocols/msn/msn.c:1392 src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 msgid "Error reading from server"
 msgstr "Фɤ߹ߤ˼"
 
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1744
 msgid "Unable to connect to Notification Server"
 msgstr "ΥФ³Ǥޤ"
 
-#: src/protocols/msn/msn.c:1483
+#: src/protocols/msn/msn.c:1751
 msgid "Unable to talk to Notification Server"
 msgstr "ΥФ̿Ǥޤ"
 
-#: src/protocols/msn/msn.c:1499
+#: src/protocols/msn/msn.c:1767
 msgid "Protocol not supported"
 msgstr "ץȥ뤬ݡȤƤޤ"
 
-#: src/protocols/msn/msn.c:1506
+#: src/protocols/msn/msn.c:1774
 msgid "Unable to request INF\n"
 msgstr "INF ׵Ǥޤ\n"
 
-#: src/protocols/msn/msn.c:1513
+#: src/protocols/msn/msn.c:1781
 msgid "Unable to login using MD5"
 msgstr "MD5 ѤƥǤޤ"
 
-#: src/protocols/msn/msn.c:1520
+#: src/protocols/msn/msn.c:1788
 msgid "Unable to send USR\n"
 msgstr "USR ޤ\n"
 
-#: src/protocols/msn/msn.c:1525
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr "ѥɤ׵ᤷƤޤ"
 
-#: src/protocols/msn/msn.c:1571
+#: src/protocols/msn/msn.c:1839
 msgid "Unable to send password"
 msgstr "ѥɤǤޤ"
 
-#: src/protocols/msn/msn.c:1576
+#: src/protocols/msn/msn.c:1844
 msgid "Password sent"
 msgstr "ѥɤޤ"
 
-#: src/protocols/msn/msn.c:1605
+#: src/protocols/msn/msn.c:1873
 msgid "Unable to transfer"
 msgstr "žǤޤ"
 
-#: src/protocols/msn/msn.c:1613
+#: src/protocols/msn/msn.c:1881
 msgid "Unable to parse message"
 msgstr "åɤǤޤ"
 
-#: src/protocols/msn/msn.c:1706
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr "ФƱ"
 
-#: src/protocols/msn/msn.c:1868 src/protocols/msn/msn.c:1892
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr "ԥ塼ΥƤޤ"
 
-#: src/protocols/msn/msn.c:1869 src/protocols/msn/msn.c:1894
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr "⤦äƤޤ"
 
-#: src/protocols/msn/msn.c:1870 src/protocols/msn/msn.c:1896
-#: src/protocols/msn/msn.c:1956
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1871 src/protocols/msn/msn.c:1898
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1872 src/protocols/msn/msn.c:1900
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr "٤"
 
-#: src/protocols/msn/msn.c:1873 src/protocols/msn/msn.c:1902
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 msgid "Hidden"
 msgstr "Ƥ"
 
-#: src/protocols/msn/msn.c:1958
+#: src/protocols/msn/msn.c:2428
 msgid "Be right back"
 msgstr "ޤ"
 
-#: src/protocols/msn/msn.c:1960
+#: src/protocols/msn/msn.c:2430
 msgid "Away from the computer"
 msgstr "ԥ塼ΥƤޤ"
 
-#: src/protocols/msn/msn.c:1962
+#: src/protocols/msn/msn.c:2432
 msgid "On the phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1964
+#: src/protocols/msn/msn.c:2434
 msgid "Out to lunch"
 msgstr "٤"
 
-#: src/protocols/msn/msn.c:1966 src/prefs.c:742
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
 msgid "Idle"
 msgstr "ٻ"
 
-#: src/protocols/msn/msn.c:1989
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr "̾Υꥻå"
 
-#: src/protocols/msn/msn.c:2065
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "ե"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr "MSN Ǹ̾Ĺޤ"
 
-#: src/protocols/msn/msn.c:2080 src/protocols/msn/msn.c:2101
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 msgid "Set Friendly Name"
 msgstr "̾"
 
-#: src/protocols/msn/msn.c:2081
+#: src/protocols/msn/msn.c:2571
 msgid "Set Friendly Name:"
 msgstr "̾:"
 
-#: src/protocols/msn/msn.c:2082 src/protocols/msn/msn.c:2102
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr "٤Ƥθ̾ꥻå"
 
-#: src/protocols/msn/msn.c:2242
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1236,11 +1388,11 @@
 "MSN Υ󥤥̾ \"user@server.com\" ηǤʤФʤޤ󡣤֤ %"
 "s@hotmail.com ΤȤǤ礦ĥꥹȤѹƤޤ"
 
-#: src/protocols/msn/msn.c:2245 src/protocols/msn/msn.c:2302
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 msgid "Invalid MSN screenname"
 msgstr "̵ MSN 󥤥̾"
 
-#: src/protocols/msn/msn.c:2299
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1249,193 +1401,193 @@
 "MSN 󥤥̾ \"user@server.com\" ηǤʤФʤޤ󡣤֤ %"
 "s@hotmail.com ΤȤǤ礦ݥꥹȤѹƤޤ"
 
-#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4043
-#: src/protocols/toc/toc.c:1142
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "롼פؤλ:"
 
-#: src/protocols/oscar/oscar.c:386
+#: src/protocols/oscar/oscar.c:394
 msgid "Invalid error"
 msgstr "ʥ顼"
 
-#: src/protocols/oscar/oscar.c:387
+#: src/protocols/oscar/oscar.c:395
 msgid "Invalid SNAC"
 msgstr " SNAC"
 
-#: src/protocols/oscar/oscar.c:388
+#: src/protocols/oscar/oscar.c:396
 msgid "Rate to host"
 msgstr "ۥȤ®"
 
-#: src/protocols/oscar/oscar.c:389
+#: src/protocols/oscar/oscar.c:397
 msgid "Rate to client"
 msgstr "饤Ȥ®"
 
-#: src/protocols/oscar/oscar.c:391
+#: src/protocols/oscar/oscar.c:399
 msgid "Service unavailable"
 msgstr "ӥѤǤޤ"
 
-#: src/protocols/oscar/oscar.c:392
+#: src/protocols/oscar/oscar.c:400
 msgid "Service not defined"
 msgstr "ӥƤޤ"
 
-#: src/protocols/oscar/oscar.c:393
+#: src/protocols/oscar/oscar.c:401
 msgid "Obsolete SNAC"
 msgstr "켰 SNAC"
 
-#: src/protocols/oscar/oscar.c:394
+#: src/protocols/oscar/oscar.c:402
 msgid "Not supported by host"
 msgstr "ۥȤǤϥݡȤƤޤ"
 
-#: src/protocols/oscar/oscar.c:395
+#: src/protocols/oscar/oscar.c:403
 msgid "Not supported by client"
 msgstr "饤ȤǤϥݡȤƤޤ"
 
-#: src/protocols/oscar/oscar.c:396
+#: src/protocols/oscar/oscar.c:404
 msgid "Refused by client"
 msgstr "饤Ȥ˵ݤޤ"
 
-#: src/protocols/oscar/oscar.c:397
+#: src/protocols/oscar/oscar.c:405
 msgid "Reply too big"
 msgstr "ֻ礭ޤ"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:406
 msgid "Responses lost"
 msgstr "ȿ򼺤ޤ"
 
-#: src/protocols/oscar/oscar.c:399
+#: src/protocols/oscar/oscar.c:407
 msgid "Request denied"
 msgstr "ꥯȤݤޤ"
 
-#: src/protocols/oscar/oscar.c:400
+#: src/protocols/oscar/oscar.c:408
 msgid "Busted SNAC payload"
 msgstr "SNAC Ǽꥢޤ"
 
-#: src/protocols/oscar/oscar.c:401
+#: src/protocols/oscar/oscar.c:409
 msgid "Insufficient rights"
 msgstr "Խʬ׵Ǥ"
 
-#: src/protocols/oscar/oscar.c:402
+#: src/protocols/oscar/oscar.c:410
 msgid "In local permit/deny"
 msgstr "ɽŪʵ/Ե"
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:411
 msgid "Too evil (sender)"
 msgstr "ȤƤⰭ ()"
 
-#: src/protocols/oscar/oscar.c:404
+#: src/protocols/oscar/oscar.c:412
 msgid "Too evil (receiver)"
 msgstr "ȤƤⰭ ()"
 
-#: src/protocols/oscar/oscar.c:405
+#: src/protocols/oscar/oscar.c:413
 msgid "User temporarily unavailable"
 msgstr "桼Ū̵Ǥ"
 
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:414
 msgid "No match"
 msgstr "ޥåޤ"
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:415
 msgid "List overflow"
 msgstr "ꥹȰ"
 
-#: src/protocols/oscar/oscar.c:408
+#: src/protocols/oscar/oscar.c:416
 msgid "Request ambiguous"
 msgstr "׵᤬ۣǤ"
 
-#: src/protocols/oscar/oscar.c:409
+#: src/protocols/oscar/oscar.c:417
 msgid "Queue full"
 msgstr "塼äѤǤ"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:418
 msgid "Not while on AOL"
 msgstr "AOL ˤϤǤޤ"
 
-#: src/protocols/oscar/oscar.c:454
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "%sľIMĤޤ"
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "%sľIMϼԤޤ"
 
-#: src/protocols/oscar/oscar.c:494
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "³顼 (䤱)\n"
 
-#: src/protocols/oscar/oscar.c:505
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "פ³顼\n"
 
-#: src/protocols/oscar/oscar.c:506 src/protocols/toc/toc.c:554
-#: src/protocols/toc/toc.c:567 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Ǥޤ"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/toc/toc.c:804
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "åȥ롼%sǤޤ"
 
-#: src/protocols/oscar/oscar.c:531
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "åȤ³Ǥޤ"
 
-#: src/protocols/oscar/oscar.c:552 src/protocols/oscar/oscar.c:1860
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
 msgid "Buddy canceled transfer"
 msgstr "ͧãž򥭥󥻥뤷ޤ"
 
-#: src/protocols/oscar/oscar.c:603 src/protocols/oscar/oscar.c:664
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "ۥȤ³ǤޤǤ"
 
-#: src/protocols/oscar/oscar.c:611
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "ѥԤǤ\n"
 
-#: src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "³顼Ǥ\n"
 
-#: src/protocols/oscar/oscar.c:646
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "AIMإǤޤ"
 
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "󥪥: %s"
 
-#: src/protocols/oscar/oscar.c:733
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "󥪥\n"
 
-#: src/protocols/oscar/oscar.c:752 src/protocols/oscar/oscar.c:899
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "³Ǥޤ"
 
-#: src/protocols/oscar/oscar.c:760
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "³Ǥޤcookie"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:801 src/protocols/toc/toc.c:502
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "ְä˥å͡फѥɤǤ"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:806
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "ʤΥȤϸǤ"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:810
+#: src/protocols/oscar/oscar.c:819
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 󥹥ȥå󥸥㡼ӥϰŪǽǤ"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:814
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1444,57 +1596,59 @@
 "³СĹԤɬפǤ礦"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:819
+#: src/protocols/oscar/oscar.c:828
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "饤ȤΥС󤬸Ťޤ%s ˥åץ졼ɤޤ礦"
 
-#: src/protocols/oscar/oscar.c:824 src/protocols/toc/toc.c:585
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "ǧڤ˼"
 
-#: src/protocols/oscar/oscar.c:846
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "顼"
 
-#: src/protocols/oscar/oscar.c:938 src/protocols/oscar/oscar.c:965
-#: src/protocols/oscar/oscar.c:1049
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
-msgstr "ޤʤǤǤ礦줿 TOC ѤƤޤޤ󡣹Τˡ%s åƤ"
-
-#: src/protocols/oscar/oscar.c:940 src/protocols/oscar/oscar.c:967
+msgstr ""
+"ޤʤǤǤ礦줿 TOC ѤƤޤޤ󡣹Τ"
+"ˡ%s åƤ"
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim  AIM  hash 뤳ȤǤޤǤ"
 
-#: src/protocols/oscar/oscar.c:1051
+#: src/protocols/oscar/oscar.c:1061
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim  hash ǤޤǤ"
 
-#: src/protocols/oscar/oscar.c:1489 src/protocols/oscar/oscar.c:4345
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s ȤľIMΩޤ"
 
-#: src/protocols/oscar/oscar.c:1599
+#: src/protocols/oscar/oscar.c:1609
 msgid "Transfer timed out"
 msgstr "žॢȤޤ"
 
-#: src/protocols/oscar/oscar.c:1621
+#: src/protocols/oscar/oscar.c:1631
 msgid "Couldn't open listener to send file"
 msgstr "ե뤿Υꥹʡ򳫤ޤǤ"
 
-#: src/protocols/oscar/oscar.c:1622
+#: src/protocols/oscar/oscar.c:1632
 msgid "File transfer aborted"
 msgstr "եžǤޤ"
 
-#: src/protocols/oscar/oscar.c:1813 src/protocols/oscar/oscar.c:1829
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
 msgid "(There was an error receiving this message)"
 msgstr "ʥå˥顼ȯޤ"
 
-#: src/protocols/oscar/oscar.c:1985
+#: src/protocols/oscar/oscar.c:2020
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -1503,12 +1657,23 @@
 " 2 Υԥ塼֤ľ³׵ᤷƤꡢIM ɬפǤIP "
 "ɥ쥹餫ˤʤ뤿ǡץ饤ХΥꥹͤޤ"
 
-#: src/protocols/oscar/oscar.c:2026 src/protocols/oscar/oscar.c:2080
-#: src/protocols/oscar/oscar.c:3170
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr "桼 %s ʤͧãꥹȤɲääƤޤ"
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
 msgid "No reason given."
 msgstr "ͳϤ狼ޤ"
 
-#: src/protocols/oscar/oscar.c:2080 src/protocols/oscar/oscar.c:3170
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "ICQ ǧڤݤޤ"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1519,203 +1684,222 @@
 "ꥯȤݤޤ\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2081
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr "ICQǧڤϵݤޤ"
 
-#: src/protocols/oscar/oscar.c:2087 src/protocols/oscar/oscar.c:3177
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "桼%luϡʤΥ󥿥ȥꥹȤäꥯȤǧޤ"
 
-#: src/protocols/oscar/oscar.c:2106
+#: src/protocols/oscar/oscar.c:2141
+#, fuzzy, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr "ʤ%s˽ޤ: %s"
+
+#: src/protocols/oscar/oscar.c:2149
+#, c-format
+msgid ""
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "ICQ 桼 %lu Ϥʤ˥󥿥ȤƤޤ: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2186
-#, c-format
-msgid "You missed %d message from %s because it was invalid."
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"֥ꥹȤɲäޤ?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
 msgstr "%2$sΥå%1$d̵Ǥ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:2187
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
 msgstr "%2$sΥå%1$d̵Ǥ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:2196
-#, c-format
-msgid "You missed %d message from %s because it was too large."
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
 msgstr "%2$s%1$dåϤǤ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:2197
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
 msgstr "%2$s%1$dåϤǤ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:2206
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
-msgstr "³ĶᤷΤ%2$s%1$dåƨޤ"
-
-#: src/protocols/oscar/oscar.c:2207
-#, c-format
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu message from %s because the rate limit has been exceeded."
 msgstr "³ĶᤷΤ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:2216
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
+msgid ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr "³ĶᤷΤ%2$s%1$dåƨޤ"
+
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
 msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:2217
-#, c-format
-msgid "You missed %d messages from %s because they are too evil."
-msgstr "ͭΤǡ%2$s%1$dåƨޤ"
-
-#: src/protocols/oscar/oscar.c:2226
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
 msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:2227
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
+msgstr "ͭΤǡ%2$s%1$dåƨޤ"
+
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:2235
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Ǥ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:2236
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Ǥ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:2277
+#: src/protocols/oscar/oscar.c:2342
 #, c-format
 msgid "%s has declined to receive a file from %s.\n"
 msgstr "%s  %s ΥեݤƤޤ\n"
 
-#: src/protocols/oscar/oscar.c:2334
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:2336
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:2368
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 롼顼: %s\n"
 
-#: src/protocols/oscar/oscar.c:2369
+#: src/protocols/oscar/oscar.c:2446
 msgid "Unknown error"
 msgstr "ʥ顼"
 
-#: src/protocols/oscar/oscar.c:2392 src/protocols/oscar/oscar.c:2400
-#: src/protocols/oscar/oscar.c:2452
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 msgid "No reason was given."
 msgstr "ͳǤ"
 
 #. Data is assumed to be the destination sn.
-#: src/protocols/oscar/oscar.c:2399
+#: src/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "%s ؤΥåǤޤǤ:"
 
-#: src/protocols/oscar/oscar.c:2451
+#: src/protocols/oscar/oscar.c:2528
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s Υ桼ѤǤޤ:"
 
-#: src/protocols/oscar/oscar.c:2481 src/buddy.c:2192
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "֥"
 
-#: src/protocols/oscar/oscar.c:2484 src/buddy.c:2195
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2487 src/buddy.c:2198
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "IM ᡼"
 
-#: src/protocols/oscar/oscar.c:2490 src/buddy.c:500 src/buddy.c:2201
-#: src/buddy.c:2537
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "å"
 
-#: src/protocols/oscar/oscar.c:2493 src/buddy.c:2204
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "ե"
 
-#: src/protocols/oscar/oscar.c:2496 src/protocols/oscar/oscar.c:4544
-#: src/buddy.c:2207
-msgid "Send File"
-msgstr "ե"
-
-#: src/protocols/oscar/oscar.c:2500 src/buddy.c:2211
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2503 src/buddy.c:2214
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "ȥå"
 
-#: src/protocols/oscar/oscar.c:2506 src/buddy.c:2217
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "֥ꥹ"
 
-#: src/protocols/oscar/oscar.c:2509 src/buddy.c:2220
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr " Х"
 
-#: src/protocols/oscar/oscar.c:2512 src/buddy.c:2223
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "AP桼"
 
-#: src/protocols/oscar/oscar.c:2515 src/buddy.c:2226
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:2518 src/buddy.c:2229
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "˥ҥꥹ"
 
-#: src/protocols/oscar/oscar.c:2521 src/buddy.c:2232
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "ICQзͳ"
 
-#: src/protocols/oscar/oscar.c:2524 src/buddy.c:2235
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ʬʤICQ"
 
-#: src/protocols/oscar/oscar.c:2527 src/buddy.c:2238
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "TrillianŹ沽"
 
-#: src/protocols/oscar/oscar.c:2565
+#: src/protocols/oscar/oscar.c:2655
 msgid ""
-"<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>"
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
 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:2593
+
+#: src/protocols/oscar/oscar.c:2677
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -1728,27 +1912,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:2625
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>桼ΥʥåäƤޤ</i>"
 
-#: src/protocols/oscar/oscar.c:2637
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "饤ȵǽ"
 
-#: src/protocols/oscar/oscar.c:2645
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>󶡤ƤϤޤ</i>"
 
-#: src/protocols/oscar/oscar.c:2668
+#: src/protocols/oscar/oscar.c:2751
 msgid "Your AIM connection may be lost."
 msgstr "AIM ؤ³줿褦Ǥ"
 
-#: src/protocols/oscar/oscar.c:2926
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr "®¥顼"
 
-#: src/protocols/oscar/oscar.c:2927
+#: src/protocols/oscar/oscar.c:3011
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -1756,23 +1940,15 @@
 "®¤ۤƤ뤿åޤǤ10 ԤäƺƤ"
 ""
 
-#: src/protocols/oscar/oscar.c:3171
-msgid "ICQ Authorization denied"
-msgstr "ICQ ǧڤݤޤ"
-
-#: src/protocols/oscar/oscar.c:3178
-msgid "ICQ Authorization Granted"
-msgstr "ICQ ǧڤ̲ᤷޤ"
-
-#: src/protocols/oscar/oscar.c:3323
+#: src/protocols/oscar/oscar.c:3463
 msgid "Account Confirmation Requested"
 msgstr "ǧڤ׵ᤷޤ"
 
-#: src/protocols/oscar/oscar.c:3350
+#: src/protocols/oscar/oscar.c:3490
 msgid "Error Changing Account Info"
 msgstr "Ⱦѹ顼"
 
-#: src/protocols/oscar/oscar.c:3353
+#: src/protocols/oscar/oscar.c:3493
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1781,7 +1957,7 @@
 "顼 0x%04x: ׵ᤵ줿꡼̾ꥸʥȰۤʤäƤ뤿ᡢǤ"
 "ޤ"
 
-#: src/protocols/oscar/oscar.c:3356
+#: src/protocols/oscar/oscar.c:3496
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1790,14 +1966,14 @@
 "顼 0x%04x: ׵ᤵ줿꡼̾ǽäƤ뤿ᡢǤޤ"
 ""
 
-#: src/protocols/oscar/oscar.c:3359
+#: src/protocols/oscar/oscar.c:3499
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "顼 0x%04x: ׵ᤵ줿꡼̾Ĺ뤿ᡢǤޤ"
 
-#: src/protocols/oscar/oscar.c:3362
+#: src/protocols/oscar/oscar.c:3502
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -1806,7 +1982,7 @@
 "顼 0x%04x: Υ꡼̾ФƤǤ׵᤬뤿ᡢ᡼륢ɥ쥹"
 "ѹǤޤ"
 
-#: src/protocols/oscar/oscar.c:3365
+#: src/protocols/oscar/oscar.c:3505
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -1815,7 +1991,7 @@
 "顼 0x%04x: Υ꡼̾˳ƤƤ뤿ᡢΥ᡼륢"
 "쥹ˤѹǤޤ"
 
-#: src/protocols/oscar/oscar.c:3368
+#: src/protocols/oscar/oscar.c:3508
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -1824,12 +2000,12 @@
 "顼 0x%04x: Υɥ쥹ʤΤǡΥ᡼륢ɥ쥹ˤѹǤޤ"
 ""
 
-#: src/protocols/oscar/oscar.c:3371
+#: src/protocols/oscar/oscar.c:3511
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "顼 0x%04x: ʥ顼"
 
-#: src/protocols/oscar/oscar.c:3381
+#: src/protocols/oscar/oscar.c:3521
 #, c-format
 msgid ""
 "Your screen name is currently formated as follows:\n"
@@ -1838,20 +2014,20 @@
 "ʤΥ꡼̾ϡ߼Τ褦Ƥޤ:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3382 src/protocols/oscar/oscar.c:3388
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
 msgid "Account Info"
 msgstr "Ⱦ"
 
-#: src/protocols/oscar/oscar.c:3387
+#: src/protocols/oscar/oscar.c:3527
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s Υ᡼륢ɥ쥹 %s Ǥ"
 
-#: src/protocols/oscar/oscar.c:3605
+#: src/protocols/oscar/oscar.c:3720
 msgid "Unable to set AIM profile."
 msgstr "AIM ץե򥻥åȤǤޤ"
 
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -1861,7 +2037,7 @@
 "ʤΥץեꤵ줺˻ĤäƤޤ³λƤ顢"
 "Ƥ"
 
-#: src/protocols/oscar/oscar.c:3612
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
@@ -1870,11 +2046,11 @@
 "ץեĹ (%d Х) ãޤGaim ڤΤƤꤷ"
 "ޤ"
 
-#: src/protocols/oscar/oscar.c:3635
+#: src/protocols/oscar/oscar.c:3764
 msgid "Unable to set AIM away message."
 msgstr "AIM Υʥå򥻥åȤǤޤ"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -1883,7 +2059,7 @@
 "μ³λΥʥåꤷ褦ȤƤ褦Ǥ"
 "ʤϡָߤΡ׾֤ΤޤޤǤ³λƤ顢ٻƤ"
 
-#: src/protocols/oscar/oscar.c:3651
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
@@ -1892,7 +2068,7 @@
 "ΥʥåĹ (%d Х) ãޤGaim ڤΤƤ"
 "ޤ"
 
-#: src/protocols/oscar/oscar.c:4026
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1901,20 +2077,20 @@
 "֥ꥹȤ˽񤱤ֿ%dǤ%däƤޤߥåȤ꾯"
 "ʤޤǤϰ֤ϥ饤ȤƸޤ"
 
-#: src/protocols/oscar/oscar.c:4047 src/protocols/toc/toc.c:1146
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:4468
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "ľIM򳫤ޤ"
 
-#: src/protocols/oscar/oscar.c:4478
+#: src/protocols/oscar/oscar.c:4620
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s Ѥľ IM ³γϤ򤷤Ƥޤ"
 
-#: src/protocols/oscar/oscar.c:4479
+#: src/protocols/oscar/oscar.c:4621
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -1922,7 +2098,7 @@
 "ʤʤ顢ʤ IP ɥ쥹Ȥˤʤ뤫Ǥˤꡢץ饤"
 "ХΥꥹͤޤ³ޤ?"
 
-#: src/protocols/oscar/oscar.c:4493
+#: src/protocols/oscar/oscar.c:4635
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
@@ -1931,7 +2107,7 @@
 "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><I>⡼ȥ饤ȤϾ֥"
 "бƤޤ</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4500
+#: src/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
@@ -1940,117 +2116,117 @@
 "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><I>桼˾֥åޤ"
 "</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4525
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "ơå"
 
-#: src/protocols/oscar/oscar.c:4538
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "ľIM"
 
-#: src/protocols/oscar/oscar.c:4552
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "ǽ"
 
-#: src/protocols/toc/toc.c:441
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%sե񤭹ޤ"
 
-#: src/protocols/toc/toc.c:444
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%sեɤ߹ޤ"
 
-#: src/protocols/toc/toc.c:447
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "åĹ᤮뤿ᡢǸ%sХȤڤޤ"
 
-#: src/protocols/toc/toc.c:450
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%sǤƤޤ"
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%sηٹϵޤ"
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Ф®¤ۤåޤ"
 
-#: src/protocols/toc/toc.c:459
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%sǤΥåȤϤǤޤ"
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "᤹%sإåǤޤ"
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "礭뤿ᡢ%sIMޤ"
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "᤯ꤹᡢ%sIMޤ"
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr ""
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "ޥå"
 
-#: src/protocols/toc/toc.c:477
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "¿νɬפȤޤ"
 
-#: src/protocols/toc/toc.c:480
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "ǥ쥯ȥꥵӥϻȤޤ"
 
-#: src/protocols/toc/toc.c:483
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "E-mail"
 
-#: src/protocols/toc/toc.c:486
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "ɤ̵Ǥ"
 
-#: src/protocols/toc/toc.c:489
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "ɤޤ"
 
-#: src/protocols/toc/toc.c:492
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "桼ϥǥ쥯ȥäƤޤ"
 
-#: src/protocols/toc/toc.c:496
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "ݡȤƤʤǤ"
 
-#: src/protocols/toc/toc.c:499
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "μ: %s"
 
-#: src/protocols/toc/toc.c:505
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "ӥѤǤޤ"
 
-#: src/protocols/toc/toc.c:508
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "ٹ٥Ϲ⤹ƥǤޤ"
 
-#: src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:512
 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."
@@ -2058,37 +2234,37 @@
 "ˤ³³ڤޤ 10ʬޤäƺ³ƤΤޤ³³"
 "ФäԤĤȤˤʤޤ"
 
-#: src/protocols/toc/toc.c:514
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Υ󥪥󥨥顼ޤ: %s"
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "ʥ顼%dޤ : %s"
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "³Ĥޤ"
 
-#: src/protocols/toc/toc.c:572
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "Ԥ..."
 
-#: src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOCϵٻߤɤޤ åκǤޤ"
 
-#: src/protocols/toc/toc.c:825
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "ѥѹ"
 
-#: src/protocols/toc/toc.c:828
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC  PAUSE ޥɤޤ"
 
-#: src/protocols/toc/toc.c:828
+#: src/protocols/toc/toc.c:829
 msgid ""
 "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 "
@@ -2097,43 +2273,57 @@
 "줬ȯ硢TOC ϥå̵뤷åäƤ⽳"
 "ޤGaim Ϥ٤޻ߤޤ ŪǤΤDzƤ"
 
-#: src/protocols/toc/toc.c:1263
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "ǥ쥯ȥ"
 
-#: src/protocols/toc/toc.c:1654 src/protocols/toc/toc.c:1696
-#: src/protocols/toc/toc.c:1901
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "ݡֹ"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "žΤ³Ǥޤ!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 msgid "Could not connect for transfer."
 msgstr "žΤ³Ǥޤ!"
 
-#: src/protocols/toc/toc.c:1815
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "žΤ³Ǥޤ!"
 
-#: src/protocols/toc/toc.c:1845
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "եإå񤱤ޤ󡣥եޤ"
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - ̾դ¸..."
 
-#: src/protocols/toc/toc.c:1977
+#: src/protocols/toc/toc.c:1979
 #, 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:1978
+#: src/protocols/toc/toc.c:1980
 #, 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:1983
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%sե褦׵ᤷƤޤ"
 
-#: src/protocols/toc/toc.c:1985 src/prpl.c:280
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
 msgid "Accept"
 msgstr "λ"
 
@@ -2141,28 +2331,36 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! å뤳ȤǤޤǤ"
 
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
 #: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:873
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "饹:"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "󥹥:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr ""
 
-#: src/about.c:82
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Gaim v%s ˤĤ"
 
-#: src/about.c:118
+#: src/about.c:112
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -2172,36 +2370,54 @@
 "ICQYahoo!MSNIRCJabberNapsterZephyr GaduGaduƱ˥ݡ"
 "ȤƤޤGtk+ dzȯ졢GPL 饤󥹤ۤƤޤ"
 
-#: src/about.c:132
+#: src/about.c:122
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#: src/about.c:126
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">ȯʳȯ:</FONT><BR>"
 
-#: src/about.c:142
+#: src/about.c:128
+msgid ""
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">쥤ʥѥå:</FONT><BR>"
 
-#: src/about.c:150
+#: src/about.c:144
 msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Win32 ؤΰܿ:</FONT><BR>"
 
-#: src/about.c:157
+#: src/about.c:151
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">षȯ:</FONT><BR>"
 
-#: src/about.c:180 src/dialogs.c:1506 src/dialogs.c:4171 src/prpl.c:493
-#: src/prpl.c:740 src/server.c:1149
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
 msgid "Close"
 msgstr "Ĥ"
 
-#: src/aim.c:150
+#: src/aim.c:165
 msgid "Please enter your login."
 msgstr "̾ϤƤ"
 
-#: src/aim.c:269
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - "
 
-#: src/aim.c:292
+#: src/aim.c:307
 msgid "Screen Name:"
 msgstr "꡼̾:"
 
@@ -2209,39 +2425,38 @@
 msgid "Gaim - Away!"
 msgstr "Gaim - Υ!"
 
-#: src/away.c:234
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "äޤ!"
 
-#: src/away.c:352
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "Υʥå"
 
-#: src/away.c:372
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "Υʥåκ"
 
-#: src/away.c:560
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Υʤ"
 
-#: src/buddy.c:495 src/buddy.c:2767 src/dialogs.c:1090
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "롼"
 
-#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2535
-#: src/buddy_chat.c:869
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:502 src/buddy.c:2536 src/buddy_chat.c:886 src/buddy_chat.c:1573
-#: src/conversation.c:3033
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr ""
 
-#. Put the buttons in the box
-#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1082 src/dialogs.c:3727
-#: src/dialogs.c:3742
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "ꥢ"
 
@@ -2261,34 +2476,39 @@
 msgid "Un-Alias"
 msgstr "ꥢ"
 
-#: src/buddy.c:1703
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr "֤Ϥ"
 
-#: src/buddy.c:1721
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "Ϥ֤κ"
 
-#: src/buddy.c:1749
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 å)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[Խ򥯥å]"
 
-#: src/buddy.c:2314
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "󤷤ޤ: %s\n"
 
-#: src/buddy.c:2326
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "ٹ: %d%%\n"
 
-#: src/buddy.c:2338
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "ǽ: %s\n"
 
-#: src/buddy.c:2342
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -2299,328 +2519,311 @@
 "꡼̾: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2346
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "ɥ: "
 
-#: src/buddy.c:2415 src/buddy.c:2420
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s ϥ󤷤Ƥޤ"
 
-#: src/buddy.c:2474 src/buddy.c:2479
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s ϥȤޤ"
 
-#: src/buddy.c:2568
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "򤷤֤ξ"
 
-#: src/buddy.c:2569
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "ʰץå"
 
-#: src/buddy.c:2570
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "֥åȤγ/"
 
-#: src/buddy.c:2571
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "ͭΥʥå"
 
-#: src/buddy.c:2621
+#: src/buddy.c:2615
 msgid "Gaim - Buddy List"
 msgstr "Gaim - ֥ꥹ"
 
 #. The file menu
-#: src/buddy.c:2634 src/conversation.c:2173
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "ե"
 
-#: src/buddy.c:2638
+#: src/buddy.c:2632
 msgid "_Add A Buddy"
 msgstr "֤ä (_A)"
 
-#: src/buddy.c:2640
+#: src/buddy.c:2634
 msgid "_Join A Chat"
 msgstr "åȤ˲ä (_J)"
 
-#: src/buddy.c:2642
+#: src/buddy.c:2636
 msgid "_New Message"
 msgstr "å (_N)"
 
-#: src/buddy.c:2644
+#: src/buddy.c:2638
 msgid "_Get User Info"
 msgstr "桼μ (_G)"
 
-#: src/buddy.c:2649
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "֥ꥹȤΥݡ"
 
-#: src/buddy.c:2656
+#: src/buddy.c:2650
 msgid "Hide"
 msgstr ""
 
-#: src/buddy.c:2658
-msgid "Quit"
-msgstr "Ĥ"
-
-#: src/buddy.c:2663
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "ġ"
 
-#: src/buddy.c:2673
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr "֤Ϥ"
 
-#: src/buddy.c:2680
+#: src/buddy.c:2674
 msgid "_Accounts..."
 msgstr " (_A)"
 
+#: src/buddy.c:2677
+msgid "_Preferences..."
+msgstr " (_P) ..."
+
 #: src/buddy.c:2683
-msgid "_Preferences..."
-msgstr " (_P) ..."
-
-#: src/buddy.c:2689
 msgid "Protocol Actions"
 msgstr "ץȥ뤴Ȥư"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2687
 msgid "Pr_ivacy..."
 msgstr "Ŀ; (_I)"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2690
 msgid "_View System Log..."
 msgstr "ƥ򸫤 (_V)"
 
-#: src/buddy.c:2701
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "إ"
 
-#: src/buddy.c:2705
+#: src/buddy.c:2699
 msgid "Online Help"
 msgstr "饤إ"
 
-#: src/buddy.c:2706
+#: src/buddy.c:2700
 msgid "Debug Window"
 msgstr "ǥХåɥ"
 
-#: src/buddy.c:2710
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "GaimˤĤ"
 
-#: src/buddy.c:2727 src/prefs.c:1389
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "֥ꥹ"
 
-#: src/buddy.c:2778
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "֤ä"
 
-#: src/buddy.c:2779
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "롼"
 
-#: src/buddy.c:2780
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "򤷤/롼פκ"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "֤Խ"
 
-#: src/buddy_chat.c:275
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "åȤز"
 
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "̾ꤷƥåȤ˲"
 
-#: src/buddy_chat.c:318
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr ""
 
-#. Invite
-#: src/buddy_chat.c:402 src/buddy_chat.c:405 src/buddy_chat.c:1447
-#: src/buddy_chat.c:1528
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:421 src/dialogs.c:1694 src/dialogs.c:3737
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr ""
 
-#: src/buddy_chat.c:426
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "å"
 
-#: src/buddy_chat.c:463
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - ֤Υåȥ롼Ǿ"
 
-#: src/buddy_chat.c:876
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "̵"
 
-#: src/buddy_chat.c:878 src/prefs.c:278
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "̵"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:954 src/buddy_chat.c:1093 src/buddy_chat.c:1619
-#: src/buddy_chat.c:1652
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d%sˤޤ"
 
-#: src/buddy_chat.c:963
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%sޤ"
 
-#: src/buddy_chat.c:965
+#: src/buddy_chat.c:959
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ޤ"
 
-#: src/buddy_chat.c:1044
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s%sȤΤƤޤ"
 
-#: src/buddy_chat.c:1102
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s(%s)ޤ"
 
-#: src/buddy_chat.c:1104
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%sޤ"
 
-#: src/buddy_chat.c:1210
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - 롼ץå"
 
-#: src/buddy_chat.c:1290
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "ȥԥå:"
 
-#: src/buddy_chat.c:1329
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "ï⤤ޤ"
 
-#.
-#. close = picture_button2(win, _("Close"), cancel_xpm, dispstyle);
-#. b->close = close;
-#. gtk_object_set_user_data(GTK_OBJECT(close), b);
-#. gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(close_callback), b);
-#. gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 0);
-#.
-#. Send
-#: src/buddy_chat.c:1435 src/buddy_chat.c:1527 src/buddy_chat.c:1575
-#: src/conversation.c:3004
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1569 src/conversation.c:3040
-msgid "Block"
-msgstr ""
-
-#: src/buddy_chat.c:1571 src/conversation.c:3027
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "ٹ"
 
-#: src/conversation.c:490
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - ¸"
-
-#: src/conversation.c:538
+#: src/buddy_chat.c:1592 src/conversation.c:2925
+msgid "Block"
+msgstr ""
+
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - "
 
-#: src/conversation.c:1398
+#: src/conversation.c:1305
 msgid "Unable to send message.  The message is too large"
 msgstr "åޤ󡣤Υå礭ޤ"
 
-#: src/conversation.c:1402
+#: src/conversation.c:1309
 msgid "Unable to send message"
 msgstr "åޤ"
 
-#: src/conversation.c:2177
+#: src/conversation.c:2043
 msgid "_Save Conversation"
 msgstr "ä¸ (_S)"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2045
 msgid "View _History"
 msgstr "ҥȥ򸫤 (_H)"
 
 #.
 #. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
-#: src/conversation.c:2186
+#: src/conversation.c:2052
 msgid "Insert _URL"
 msgstr "URL  (_U)"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2053
 msgid "Insert _Image"
 msgstr " (_I)"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2058
 msgid "_Close"
 msgstr "Ĥ (_C)"
 
-#: src/conversation.c:2197
+#: src/conversation.c:2063
 msgid "Options"
 msgstr "ץ"
 
 #. Logging
-#: src/conversation.c:2202
+#: src/conversation.c:2068
 msgid "Enable _Logging"
 msgstr "ͭˤ (_L)"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2086
 msgid "Enable _Sounds"
 msgstr "ͭˤ (_S)"
 
-#: src/conversation.c:2728 src/conversation.c:2730 src/conversation.c:2741
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
 msgid " [TYPING]"
 msgstr " [TYPING]"
 
-#: src/conversation.c:2731 src/conversation.c:2733 src/conversation.c:2745
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
 msgid " [TYPED]"
 msgstr "[TYPED]"
 
-#: src/conversation.c:2820
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2933
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "̾դƥå:"
 
-#: src/conversation.c:3539
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - ¸"
 
-#: src/conversation.c:3573
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "˥᡼̵"
 
-#: src/conversation.c:3580
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "˥᡼ͭ"
 
-#: src/conversation.c:3586
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "쥢"
 
-#: src/conversation.c:3592
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "̾դƥ¸"
 
-#: src/dialogs.c:411
+#: src/dialogs.c:422
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -2632,323 +2835,325 @@
 "\n"
 "%s ηٹ٥ä餬ɾ¤оݤˤʤ褦ˤޤ\n"
 
-#: src/dialogs.c:420
+#: src/dialogs.c:431
 msgid "Warn _anonymously?"
 msgstr "ƿ̾Ƿٹ𤷤ޤ? (_A)"
 
-#: src/dialogs.c:427
+#: src/dialogs.c:438
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>ƿ̾ηٹϤۤɹӤޤ</b>"
 
-#: src/dialogs.c:447
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "ͧãꥹȤ '%s' Ƥޤ\n"
 
-#: src/dialogs.c:691
+#: src/dialogs.c:706
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "IM Υ꡼̾ϤƤ\n"
 
-#: src/dialogs.c:707 src/dialogs.c:802
+#: src/dialogs.c:722 src/dialogs.c:816
 msgid "_Screenname:"
 msgstr "꡼̾ (_S):"
 
-#: src/dialogs.c:720 src/dialogs.c:815
+#: src/dialogs.c:735 src/dialogs.c:829
 msgid "_Account:"
 msgstr " (_A):"
 
-#: src/dialogs.c:790
+#: src/dialogs.c:804
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "򸫤Υ꡼̾ϤƤ\n"
 
-#: src/dialogs.c:955
+#: src/dialogs.c:956
+#, fuzzy
+msgid "Gaim - Add Group"
+msgstr "Gaim - ͧãɲ"
+
+#: src/dialogs.c:973
 msgid "Please enter the name of the group to be added.\n"
 msgstr "ä륰롼̾ϤƤ\n"
 
-#: src/dialogs.c:964
+#: src/dialogs.c:982 src/dialogs.c:4356
 msgid "_Group:"
 msgstr "롼 (_G):"
 
-#: src/dialogs.c:1051
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - ͧãɲ"
 
-#: src/dialogs.c:1062
-msgid "Add Buddy"
-msgstr "ͧãɲ"
-
-#: src/dialogs.c:1072
-msgid "Contact"
-msgstr "󥿥"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "꡼̾:"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1098
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "ɲ"
 
-#: src/dialogs.c:1396
+#: src/dialogs.c:1468
 msgid "Gaim - Privacy"
 msgstr "Gaim - Ŀ;"
 
-#: src/dialogs.c:1407
-msgid "Privacy settings are affected immediately."
+#: src/dialogs.c:1479
+#, fuzzy
+msgid "Changes to privacy settings take effect immediately."
 msgstr "Ŀ;ϤȿǤޤ"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Ŀ;:"
 
-#: src/dialogs.c:1434
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "٤ƤΥ桼Υ󥿥ȤĤ"
 
-#: src/dialogs.c:1435
-msgid "Allow only the users below"
-msgstr "ʲΥ桼ΤߵĤ"
-
-#: src/dialogs.c:1436
+#: src/dialogs.c:1509
 msgid "Allow only users on my buddy list"
 msgstr "ͧãꥹȤäƤ桼ΤߵĤ"
 
-#: src/dialogs.c:1438
-msgid "Allow List"
-msgstr "ĥꥹ"
-
-#: src/dialogs.c:1469
+#: src/dialogs.c:1513
+msgid "Allow only the users below"
+msgstr "ʲΥ桼ΤߵĤ"
+
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "ïˤĤʤ"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "ʲΥ桼Τߵݤ"
 
-#: src/dialogs.c:1472
-msgid "Block List"
-msgstr "ݥꥹ"
-
-#: src/dialogs.c:1525
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Ϥߤ֤򤤤Ƥ"
 
-#: src/dialogs.c:1664
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ֤Ϥ"
 
 #. <pounce type="who">
-#: src/dialogs.c:1674
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "ïϤ"
 
-#: src/dialogs.c:1685
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr ""
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1711
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "ĤĤߤ"
 
-#: src/dialogs.c:1721
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "󥪥λ"
 
-#: src/dialogs.c:1730
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Υʤä"
 
-#: src/dialogs.c:1739
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "ٻߤä"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "ʤ֤Ϥ"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1758
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Ϥ"
 
-#: src/dialogs.c:1769
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "IMɥ򳫤"
 
-#: src/dialogs.c:1778
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "ݥåץå"
 
-#: src/dialogs.c:1787 src/prefs.c:294
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "å"
 
-#: src/dialogs.c:1808
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Ϥॳޥɤμ¹"
 
-#: src/dialogs.c:1830
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Ϥ಻"
 
 #. </pounce type="action">
-#: src/dialogs.c:1852
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Ϥߤ¸"
 
-#: src/dialogs.c:1872
+#: src/dialogs.c:1967
 msgid "_Save"
 msgstr "¸ (_S)"
 
-#: src/dialogs.c:1878
+#: src/dialogs.c:1973
 msgid "C_ancel"
 msgstr "󥻥 (_C)"
 
-#: src/dialogs.c:1949
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - ǥ쥯ȥ"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "ǥ쥯ȥ"
 
-#: src/dialogs.c:1979
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Web餢ʤξդ뤳ȤĤ"
 
 #. Line 1
-#: src/dialogs.c:1982 src/dialogs.c:2682
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr ""
 
 #. Line 2
-#: src/dialogs.c:1993 src/dialogs.c:2694
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "ߥɥ͡"
 
 #. Line 3
-#: src/dialogs.c:2005 src/dialogs.c:2706
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "̾"
 
 #. Line 4
-#: src/dialogs.c:2016 src/dialogs.c:2718
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr ""
 
 #. Line 6
-#: src/dialogs.c:2038 src/dialogs.c:2741
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr ""
 
-#: src/dialogs.c:2085 src/dialogs.c:2267 src/dialogs.c:3552 src/dialogs.c:4180
-#: src/dialogs.c:5143
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
 msgid "Save"
 msgstr "¸"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "ѥɤϥޥåޤ"
 
-#: src/dialogs.c:2108
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "ƤϤƤ"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - ѥѹ"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "ꥸʥѥ"
 
-#: src/dialogs.c:2176
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "ѥ"
 
-#: src/dialogs.c:2190
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "ѥ()"
 
 #. Build OK Button
-#: src/dialogs.c:2208 src/dialogs.c:2356 src/dialogs.c:2663 src/dialogs.c:2841
-#: src/dialogs.c:2907 src/dialogs.c:4292 src/dialogs.c:4397
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
 msgid "OK"
 msgstr "λ"
 
-#: src/dialogs.c:2231
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 桼Ͽ"
 
-#: src/dialogs.c:2341
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "ʤθ̤: "
 
-#: src/dialogs.c:2473 src/dialogs.c:2480
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2519
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ĥɲ"
 
-#: src/dialogs.c:2521
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ĥɲ"
 
-#: src/dialogs.c:2580
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2658 src/dialogs.c:2819
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "֤θ"
 
-#: src/dialogs.c:2786
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 󤫤֤õ"
 
-#: src/dialogs.c:2813
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - E-mail֤õ"
 
-#: src/dialogs.c:2902
+#: src/dialogs.c:2997
 msgid "Insert Link"
 msgstr "󥯤"
 
-#: src/dialogs.c:2953
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - URLɲ"
 
-#: src/dialogs.c:3064 src/dialogs.c:3084
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "ʸ"
 
-#: src/dialogs.c:3116 src/dialogs.c:3136
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "طʿ"
 
-#: src/dialogs.c:3211 src/dialogs.c:3235
+#: src/dialogs.c:3284 src/dialogs.c:3308
 msgid "Select Font"
 msgstr "եȤ"
 
-#: src/dialogs.c:3312
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "ݡȤ: "
 
-#: src/dialogs.c:3336
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - ֥ꥹȤΥݡ"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3398
+#: src/dialogs.c:3470
 msgid "You cannot save an away message with a blank title"
 msgstr "̾ǤΥʥå¸Ǥޤ"
 
 # å̾Ĥ뤫¸ "Ω" 򤷤Ƥ
-#: src/dialogs.c:3399
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
@@ -2956,103 +3161,100 @@
 "å̾Ĥ뤫¸ \"Ω\" 򤷤Ƥ"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3406
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "Υåޤ"
 
-#: src/dialogs.c:3474
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Υʥå"
 
-#: src/dialogs.c:3483
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Υʥå"
 
-#: src/dialogs.c:3496
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Υʥå ̾:"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "¸ƻȤ"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Ȥ"
 
-#: src/dialogs.c:3548
-msgid "Save & Use"
-msgstr "¸ƻȤ"
-
 #. show everything
-#: src/dialogs.c:3682
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Ф!"
 
-#: src/dialogs.c:3735
-msgid "Alias Buddy"
-msgstr "֤Υꥢ"
-
-#: src/dialogs.c:3768
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - ֤Υꥢ"
 
-#: src/dialogs.c:3807 src/dialogs.c:3814
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "%s ˽񤱤ޤǤ"
 
-#: src/dialogs.c:3838
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - ¸"
 
-#: src/dialogs.c:3868
+#: src/dialogs.c:3940
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "%s ǤޤǤ"
 
-#: src/dialogs.c:3895
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "˥?"
 
-#: src/dialogs.c:3910
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4091
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:4154
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:4175
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "õ"
 
-#: src/dialogs.c:4257
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - 롼פβ̾"
 
-#: src/dialogs.c:4266
-msgid "Rename Group"
-msgstr "롼פβ̾"
-
-#: src/dialogs.c:4273 src/dialogs.c:4378
-msgid "New name:"
-msgstr "̾"
-
-#: src/dialogs.c:4362
+#: src/dialogs.c:4347
+#, fuzzy
+msgid "Please enter a new name for the selected group.\n"
+msgstr "ä륰롼̾ϤƤ\n"
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - ֤β̾"
 
-#: src/dialogs.c:4371
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "֤β̾"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "̾"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4455
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - PerlץȤ"
 
-#: src/gaimrc.c:1276
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "ե%s򳫤ޤ"
@@ -3066,83 +3268,93 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ³ϥ顼\n"
 
-#: src/multi.c:231
+#: src/multi.c:235
 msgid "Screenname"
 msgstr "꡼̾:"
 
-#: src/multi.c:259
+#: src/multi.c:263
 msgid "Protocol"
 msgstr "ץȥ:"
 
-#: src/multi.c:538
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - ֥ɤ߹"
 
-#: src/multi.c:581
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "֥ե:"
 
-#: src/multi.c:594
+#: src/multi.c:598
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:599 src/prefs.c:1215
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "ꥻå"
 
-#: src/multi.c:616
+#: src/multi.c:620
 msgid "Login Options"
 msgstr "󥪥ץ"
 
-#: src/multi.c:626
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "꡼̾:"
 
-#: src/multi.c:649
+#: src/multi.c:653
 msgid "Alias:"
 msgstr "ꥢ:"
 
-#: src/multi.c:661
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "ץȥ:"
 
-#: src/multi.c:668
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "ѥɤФ"
 
-#: src/multi.c:669
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "ư"
 
-#: src/multi.c:702
+#: src/multi.c:706
 msgid "User Options"
 msgstr "桼ץ"
 
-#: src/multi.c:711
+#: src/multi.c:715
 msgid "New Mail Notifications"
 msgstr "᡼"
 
-#: src/multi.c:805
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "ץ"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "ФϿ"
 
-#: src/multi.c:864
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Ƚ"
 
-#: src/multi.c:1009
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "ѥ"
 
-#: src/multi.c:1040
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "ѥ:"
+
+#: src/multi.c:1044
 msgid "Signon"
 msgstr "󥪥"
 
-#: src/multi.c:1073
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr "TOC Ĥޤ"
 
-#: src/multi.c:1074
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
@@ -3153,11 +3365,11 @@
 "뤵褦ˤʤäƤޤ󤹤ˤϡΥȤԽ OSCAR "
 "Ȥ褦ˤ뤫TOC ץ饰ɤ߹ɬפޤ"
 
-#: src/multi.c:1080
+#: src/multi.c:1084
 msgid "Protocol not found."
 msgstr "ץȥ뤬Ĥޤ"
 
-#: src/multi.c:1081
+#: src/multi.c:1085
 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."
@@ -3165,20 +3377,44 @@
 "ΥȤǤϥȤޤ ץȥɤ߹Ǥʤʤɤ߹"
 "ץȥ뤬ǤϵǽʤǤ"
 
-#: src/multi.c:1134
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "%sΤǤ?"
 
-#: src/multi.c:1135
+#: src/multi.c:1139
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1183
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Խ"
 
-#: src/multi.c:1570
+#: src/multi.c:1257
+msgid "_Modify"
+msgstr ""
+
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "ʤ"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "󥪥: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Խ"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr ""
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -3187,25 +3423,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1589
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s ϥ󥪥Ǥޤ"
 
-#: src/multi.c:1590
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "󥪥󥨥顼"
 
-#: src/multi.c:1600
+#: src/multi.c:1604
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1610
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s ϥ󥪥դޤ"
 
-#: src/multi.c:1611
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr "³顼"
 
@@ -3215,249 +3451,289 @@
 "GAIM::register ϤǸƤФƤޤPERL-HOWTO 򻲹ͤˤƤ"
 ""
 
-#: src/prefs.c:178
+#: src/prefs.c:180
 msgid "Interface Options"
 msgstr "󥿡եץ"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:181
+#: src/prefs.c:183
 msgid "Show _debug window"
 msgstr "ǥХåɥɽ (_D)"
 
-#: src/prefs.c:198
-msgid "Style"
-msgstr ""
-
-#: src/prefs.c:199
-msgid "_Bold"
-msgstr "ܡ (_B)"
-
 #: src/prefs.c:200
+msgid "Style"
+msgstr ""
+
+#: src/prefs.c:201
+msgid "_Bold"
+msgstr "ܡ (_B)"
+
+#: src/prefs.c:202
 msgid "_Italics"
 msgstr "å (_I)"
 
-#: src/prefs.c:201
+#: src/prefs.c:203
 msgid "_Underline"
 msgstr " (_U)"
 
-#: src/prefs.c:202
+#: src/prefs.c:204
 msgid "_Strikethough"
 msgstr "Ǥä (_S)"
 
-#: src/prefs.c:204
+#: src/prefs.c:206
 msgid "Face"
 msgstr "ʸ"
 
-#: src/prefs.c:207
+#: src/prefs.c:209
 msgid "Use custo_m face"
 msgstr "ȼδʸȤ (_M)"
 
-#: src/prefs.c:219
+#: src/prefs.c:221
 msgid "Use custom si_ze"
 msgstr "ȼΥȤ (_Z)"
 
-#: src/prefs.c:226
+#: src/prefs.c:228
 msgid "Color"
 msgstr ""
 
-#: src/prefs.c:231
+#: src/prefs.c:233
 msgid "_Text color"
 msgstr "ʸ (_T)"
 
-#: src/prefs.c:247
+#: src/prefs.c:249
 msgid "Bac_kground color"
 msgstr "طʿ (_K)"
 
-#: src/prefs.c:271 src/prefs.c:367 src/prefs.c:407
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 msgid "Display"
 msgstr "ɽ"
 
-#: src/prefs.c:272
+#: src/prefs.c:274
 msgid "Show graphical _smileys"
 msgstr "δʸɽ (_S)"
 
-#: src/prefs.c:273
+#: src/prefs.c:275
 msgid "Show _timestamp on messages"
 msgstr "åΥॹפɽ (_T)"
 
-#: src/prefs.c:274
+#: src/prefs.c:276
 msgid "Show _URLs as links"
 msgstr "󥯤Ȥ URL ɽ (_U)"
 
-#: src/prefs.c:276
+#: src/prefs.c:278
 msgid "_Highlight misspelled words"
 msgstr "ߥڥϥ饤Ȥ (_H)"
 
-#: src/prefs.c:279
+#: src/prefs.c:281
 msgid "Ignore c_olors"
 msgstr "̵뤹 (_O)"
 
-#: src/prefs.c:280
+#: src/prefs.c:282
 msgid "Ignore font _faces"
 msgstr "եȤ̵뤹 (_F)"
 
-#: src/prefs.c:281
+#: src/prefs.c:283
 msgid "Ignore font si_zes"
 msgstr "եȥ̵뤹 (_Z)"
 
-#: src/prefs.c:295
+#: src/prefs.c:297
 msgid "_Enter sends message"
 msgstr "Enterפǥå (_E)"
 
-#: src/prefs.c:296
-msgid "C_ontrol-Enter sends message"
-msgstr "Control-Enterפǥå (_O)"
-
 #: src/prefs.c:298
+msgid "C_ontrol-Enter sends message"
+msgstr "Control-Enterפǥå (_O)"
+
+#: src/prefs.c:300
 msgid "Window Closing"
 msgstr "ɥĤ"
 
-#: src/prefs.c:299
+#: src/prefs.c:301
 msgid "E_scape closes window"
 msgstr "EscapeפǥɥĤ (_S)"
 
-#: src/prefs.c:300
+#: src/prefs.c:302
 msgid "Control-_W closes window"
 msgstr "Ctrl-WפǥɥĤ (_W)"
 
-#: src/prefs.c:303
+#: src/prefs.c:305
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Control-{B/I/U/S}פ HTML  (_H)"
 
-#: src/prefs.c:304
+#: src/prefs.c:306
 msgid "Control-(number) inserts _smileys"
 msgstr "Control-(number)פǴʸ (_S)"
 
-#: src/prefs.c:316
+#: src/prefs.c:318
 msgid "Buttons"
 msgstr "ܥ"
 
-#: src/prefs.c:317
+#: src/prefs.c:319
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "IM//åȥܥ򱣤 (_H)"
 
-#: src/prefs.c:318
+#: src/prefs.c:320
 msgid "Show _pictures on buttons"
 msgstr "ܥ˲ɽ (_P)"
 
-#: src/prefs.c:320
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "ͧãꥹȥɥ"
 
-#: src/prefs.c:321
+#: src/prefs.c:323
 msgid "_Save window size/position"
 msgstr "ɥ/֤¸ (_S)"
 
-#: src/prefs.c:322
-msgid "_Raise window on events"
-msgstr "٥ȯǥɥ򥢥ƥ֤ˤ (_R)"
-
 #: src/prefs.c:324
+msgid "_Raise window on events"
+msgstr "٥ȯǥɥ򥢥ƥ֤ˤ (_R)"
+
+#: src/prefs.c:326
 msgid "Group Display"
 msgstr "롼פɽ"
 
-#: src/prefs.c:325
+#: src/prefs.c:327
 msgid "Hide _groups with no online buddies"
 msgstr "饤ͧãʤ롼פϱ (_G)"
 
-#: src/prefs.c:326
+#: src/prefs.c:328
 msgid "Show _numbers in groups"
 msgstr "롼פοɽ (_N)"
 
-#: src/prefs.c:328
+#: src/prefs.c:330
 msgid "Buddy Display"
 msgstr "ͧãɽ"
 
-#: src/prefs.c:329
+#: src/prefs.c:331
 msgid "Show buddy type _icons"
 msgstr "ͧãץɽ (_I)"
 
-#: src/prefs.c:330
+#: src/prefs.c:332
 msgid "Show _warning levels"
 msgstr "ٹ٥ɽ (_W)"
 
-#: src/prefs.c:331
+#: src/prefs.c:333
 msgid "Show idle _times"
 msgstr "ȿʤ֤ɽ (_T)"
 
-#: src/prefs.c:332
+#: src/prefs.c:334
 msgid "Grey i_dle buddies"
 msgstr "ȿΤʤ֤ϥ졼ɽ (_D)"
 
-#: src/prefs.c:349 src/prefs.c:391
+#: src/prefs.c:351 src/prefs.c:393
 msgid "Window"
 msgstr "ɥ"
 
-#: src/prefs.c:356 src/prefs.c:398
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "ܥ˲ɽ (_P)"
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr ""
+
+#: src/prefs.c:354 src/prefs.c:396
+#, fuzzy
+msgid "Text"
+msgstr "ƥ"
+
+#: src/prefs.c:355 src/prefs.c:397
+msgid "Pictures and text"
+msgstr ""
+
+#: src/prefs.c:358 src/prefs.c:400
 msgid "New window _width:"
 msgstr "ɥ (_W):"
 
-#: src/prefs.c:357 src/prefs.c:399
+#: src/prefs.c:359 src/prefs.c:401
 msgid "New window _height:"
 msgstr "ɥι⤵ (_H):"
 
-#: src/prefs.c:358 src/prefs.c:400
+#: src/prefs.c:360 src/prefs.c:402
 msgid "_Entry widget height:"
 msgstr "ϥåȤι⤵ (_E):"
 
-#: src/prefs.c:359 src/prefs.c:401
+#: src/prefs.c:361 src/prefs.c:403
 msgid "_Raise windows on events"
 msgstr "٥ȯǥɥ򥢥ƥ֤ˤ (_R)"
 
-#: src/prefs.c:360
+#: src/prefs.c:362
 msgid "Hide window on _send"
 msgstr "˥ɥ򱣤 (_S)"
 
-#: src/prefs.c:363
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "ͧã"
 
-#: src/prefs.c:364
+#: src/prefs.c:366
 msgid "Hide buddy _icons"
 msgstr "ͧã򱣤 (_I)"
 
-#: src/prefs.c:365
+#: src/prefs.c:367
 msgid "Disable buddy icon a_nimation"
 msgstr "ͧãΥ˥᡼̵ˤ (_N)"
 
-#: src/prefs.c:368
+#: src/prefs.c:370
 msgid "Show _logins in window"
 msgstr "ɥǥɽ (_L)"
 
-#: src/prefs.c:370
+#: src/prefs.c:372
 msgid "Typing Notification"
 msgstr "ԥ"
 
-#: src/prefs.c:371
+#: src/prefs.c:373
 msgid "Notify buddies that you are _typing to them"
 msgstr "åǤ뤳ȤͧãΤ (_T)"
 
-#: src/prefs.c:403
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "䴰"
 
-#: src/prefs.c:404
+#: src/prefs.c:406
 msgid "_Tab-complete nicks"
 msgstr "˥å͡򥿥䴰 (_T)"
 
-#: src/prefs.c:405
+#: src/prefs.c:407
 msgid "_Old-style tab completion"
 msgstr "ŤΥ䴰 (_O)"
 
-#: src/prefs.c:408
+#: src/prefs.c:410
 msgid "_Show people joining/leaving in window"
 msgstr "/Υʤ򥦥ɥɽ (_S)"
 
-#: src/prefs.c:409
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr "꡼̾򥫥顼ˤ (_L)"
 
-#: src/prefs.c:425
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr "IM "
 
-#: src/prefs.c:432
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+msgid "Tab _placement:"
+msgstr ""
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+#, fuzzy
+msgid "Top"
+msgstr "ȥԥå:"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "ܥ"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:434
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
@@ -3465,23 +3741,23 @@
 "ƤΥ󥹥ȥåĤΥ֤\n"
 "ɽ (_I)"
 
-#: src/prefs.c:433
+#: src/prefs.c:435
 msgid "Show a_liases in tabs/titles"
 msgstr "/̾ǥꥢɽ (_L)"
 
-#: src/prefs.c:435
+#: src/prefs.c:437
 msgid "Chat Tabs"
 msgstr "åȥ"
 
-#: src/prefs.c:442
+#: src/prefs.c:444
 msgid "Show all c_hats in one tabbed window"
 msgstr "ƤΥåȤĤΥ֥ɥɽ (_H)"
 
-#: src/prefs.c:445
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr "Ȥ߹碌"
 
-#: src/prefs.c:446
+#: src/prefs.c:448
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
@@ -3489,104 +3765,141 @@
 "IM ȥåȤƱ֥ɥ\n"
 "ɽ (_S)"
 
-#: src/prefs.c:448
+#: src/prefs.c:450
 msgid "Buddy List Tabs"
 msgstr "ͧãꥹȥ"
 
-#: src/prefs.c:469
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "ץμ"
 
-#: src/prefs.c:481
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "ץμ"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "ץ"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "ץ"
 
-#: src/prefs.c:494
+#: src/prefs.c:496
 msgid "_Host"
 msgstr "ۥ̾ (_H)"
 
-#: src/prefs.c:508
+#: src/prefs.c:510
 msgid "Port"
 msgstr "ݡֹ"
 
-#: src/prefs.c:524
+#: src/prefs.c:526
 msgid "_User"
 msgstr "桼̾ (_U)"
 
-#: src/prefs.c:538
+#: src/prefs.c:540
 msgid "Pa_ssword"
 msgstr "ѥ (_S)"
 
 #. Registered default browser is used by Windows
-#: src/prefs.c:575
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr "֥饦"
 
-#: src/prefs.c:604
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr ""
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr ""
+
+#: src/prefs.c:606
 msgid "Browser Options"
 msgstr "֥饦ץ"
 
-#: src/prefs.c:605
+#: src/prefs.c:607
 msgid "Open new _window by default"
 msgstr "ǥեȤǿɥ򳫤 (_W)"
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Message Logs"
 msgstr "å"
 
-#: src/prefs.c:621
+#: src/prefs.c:623
 msgid "_Log all instant messages"
 msgstr "ƤΥ󥹥ȥåϿ (_L)"
 
-#: src/prefs.c:622
+#: src/prefs.c:624
 msgid "Log all c_hats"
 msgstr "ƤΥåȤϿ (_H)"
 
-#: src/prefs.c:623
+#: src/prefs.c:625
 msgid "Strip _HTML from logs"
 msgstr " HTML  (_H)"
 
-#: src/prefs.c:625
+#: src/prefs.c:627
 msgid "System Logs"
 msgstr "ƥ"
 
-#: src/prefs.c:626
+#: src/prefs.c:628
 msgid "Log when buddies _sign on/sign off"
 msgstr "ͧã󥪥/դȤ˵Ͽ (_S)"
 
-#: src/prefs.c:628
+#: src/prefs.c:630
 msgid "Log when buddies become _idle/un-idle"
 msgstr "ͧãٻ/Ȥ˵Ͽ (_I)"
 
-#: src/prefs.c:630
+#: src/prefs.c:632
 msgid "Log when buddies go away/come _back"
 msgstr "ͧãΥ/ʤȤ˵Ͽ (_B)"
 
-#: src/prefs.c:631
+#: src/prefs.c:633
 msgid "Log your _own signons/idleness/awayness"
 msgstr "ʬΥ󥪥/ٻ/ΥʤϿ (_O)"
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "줾ͧãȤ˥եʬ (_N)"
 
-#: src/prefs.c:665
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "ץ"
 
-#: src/prefs.c:666
+#: src/prefs.c:668
 msgid "_No sounds when you log in"
 msgstr "󤷤Ȥ˲Ĥ餵ʤ (_N)"
 
-#: src/prefs.c:667
+#: src/prefs.c:669
 msgid "_Sounds while away"
 msgstr "ΥˤⲻĤ餹 (_S)"
 
-#: src/prefs.c:670
+#: src/prefs.c:672
 msgid "Sound Method"
 msgstr "Ϥˡ"
 
-#: src/prefs.c:690
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "Ϥˡ"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "顼"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3595,75 +3908,75 @@
 "ϥޥ (_O)\n"
 "%s ϥե̾ˤʤ"
 
-#: src/prefs.c:726
+#: src/prefs.c:732
 msgid "_Sending messages removes away status"
 msgstr "åΥʾ֤ (_S)"
 
-#: src/prefs.c:727
-msgid "_Queue new messages when away"
-msgstr "Υοåϥ塼 (_Q)"
-
-#: src/prefs.c:728
-msgid "_Ignore new conversations when away"
-msgstr "Υοä̵뤹 (_I)"
-
-#: src/prefs.c:730
-msgid "Auto-response"
-msgstr "ư"
-
 #: src/prefs.c:733
-msgid "Seconds before _resending:"
-msgstr "ޤǤλ (_R):"
-
-#: src/prefs.c:735
-msgid "_Don't send auto-response"
-msgstr "ưʤ (_D)"
+msgid "_Queue new messages when away"
+msgstr "Υοåϥ塼 (_Q)"
+
+#: src/prefs.c:734
+msgid "_Ignore new conversations when away"
+msgstr "Υοä̵뤹 (_I)"
 
 #: src/prefs.c:736
+msgid "Auto-response"
+msgstr "ư"
+
+#: src/prefs.c:739
+msgid "Seconds before _resending:"
+msgstr "ޤǤλ (_R):"
+
+#: src/prefs.c:741
+msgid "_Don't send auto-response"
+msgstr "ưʤ (_D)"
+
+#: src/prefs.c:742
 msgid "_Only send auto-response when idle"
 msgstr "ٻϼưΤ (_O)"
 
-#: src/prefs.c:737
+#: src/prefs.c:743
 msgid "Do_n't send auto-response in active conversations"
 msgstr "ʹβäǤϼưʤ (_N)"
 
-#: src/prefs.c:743
+#: src/prefs.c:749
 msgid "Idle _time reporting:"
 msgstr "ٻ߻֤𤹤 (_T):"
 
-#: src/prefs.c:744
+#: src/prefs.c:750
 msgid "None"
 msgstr "ʤ"
 
-#: src/prefs.c:745
+#: src/prefs.c:751
 msgid "Gaim usage"
 msgstr "Gaim ˡ"
 
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "X usage"
 msgstr "X ˡ"
 
-#: src/prefs.c:750
+#: src/prefs.c:756
 msgid "Windows usage"
 msgstr "ɥˡ"
 
-#: src/prefs.c:757
+#: src/prefs.c:763
 msgid "Auto-away"
 msgstr "ưΥ"
 
-#: src/prefs.c:758
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr "ٻΥʤˤ (_W)"
 
-#: src/prefs.c:759
+#: src/prefs.c:765
 msgid "_Minutes before setting away:"
 msgstr "ʬΥʤˤʤ뤫 (_M):"
 
-#: src/prefs.c:764
+#: src/prefs.c:770
 msgid "Away m_essage:"
 msgstr "Υʥå (_E):"
 
-#: src/prefs.c:798 src/prefs.c:886
+#: src/prefs.c:804 src/prefs.c:892
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3678,7 +3991,7 @@
 "\n"
 "%s"
 
-#: src/prefs.c:802 src/prefs.c:890
+#: src/prefs.c:808 src/prefs.c:896
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3689,7 +4002,7 @@
 "\n"
 "%s"
 
-#: src/prefs.c:807
+#: src/prefs.c:813
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3704,7 +4017,7 @@
 "<span weight=\"bold\">URL:</span>\t%s\n"
 "<span weight=\"bold\">ե̾:</span>\t%s"
 
-#: src/prefs.c:812
+#: src/prefs.c:818
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3719,91 +4032,91 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">ե̾:</span>  %s"
 
-#: src/prefs.c:997
+#: src/prefs.c:1003
 msgid "Details"
 msgstr "ܺ"
 
-#: src/prefs.c:1102
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - "
 
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Test"
 msgstr "ƥ"
 
-#: src/prefs.c:1219
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "..."
 
-#: src/prefs.c:1347
+#: src/prefs.c:1353
 msgid "_Edit"
 msgstr "Խ (_E)"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1391
 msgid "Interface"
 msgstr "󥿡ե"
 
-#: src/prefs.c:1386
+#: src/prefs.c:1392
 msgid "Fonts"
 msgstr "ե"
 
-#: src/prefs.c:1387
+#: src/prefs.c:1393
 msgid "Message Text"
 msgstr "åƥ"
 
-#: src/prefs.c:1388
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr "硼ȥå"
 
-#: src/prefs.c:1390
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "IM ɥ"
 
-#: src/prefs.c:1391
+#: src/prefs.c:1397
 msgid "Chat Window"
 msgstr "åȥɥ"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1393
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "ץ"
 
-#: src/prefs.c:1394
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:1396
+#: src/prefs.c:1402
 msgid "Logging"
 msgstr ""
 
-#: src/prefs.c:1397
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:1398
+#: src/prefs.c:1404
 msgid "Sound Events"
 msgstr "٥"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Away / Idle"
 msgstr "Υ / ٻ"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "Υʥå"
 
-#: src/prefs.c:1402
+#: src/prefs.c:1408
 msgid "Plugins"
 msgstr "ץ饰"
 
-#: src/prefs.c:1441
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:1560
+#: src/prefs.c:1565
 msgid "Gaim - Debug Window"
 msgstr "Gaim - ǥХåɥ"
 
@@ -3876,67 +4189,116 @@
 msgid "Please enter your password"
 msgstr "ѥɤϤƤ"
 
-#: src/server.c:644
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d å)"
 
-#: src/server.c:650
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 å)"
 
-#: src/server.c:956
+#: src/server.c:966
 msgid "Yes"
 msgstr "Ϥ"
 
-#: src/server.c:957
+#: src/server.c:967
 msgid "No"
 msgstr ""
 
-#: src/server.c:1153
+#: src/server.c:1163
 msgid "More Info"
 msgstr "äȾ"
 
-#: src/sound.c:69
+#: src/sound.c:68
 msgid "Buddy logs in"
 msgstr "֤󤷤ޤ"
 
-#: src/sound.c:70
+#: src/sound.c:69
 msgid "Buddy logs out"
 msgstr "֤Ȥޤ"
 
-#: src/sound.c:71
+#: src/sound.c:70
 msgid "Message received"
 msgstr "å"
 
-#: src/sound.c:72
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr "åä򳫻Ϥޤ"
 
+#: src/sound.c:72
+msgid "Message sent"
+msgstr "å"
+
 #: src/sound.c:73
-msgid "Message sent"
-msgstr "å"
+msgid "Person enters chat"
+msgstr "åȤ˿ͤ"
 
 #: src/sound.c:74
-msgid "Person enters chat"
-msgstr "åȤ˿ͤ"
+msgid "Person leaves chat"
+msgstr "ͤåȤФޤ"
 
 #: src/sound.c:75
-msgid "Person leaves chat"
-msgstr "ͤåȤФޤ"
-
-#: src/sound.c:76
 msgid "You talk in chat"
 msgstr "ʤåȤäޤ"
 
-#: src/sound.c:77
+#: src/sound.c:76
 msgid "Others talk in chat"
 msgstr "¾οͤåȤäޤ"
 
-#: src/sound.c:80
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr "åȤǤʤ̾ï"
 
+#~ msgid "Accounts"
+#~ msgstr ""
+
+#~ msgid "About"
+#~ msgstr "Gaim ɥååȤˤĤ"
+
+#~ msgid "Docklet Configuration"
+#~ msgstr "ɥååȤ"
+
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "ͭΤǡ%2$s%1$dåƨޤ"
+
+#~ msgid ""
+#~ "<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>"
+
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "ICQ ǧڤ̲ᤷޤ"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - ¸"
+
+#~ msgid "Add Buddy"
+#~ msgstr "ͧãɲ"
+
+#~ msgid "Contact"
+#~ msgstr "󥿥"
+
+#~ msgid "Allow List"
+#~ msgstr "ĥꥹ"
+
+#~ msgid "Block List"
+#~ msgstr "ݥꥹ"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "֤Υꥢ"
+
+#~ msgid "Rename Group"
+#~ msgstr "롼פβ̾"
+
 #~ msgid " for updates."
 #~ msgstr "Τˡ"
 
--- a/po/ko.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/ko.po	Sun Jan 05 23:21:50 2003 +0000
@@ -1,11 +1,10 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.59.3\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\n"
 "PO-Revision-Date: 2002-10-02 07:32+0900\n"
 "Last-Translator: A Lee <alee@debian.org>\n"
 "Language-Team: artsilly and alee team\n"
@@ -13,336 +12,526 @@
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "ڸ"
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "ڷ"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+msgid "Auto-login"
+msgstr "ڵ α"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr " "
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Ҹ"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "ȯ漳"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "..."
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr ""
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr " - Ҹ "
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "ģ "
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "ä"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 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
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "ä ɼ"
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 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
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 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
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr ""
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "밡 ä "
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr " ä "
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr "׳  ü ǥñ ȯ "
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr "Ʈ ()"
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr "Ʒ ڿ ȣ \"+\" Ͽ Էϼ."
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr "ȣ ݸ ǥ"
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr "ʿ  ũ"
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 msgid "(No"
 msgstr ""
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 msgid "Change"
 msgstr ""
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "%s Ͽ   ϴ."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "ӵ "
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "޽ â"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "׷ ä â"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "˾â  "
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+#, fuzzy
+msgid "_Quote window title"
+msgstr " ȭâ  ũ"
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "˾â  "
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "  ϴ"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "׽Ʈ"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr " ȭ ϳ â  "
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "޽   "
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 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
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr "ģ鿡Ը ڸ ǥ"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 msgid "Invisible"
 msgstr " ʵ "
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "ģ鿡Ը  ʵ "
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "޽   "
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "ȣƮ IP   ϴ."
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "   ϴ."
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "κ ȿ   Խϴ."
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "Ͽ д ߿  ߻߽ϴ."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 msgid "Error while writing to socket."
 msgstr "Ͽ  ߿  ߻߽ϴ."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 msgid "Authentication failed."
 msgstr " ."
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "    ڵ."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr ":"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "- ڸ"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "  ϴ."
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "   ϴ."
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "  ϴ."
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "͸ д "
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "뷱 Ǽ"
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr " Ű д "
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "Ű ؽ ȯϴ "
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "GG ̺귯 ġ \n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "    "
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "޽ "
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr "GG  ã "
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "߸ - UIN "
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s  ϴ."
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "    "
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "޽ "
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr "GG  ã "
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "߸ - UIN "
+
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "߸ - UIN ޽  ϰֽϴ."
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "- "
-
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "˻    ϴ"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "- ˻ "
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Ȱȭ"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr ""
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "ƴϿ"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "̸"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr ""
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr ""
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr ""
 
 #. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "/"
 
-#: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#: src/protocols/gg/gg.c:771
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr " ģ  Ǿ  ʽϴ."
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr " ģ    ϴ."
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:824
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr " ģ   Խϴ."
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:829
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
+msgstr " ģ    ϴ."
+
+#: src/protocols/gg/gg.c:835
+#, fuzzy
+msgid "Buddy List successfully deleted from Gadu-Gadu server"
+msgstr " ģ  Ǿϴ."
+
 #: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "- "
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
-msgstr " ģ    ϴ."
-
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List successfully deleted from server"
-msgstr " ģ  Ǿϴ."
-
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr " ģ    ϴ."
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "йȣ  Ǿϴ."
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "йȣ   ϴ."
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "http û   ϴ."
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr " ģ    (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "ģ     (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr " ģ    (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "˻ 񽺿   (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "йȣ   (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:962
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:963
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating with "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:990
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:991
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1048
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr " ģ    ϴ."
+
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1070
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1118
+#, fuzzy
+msgid "Unable to access directory"
+msgstr " ޽   "
+
+#: src/protocols/gg/gg.c:1119
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1151
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "йȣ   ϴ."
+
+#: src/protocols/gg/gg.c:1152
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "丮 ˻"
 
@@ -350,310 +539,483 @@
 #. } 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
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "йȣ "
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr " ģ  "
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "ģ   "
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr " ģ  "
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/protocols/gg/gg.c:1214
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "%s    ϴ."
+
+#: src/protocols/gg/gg.c:1215
+msgid ""
+"Gaim was unable to access this user's profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr ":"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "- ڸ"
+
+#: src/protocols/icq/gaim_icq.c:229
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "ź"
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "  ޽ "
 
-#: 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
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr " "
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "   ð ֱ"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "%s DCC  ϴ"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "Ͽ "
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s   %s  ٲپϴ</B>"
 
-#: src/protocols/irc/irc.c:825
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr " Ű д "
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "IRC "
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
 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:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
 msgid "IRC Error"
 msgstr "IRC "
 
-#: src/protocols/irc/irc.c:828
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
 msgid "No such server"
 msgstr "׷  ϴ"
 
-#: src/protocols/irc/irc.c:830
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
 msgid "No nickname given"
 msgstr "ȭ Է ʾҽϴ"
 
-#: src/protocols/irc/irc.c:976
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 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/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "  ϴ."
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "%sκ  Ǿϴ: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "%s  Ǿϴ: %s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "  "
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "%s ܵξϴ."
 
-#: src/protocols/irc/irc.c:1582
+#: src/protocols/irc/irc.c:2065
 msgid "IRC Part"
 msgstr "IRC "
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "ä:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "н:"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC ä"
 
-#: 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
-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
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr ":"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "Ʈ"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
+#, fuzzy
+msgid "Unable to change password."
+msgstr "йȣ   ϴ."
+
+#: src/protocols/jabber/jabber.c:973
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:978
+#, fuzzy
+msgid "Unable to change password"
+msgstr "йȣ   ϴ."
+
+#: src/protocols/jabber/jabber.c:979
+msgid ""
+"The new password you entered is the same as your current password.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr "˷ "
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr "ڸ"
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr "ر"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1368
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr " "
+
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr " %s: %s"
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1477
 msgid "Unknown Error in presence"
 msgstr "    ߻"
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1647
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
 
-#: src/protocols/jabber/jabber.c:1632
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1672
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1675
+#, fuzzy
+msgid "No such user."
 msgstr "׷  "
 
-#: 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:1719
-#: src/protocols/msn/msn.c:1110
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "ģ"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr " Ȯ "
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "   α "
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2242
 msgid "Password successfully changed."
 msgstr "йȣ  Ǿϴ."
 
-#: src/protocols/jabber/jabber.c:2012
-msgid "Password Change"
-msgstr "йȣ "
-
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr " "
 
-#: 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
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "  ϴ"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "  ûϴ "
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
-msgid "Invalid Jabber I.D."
-msgstr "߸  ̵"
-
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2619
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2621
+msgid "Jabber Error"
+msgstr " "
+
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "ȭ:"
 
-#: src/protocols/jabber/jabber.c:2477
-msgid "Server:"
-msgstr ":"
-
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "ó:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2889
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "  ϴ"
+
+#: src/protocols/jabber/jabber.c:2922
 msgid "Chats"
 msgstr "ä"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3229
 msgid "View Error Msg"
 msgstr " ޽ "
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "ڸ ޽ "
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3253
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3256
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr "Ͽ "
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3284
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "˾â  "
+
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "̸"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Ÿ ּ"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr " ּ"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "ġ"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "ȣ"
 
 #. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "ȭ"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr " ̸"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr " μ"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3494
 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:3094
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -661,362 +1023,586 @@
 "  ׸ ûԴϴ. Էص ϴٰ ϴ  Է"
 "ʽÿ."
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr " Ȯ"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr " -  vCard "
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "  ߽ϴ!"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "  Է"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "  (   )"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "߸ Ķ (   )"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 msgid "Invalid User"
 msgstr "߸ "
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr " ̸ "
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr "̹ αεǾ "
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 msgid "Invalid Username"
 msgstr "߸  ̸"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Friendly Name"
 msgstr "߸ ȭ"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr " "
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr "̹ "
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 msgid "Not on list"
 msgstr "Ͽ "
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr "ڰ  ƴ"
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr "̹ ش 忡 "
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr "̹ ݴ Ͽ "
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr "ġ "
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr " ˸ "
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr "ʼ ׸ "
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 msgid "Not logged in"
 msgstr "ӵ "
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 msgid "Internal server error"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr "ͺ̽  "
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 msgid "File operation error"
 msgstr " ó "
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 msgid "Memory allocation error"
 msgstr "޸ Ҵ "
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 msgid "Server busy"
 msgstr " ٻ"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 msgid "Server unavailable"
 msgstr "   "
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr "Ǿ ˸  ٿ"
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 msgid "Database connect error"
 msgstr "ͺ̽  "
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr "  ٿ"
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 msgid "Error creating connection"
 msgstr "  ߻"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr " ϰ ʹ ŭ"
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr "ڰ ʹ Ȱ"
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr " ʹ ϴ."
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr "ġ "
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr "߸ ģ "
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 msgid "Authentication failed"
 msgstr " ."
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 msgid "Not allowed when offline"
 msgstr "   "
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr "ο ڸ  "
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr "ڸ   "
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 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:558
-msgid "A message may not have been received."
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
+#, fuzzy
+msgid "An MSN message may not have been received."
 msgstr "޽   ϴ."
 
-#: src/protocols/msn/msn.c:813
-msgid "Gaim was unable to send a message"
+#: src/protocols/msn/msn.c:1041
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "޽   ϴ"
 
-#: src/protocols/msn/msn.c:917
-#, 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
-#, c-format
-#msgid "The user %s (%s) wants to add you to their buddy list"
-#msgstr "%s  ڽ Ͽ ߰ϰ ;մϴ."
-
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1042
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "AOL "
+
+#: src/protocols/msn/msn.c:1143
+#, 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:1193 src/protocols/msn/msn.c:1968
+msgid "Unable to write to server"
+msgstr " ͸   ϴ."
+
+#: src/protocols/msn/msn.c:1300
+#, fuzzy, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
+
+# msgid "The user %s (%s) wants to add %s to his or her buddy list."
+# msgstr "%s  ڽ Ͽ ߰ϰ ;մϴ."
+# msgid "The user %s (%s) wants to add you to their buddy list"
+# msgstr "%s  ڽ Ͽ ߰ϰ ;մϴ."
+#: src/protocols/msn/msn.c:1401
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "ٸ   ̵ αϿ  ϴ."
 
-#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 msgid "Error reading from server"
 msgstr " д   ߻߽ϴ."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "   ϴ."
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr " ͸   ϴ."
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr " ʴ Դϴ."
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr " ޽   "
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "AIM  α  ϴ"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "йȣ   ϴ."
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr "йȣ  Դϴ."
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1839
 msgid "Unable to send password"
 msgstr "йȣ   ϴ."
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1844
 msgid "Password sent"
 msgstr "йȣ "
 
-#: src/protocols/msn/msn.c:1748
-msgid "Unable to write to server"
-msgstr " ͸   ϴ."
-
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "  ϴ."
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "޽   ϴ : ʹ Ůϴ."
+
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr " ȭ"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr "ڸ"
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr " ƿ"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 msgid "Busy"
 msgstr "ٸ 빫 "
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr "ȭ "
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr " "
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 msgid "Hidden"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2428
+#, fuzzy
+msgid "Be right back"
+msgstr " ƿ"
+
+#: src/protocols/msn/msn.c:2430
+#, fuzzy
+msgid "Away from the computer"
+msgstr "ڸ"
+
+#: src/protocols/msn/msn.c:2432
+#, fuzzy
+msgid "On the phone"
+msgstr "ȭ "
+
+#: src/protocols/msn/msn.c:2434
+#, fuzzy
+msgid "Out to lunch"
+msgstr " "
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr ":"
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr "ȭ  ħ"
 
-#: src/protocols/msn/msn.c:2114
-msgid "Friendly name too long."
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr " "
+
+#: src/protocols/msn/msn.c:2555
+#, fuzzy
+msgid "New MSN friendly name too long."
 msgstr "ȭ ʹ ϴ."
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 msgid "Set Friendly Name"
 msgstr " ȭ "
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2571
 msgid "Set Friendly Name:"
 msgstr "ȭ: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 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:457 src/protocols/oscar/oscar.c:3209
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/msn/msn.c:2732
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
+#, fuzzy
+msgid "Invalid MSN screenname"
+msgstr "߸  ̸"
+
+#: src/protocols/msn/msn.c:2789
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr " ׷:"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "߸ "
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "߸ ̸"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "   "
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "丮 񽺸 Ͻ   ϴ."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
+#, c-format
 msgid "Direct IM with %s closed"
 msgstr "%s   ϴ"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
+#, c-format
 msgid "Direct IM with %s failed"
 msgstr "%s  ῡ ߽ϴ"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "  (ɰ)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "  (߿)\n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "."
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s ȭǰ  ϴ."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "ä !"
-
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr " ä  ϴ."
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr " - ä"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "ȣƮ   ϴ."
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "н带   ٸ \n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "  \n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "AIM  α  ϴ"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr ": %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr " .\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "  ϴ"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "  Ű ½ϴ"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "̵ н尡 ƲȽϴ."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "    Դϴ."
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr " 񽺰  Ұմϴ."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:648
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1025,26 +1611,87 @@
 "õѴٸ ٷ ϴ ð  ϴ."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:653
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "ϰ ִ Ŭ̾Ʈ ʹ Ǿϴ.  ġ ׷̵Ͻ"
 "ÿ. "
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "޽   ϴ"
+
+#: src/protocols/oscar/oscar.c:1061
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "޽   ϴ"
+
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s  "
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+#, fuzzy
+msgid "Transfer timed out"
+msgstr " ˸ "
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "  %s   ϴ."
+
+#: src/protocols/oscar/oscar.c:1632
+#, fuzzy
+msgid "File transfer aborted"
+msgstr " ˸ "
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+msgid "No reason given."
+msgstr " Է ʾҽϴ."
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr " - ICQ  źε"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1055,246 +1702,380 @@
 ": \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
-msgid "No reason given."
-msgstr " Է ʾҽϴ."
-
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:2128
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr " - ICQ  źε"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "%lu  ģ Ͽ ڽ ߰ϴ  ޾Ƶ鿴ϴ."
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr " - ICQ  ޾Ƶ鿩"
-
-#: 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:1586
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
-msgstr "%d %s  ޽ ȿ ʾ   ϴ."
-
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:2141
+#, fuzzy, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr "%sκ  Ǿϴ: %s"
+
+#: src/protocols/oscar/oscar.c:2149
 #, c-format
-msgid "You missed %d message from %s because it was too large."
-msgstr "%d %s  ޽ ʹ Ŀ   ϴ."
-
-#: 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: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: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:1615
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
-msgstr "%d %s  ޽  ܾ ϰ ־   ϴ."
-
-#: src/protocols/oscar/oscar.c:1616
+msgid ""
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
-msgid "You missed %d messages from %s because they are too evil."
-msgstr "%d %s  ޽  ܾ ϰ ־   ϴ."
-
-#: src/protocols/oscar/oscar.c:1625
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+" ģ Ͽ ߰ұ?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "%d %s  ޽ ȿ ʾ   ϴ."
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "%d %s  ޽ ȿ ʾ   ϴ."
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgstr "%d %s  ޽ ʹ Ŀ   ϴ."
+
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
+msgstr "%d %s  ޽ ʹ Ŀ   ϴ."
+
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgstr "%d %s  ޽ ð  ʰ   ϴ."
+
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
+msgid ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr "%d %s  ޽ ð  ʰ   ϴ."
+
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr ""
+"%d %s  ޽  ܾ ϰ ־   ϴ."
+
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
+msgstr ""
+"%d %s  ޽  ܾ ϰ ־   ϴ."
+
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
 msgstr " ܾ ؼ %d %s  ޽   ϴ."
 
-#: src/protocols/oscar/oscar.c:1626
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr " ܾ ؼ %d %s  ޽   ϴ."
 
-#: src/protocols/oscar/oscar.c:1634
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "    %d %s  ޽   ϴ."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
+msgstr "    %d %s  ޽   ϴ."
+
+#: src/protocols/oscar/oscar.c:2342
 #, 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: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:1703
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
+#, fuzzy, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1705
-#, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+#: src/protocols/oscar/oscar.c:2389
+#, fuzzy, c-format
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC : %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr " - ī SNAC "
-
-#: src/protocols/oscar/oscar.c:1753
-#, c-format
-msgid "Your message to %s did not get sent: %s"
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "   α "
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
+#, fuzzy
+msgid "No reason was given."
+msgstr " Է ʾҽϴ."
+
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
 msgstr "%sԿ ޽  ߽ϴ: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "   "
-
-#: src/protocols/oscar/oscar.c:1771
-#, c-format
-msgid "User information for %s unavailable: %s"
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "%s   ޾ƿ  ϴ: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "ģ "
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "׸ ޽"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "ä"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr " ޱ"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
-msgid "Send File"
-msgstr " "
-
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "ģ  "
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy "
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "AP "
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "㹫"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "ICQ  "
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ ˷ "
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Ʈ ȣȭ"
 
-#: src/protocols/oscar/oscar.c:1886
+#: src/protocols/oscar/oscar.c:2655
 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>"
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1914
-#, c-format
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "ڸ : <B>%s</B>  %s <BR>\n"
 "  : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>ڸ ޽ </i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Ŭ̾Ʈ ȣȯ: "
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i> </i>"
 
-#: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#: src/protocols/oscar/oscar.c:2751
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr " ϴ."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL "
-
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3010
+msgid "Rate limiting error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3011
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "ʹ  ޽   ʰϿ  ޽   "
 ". 10  ٽ õϽʽÿ."
 
-#: src/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:3192
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "  ߻"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "%s    ϴ."
+
+#: src/protocols/oscar/oscar.c:3721
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3727
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3764
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "޽   ϴ"
+
+#: src/protocols/oscar/oscar.c:3765
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3781
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1304,158 +2085,154 @@
 "ϴ. ѵ ں ģ     ģ ¶  "
 "  ֽϴ."
 
-#: src/protocols/oscar/oscar.c:3195
-msgid "Gaim - Warning"
-msgstr " - "
-
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "ȯ:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr " ޽   "
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:4620
 #, 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?"
+msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
-"%s԰   ߽ϴ.       "
-"IP ּҸ   , ̴ Ȼ    ֽϴ. ׷  "
-"ұ?"
-
-#: src/protocols/oscar/oscar.c:3568
-#, c-format
+
+#: src/protocols/oscar/oscar.c:4621
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
-"support sending status messages.</I><BR>"
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
+#, fuzzy, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ϴ α׷ "
 " ޽    ʽϴ.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3575
-#, c-format
+#: src/protocols/oscar/oscar.c:4642
+#, fuzzy, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
 msgstr ""
-"<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ޽ ϴ."
-"</I><BR>"
-
-#: src/protocols/oscar/oscar.c:3600
+"<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ޽ ϴ.</"
+"I><BR>"
+
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr " ޽ "
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "   "
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%s Ͽ   ϴ."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%s    ϴ."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "޽ ʹ   %s Ʈ ©Ƚϴ."
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s  α ʾҽϴ."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s   ʽϴ."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr " ӵѰ踦 Ѿ  ޽   ϴ."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s ä    ϴ."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "%sԿ ʹ  ޽  ֽϴ."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "%sԿԼ  ޽ ʹ Ŀ   ϴ."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s ޽ ʹ     ϴ."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "ش ׸ ʹ ϴ."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "  Ͻʽÿ."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "丮 񽺸 Ͻ   ϴ."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr " ãƺⰡ Ǿ ֽϴ."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Ű尡 õǾϴ."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "Ű尡 ϴ."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "ڰ 丮    ʽϴ."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr " ʴ Դϴ."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "   : %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr " 񽺰  Ұմϴ."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "αϱ⿡   ʹ ϴ."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1463,356 +2240,293 @@
 "ʹ   Ḧ ݺϿϴ. 10 ٸ  ٽ õϽʽÿ. "
 " õѴٸ ٷ ϴ ð  ϴ."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr " ߿     ߻Ͽϴ: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "   , %d ߻Ͽϴ.  : %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr " ϴ."
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr " ٸ ..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC Ͻ ¿ ٽ ۵Ǿϴ.  ޽   ֽϴ."
-
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "TOC ٽ "
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "ä "
-
-#: src/protocols/toc/toc.c:782
+msgstr ""
+"TOC Ͻ ¿ ٽ ۵Ǿϴ.  ޽   ֽϴ."
+
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "йȣ Ǿϴ."
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
-msgid "Gaim - Password Change"
-msgstr " - йȣ "
-
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
+msgid "TOC has sent a PAUSE command."
+msgstr ""
+
+#: src/protocols/toc/toc.c:829
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC Ͻ  ½ϴ. TOC Ͻ    ޽ "
 "մϴ. ׸  ޽     ֽϴ. ̰"
 " Ͻ ̴ Ű澲 ʽÿ."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC Ͻ"
-
-#: src/protocols/toc/toc.c:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "丮  "
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+#, fuzzy
+msgid "TOC Host:"
+msgstr "ȣƮ"
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "Ʈ"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "    ϴ!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "    ϴ!"
+
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "    ϴ!"
 
-#: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "    ϴ!"
-
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1847
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
+
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr " -  ̸ "
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, 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:1963
+msgstr ""
+"%s %s %d  ϱ⸦ ûϿϴ :%s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1980
 #, 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:1968
+msgstr ""
+"%s %s %d  ϱ⸦ ûϿϴ :%s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s  ޶ ûϿϴ"
 
-#: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:583
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "޽ ޵ ʾҽϴ."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "Zġ"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Ŭ:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "νϽ:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "޴»:"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "(v%s)..."
 
-#: src/about.c:135
+#: src/about.c:112
+#, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 " AOL  ϴ ޽Դϴ. Gtk+ ̿Ͽ \n"
 "GPL ̼ մϴ.\n"
 "\n"
 "URL:"
 
-#: src/about.c:137
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.openprojects.net"
+#: src/about.c:122
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
-"\n"
-"\n"
-"IRC: irc.openprojects.net  #gaim ä"
-
-#: src/about.c:147
+
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
 msgstr ""
-" ۾ \n"
-"====================\n"
-"Rob Flynn (̳) [ rob@marko.net ]\n"
-"Sean Egan (ڴ)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"ũ ġ \n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-" \n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer ( )   [ markster@marko.net ]"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "Ʈ"
-
-#: src/aim.c:153 src/buddy.c:2709
-msgid "Signoff"
-msgstr " "
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "ݱ"
 
 #: src/aim.c:165
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "  Էϼ"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
-msgid "Signon Error"
-msgstr " "
-
-#: src/aim.c:263
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr " - α"
 
-#: src/aim.c:281
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "̵: "
 
-#: src/aim.c:297
-msgid "Password: "
-msgstr "йȣ: "
-
-#: src/aim.c:318 src/buddy.c:2713
-msgid "Quit"
-msgstr ""
-
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
-msgid "Accounts"
-msgstr ""
-
-#: src/aim.c:325 src/multi.c:915
-msgid "Signon"
-msgstr ""
-
-#: src/aim.c:357
-msgid "About"
-msgstr "... Ͽ"
-
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
-msgid "Options"
-msgstr "ɼ"
-
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
-msgid "Plugins"
-msgstr "÷"
-
-#: src/aim.c:828 src/buddy.c:2749
-msgid "Preferences"
-msgstr "ȯ漳"
-
-#: src/aim.c:838 src/multi.c:1472
-msgid "Auto-login"
-msgstr "ڵ α"
-
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr " õմϴ...."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "ӵǾ  ʽϴ. Ŭϸ α ȭ ɴϴ."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "ڸ: %d "
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "ڸ"
-
-#: src/applet.c:200 src/away.c:388
+#: src/away.c:188
+msgid "Gaim - Away!"
+msgstr " - ڸ!"
+
+#: src/away.c:235
+msgid "I'm Back!"
+msgstr " ƿԴ!"
+
+#: src/away.c:353
 msgid "New Away Message"
 msgstr " ڸ ޽"
 
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr " ø   ϴ!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "... Ͽ"
-
-#: src/away.c:202
-msgid "Gaim - Away!"
-msgstr " - ڸ!"
-
-#: src/away.c:250
-msgid "I'm Back!"
-msgstr " ƿԴ!"
-
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr "ڷ"
-
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "ڸ ޽ "
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr " ڸ ޽ "
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "׷"
 
-#: 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
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "޽"
 
-#: 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
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr ""
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr "ģ˸ ߰"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr " ȭ "
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "̸ ٲٱ"
 
-#: src/buddy.c:846
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1645 src/buddy.c:2732
-msgid "Buddy Pounce"
-msgstr "ģ˸"
-
-#: src/buddy.c:1725
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr " ģ˸"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "ģ˸ "
 
-#: src/buddy.c:1771
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 ޽)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[Ϸ Ŭϼ]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "ӵ: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr ": %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "밡: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1823,875 +2537,877 @@
 "̵: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr ":"
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s ߽ϴ."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s  ϴ."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr " ģ  "
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "޽ "
 
-#: src/buddy.c:2616
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "ä /"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "ڸ ޽ "
 
-#: src/buddy.c:2689
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr " - ģ"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr ""
 
-#: src/buddy.c:2693
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr "ģ ߰"
 
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
+msgstr "ä "
+
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr " ڸ ޽"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
+msgstr "  "
+
+#: src/buddy.c:2643
+msgid "Import Buddy List"
+msgstr "ģ "
+
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr ""
+
+#: src/buddy.c:2657
+msgid "Tools"
+msgstr ""
+
+#: src/buddy.c:2667
+msgid "Buddy Pounce"
+msgstr "ģ˸"
+
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr ""
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "ȯ漳"
+
+#: src/buddy.c:2683
+msgid "Protocol Actions"
+msgstr "  "
+
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
+msgstr "̹"
+
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
+msgstr "ý α "
+
 #: src/buddy.c:2695
-msgid "Join A Chat"
-msgstr "ä "
-
-#: src/buddy.c:2697
-msgid "New Instant Message"
-msgstr " ޽"
-
-#: src/buddy.c:2699 src/dialogs.c:759
-msgid "Get User Info"
-msgstr "  "
-
-#: src/buddy.c:2704
-msgid "Import Buddy List"
-msgstr "ģ "
-
-#: src/buddy.c:2722
-msgid "Tools"
-msgstr ""
-
-#: src/buddy.c:2745
-msgid "Protocol Actions"
-msgstr "  "
-
-#: src/buddy.c:2751
-msgid "View System Log"
-msgstr "ý α "
-
-#: src/buddy.c:2763
-msgid "Perl"
-msgstr "(ũƮ)"
-
-#: src/buddy.c:2766
-msgid "Load Script"
-msgstr " ũƮ "
-
-#: src/buddy.c:2770
-msgid "Unload All Scripts"
-msgstr "ũƮ  "
-
-#: src/buddy.c:2774
-msgid "List Scripts"
-msgstr " ũƮ"
-
-#: src/buddy.c:2782
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2787
+#: src/buddy.c:2699
 msgid "Online Help"
 msgstr "¶ "
 
-#: src/buddy.c:2788
+#: src/buddy.c:2700
 msgid "Debug Window"
 msgstr " â"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "..."
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "ģ "
 
-#: src/buddy.c:2860
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr " ģ ߰"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr " ׷ ߰"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr " ģ ׷ "
 
-#: src/buddy.c:2889
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr ""
 
-#: src/buddy.c:2932
-msgid "Gaim - Buddy List"
-msgstr " - ģ"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "ä "
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "ä  :"
 
-#: 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 ""
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "ʴ"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "ģ"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "޽"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr " - ȭǷ ģ ʴ"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr " "
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr ""
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s() ȭǿ ֽϴ."
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ȭǿ ̽ϴ."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s ȭǿ ̽ϴ."
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ȭ %s ٲټ̽ϴ."
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ȭǿ ̽ϴ. (%s)"
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s ȭǿ ̽ϴ."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr " - ׷ ä"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr ":"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "ȭǿ ƹ ϴ."
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
-msgid "Whisper"
-msgstr "ӼӸ"
-
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1586 src/conversation.c:2906
+msgid "Warn"
+msgstr ""
+
+#: src/buddy_chat.c:1592 src/conversation.c:2925
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
-msgid "Warn"
-msgstr ""
-
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr " - ȭ "
-
-#: src/conversation.c:492
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr " - ׸ "
 
-#: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#: src/conversation.c:1305
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
+msgstr "޽   ϴ : ʹ Ůϴ."
+
+#: src/conversation.c:1309
+#, fuzzy
+msgid "Unable to send message"
 msgstr "޽   ϴ : ʹ Ůϴ."
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "޽ "
-
-#: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "޽   ϴ :    "
-
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr " %d, "
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "%d ġ űϴ\n"
-
-#: src/conversation.c:2170 src/prefs.c:1308
-msgid "Bold Text"
-msgstr "β ۾"
-
-#: src/conversation.c:2170
-msgid "Bold"
-msgstr "β"
-
-#: src/conversation.c:2174
-msgid "Italics Text"
-msgstr " ۾"
-
-#: src/conversation.c:2175
-msgid "Italics"
-msgstr ""
-
-#: src/conversation.c:2178 src/prefs.c:1320
-msgid "Underline Text"
-msgstr " ģ ۾"
-
-#: src/conversation.c:2179
-msgid "Underline"
-msgstr ""
-
-#: src/conversation.c:2183 src/prefs.c:1326
-msgid "Strike through Text"
-msgstr " ģ ۾"
-
-#: src/conversation.c:2183
-msgid "Strike"
-msgstr ""
-
-#: src/conversation.c:2189
-msgid "Decrease font size"
-msgstr " ũ ̱"
-
-#: src/conversation.c:2189
-msgid "Small"
-msgstr "۰"
-
-#: src/conversation.c:2192
-msgid "Normal font size"
-msgstr " ũ "
-
-#: src/conversation.c:2192
-msgid "Normal"
-msgstr ""
-
-#: src/conversation.c:2195
-msgid "Increase font size"
-msgstr " ũ Ű"
-
-#: src/conversation.c:2195
-msgid "Big"
-msgstr "ũ"
-
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
-msgid "Select Font"
-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"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "ȭ "
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "ũ "
 
-#: src/conversation.c:2219
-msgid "Link"
-msgstr "ũ"
-
-#: src/conversation.c:2222
-msgid "Insert smiley face"
-msgstr "ϸ  "
-
-#: src/conversation.c:2222
-msgid "Smiley"
-msgstr "ϸ"
-
-#: src/conversation.c:2225
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "޽ ׸ "
 
-#: src/conversation.c:2225
-msgid "Image"
-msgstr "׸"
-
-#: src/conversation.c:2232
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "ݱ"
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "ɼ"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr " ϱ"
 
-#: src/conversation.c:2233 src/prefs.c:254
-msgid "Logging"
-msgstr ""
-
-#: src/conversation.c:2242
-msgid "Save Conversation"
-msgstr "ȭ "
-
-#: 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:2247 src/conversation.c:2248
-msgid "Sound"
-msgstr "Ҹ"
-
-#: src/conversation.c:2729
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr " ϱ"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr " - ȭ"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "äý  :"
 
-#: src/conversation.c:3453
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr " -  "
 
-#: src/conversation.c:3487
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "ִϸ̼ "
 
-#: src/conversation.c:3492
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "ִϸ̼ "
 
-#: src/conversation.c:3498
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr " "
 
-#: src/conversation.c:3504
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr " ̸  "
 
-#: src/dialogs.c:412
-msgid "Gaim - Warn user?"
-msgstr " - ڿ  "
-
-#: src/dialogs.c:432
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr " %sԿ  ?"
-
-#: src/dialogs.c:437
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "͸  ?"
 
-#: src/dialogs.c:441
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "͸    ų  ֽϴ."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "'%s'  ģϿ մϴ.\n"
 
-#: src/dialogs.c:494
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr " - %s Ͽ "
-
-#: src/dialogs.c:507
-msgid "Remove Buddy"
-msgstr "ģ "
-
-#: src/dialogs.c:517
-#, c-format
-msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
-" ģ Ͽ '%s'\n"
-"ұ?"
-
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
-msgid "Accept"
-msgstr ""
-
-#. Build OK Button
-#: 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:687
-msgid "Gaim - IM user"
-msgstr " - ޽ "
-
-#: src/dialogs.c:704
-msgid "IM who:"
-msgstr " ģ"
-
-#: src/dialogs.c:768
-msgid "User:"
-msgstr ":"
-
-#: src/dialogs.c:777
-msgid "Account:"
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "̵:"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
 msgstr ":"
 
-#. Finish up
-#: src/dialogs.c:826
-msgid "Gaim - Get User Info"
-msgstr " -   "
-
-#: src/dialogs.c:940
-msgid "Add Group"
-msgstr "׷ ߰"
-
-#: src/dialogs.c:965
+#: src/dialogs.c:804
+msgid ""
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr " - ׷ ߰"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "׷"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr " - ģ ߰"
 
-#: src/dialogs.c:1061
-msgid "Add Buddy"
-msgstr "ģ ߰"
-
-#: src/dialogs.c:1071
-msgid "Contact"
-msgstr "̵"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "̵: "
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr ""
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1468
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr " - ڸ!"
+
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
+msgid "Set privacy for:"
+msgstr " :"
+
+#: src/dialogs.c:1505
+msgid "Allow all users to contact me"
+msgstr " ڰ   ֵ "
+
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr " Ͽ ִ ڸ   ֵ "
+
+#: src/dialogs.c:1513
+msgid "Allow only the users below"
+msgstr " Ͽ ִ ڸ   ֵ "
+
+#: src/dialogs.c:1551
+msgid "Deny all users"
+msgstr " ڸ ź"
+
+#: src/dialogs.c:1555
+msgid "Block the users below"
+msgstr " Ͽ ִ ڸ "
+
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "ģ˸  ģ Էϼ."
 
-#: src/dialogs.c:1134
-msgid "Buddy Pounce Error"
-msgstr "ģ˸ "
-
-#: src/dialogs.c:1270
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr " -  ģ˸"
 
 #. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "ģ˸ - ?"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr ""
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "ģ˸ - ?"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "ģ   ˸"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "ģ ڸ򿡼 ƿ  ˸"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "ģ Կ ƿ  ˸"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "ģ  Ÿ ϸ ˸"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "ģ˸ - ൿ?"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "޽ â "
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "˾â  "
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "޽ "
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "ģ˸  "
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "ģ˸ Ҹ "
 
 #. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr " ۵  ģ˸ "
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr ""
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr ""
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr " - 丮  "
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "丮 "
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr " Ͽ   ˻  ֵ "
 
 #. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr ""
 
 #. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "߰ ̸"
 
 #. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "̸"
 
 #. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "ȥ  ̸"
 
 #. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "/"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr ""
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr " н尡 ġ ʽϴ"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
-msgid "Gaim - Change Password Error"
-msgstr " - йȣ  "
-
-#: src/dialogs.c:1705
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr " ׸  äʽÿ"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2228
+msgid "Gaim - Password Change"
+msgstr " - йȣ "
+
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr " йȣ"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr " йȣ"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr " йȣ Ȯ"
 
-#: src/dialogs.c:1829
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "Ȯ"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr " -   "
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "˻   ϴ: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
-msgid "Deny"
-msgstr "ź"
-
-#: src/dialogs.c:2120
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr " -   ߰"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr " - ź  ߰"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr " - ȭ "
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "ģ ã"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr " -  ģ ã"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr " -  ּҷ ģ ã"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "ũ "
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr " - URL ߰"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "  "
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "۲ "
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr " :"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr " - ģ "
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3075
-msgid "You cannot create an away message with a blank title"
+#: src/dialogs.c:3470
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "ڸ ޽     ˴ϴ"
 
+#: src/dialogs.c:3471
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "ڸ ޽    ˴ϴ"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr " -  ڸ ޽"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr " ڸ ޽"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "ڸ : "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "  "
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3216
-msgid "Save & Use"
-msgstr "  "
-
 #. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3466
-msgid "Alias Buddy"
-msgstr "ģ  "
-
-#: src/dialogs.c:3499
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr " -  "
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3879 src/dialogs.c:3886
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "ȣƮ   ϴ."
+
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr " - α "
 
-#: src/dialogs.c:3603
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "%s    ϴ. - %s"
-
-#: src/dialogs.c:3631
+#: src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "  %s   ϴ."
+
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr " α׸ ?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "Ȯ"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "¥"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "ȭ"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr " - ׷ ̸ "
 
-#: src/dialogs.c:3991
-msgid "Rename Group"
-msgstr "׷ ̸ "
-
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
+msgid "Gaim - Rename Buddy"
+msgstr " - ģ ̸ "
+
+#: src/dialogs.c:4445
+msgid "Rename Buddy"
+msgstr "ģ ̸ "
+
+#: src/dialogs.c:4452
 msgid "New name:"
 msgstr " ̸:"
 
-#: src/dialogs.c:4087
-msgid "Gaim - Rename Buddy"
-msgstr " - ģ ̸ "
-
-#: src/dialogs.c:4097
-msgid "Rename Buddy"
-msgstr "ģ ̸ "
-
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr " -  ũƮ "
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "  %s   ϴ."
 
-#: src/gaimrc.c:1137
-msgid "Preferences Error"
-msgstr "ȯ漳 "
-
-#: src/html.c:183
+#: src/html.c:185
 #, c-format
 msgid "Received: '%s'\n"
 msgstr ": '%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003:   ߻.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
-msgid "Plugin Error"
-msgstr "÷ "
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "̵:"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr ":"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr " - ģ  ҷ"
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "ģ  :"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Ž"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr ""
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "޲ ɼ"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "̵:"
 
-#: src/multi.c:559
+#: src/multi.c:653
 msgid "Alias:"
 msgstr ":"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr ":"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "н "
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "ڵ α"
 
-#: src/multi.c:616
+#: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "Ϲ ɼ"
+
+#: src/multi.c:715
 msgid "New Mail Notifications"
 msgstr "ο  ˸"
 
-#: src/multi.c:706
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "ɼ"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr " "
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr " -  "
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "н"
 
-#: src/multi.c:947
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "н:"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr ""
+
+#: src/multi.c:1077
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:1078
+msgid ""
+"You have attempted to login an IM account using the TOC protocol.  Because "
+"this protocol is inferior to OSCAR, it is now compiled as a plugin by "
+"default.  To login, edit this account to use OSCAR or load the TOC plugin."
+msgstr ""
+
+#: src/multi.c:1084
+#, fuzzy
+msgid "Protocol not found."
+msgstr "  "
+
+#: src/multi.c:1085
 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."
@@ -2699,771 +3415,853 @@
 "  α׿  ϴ. ش  ġ ʾҰų ش "
 "ݿ α  ϴ."
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "α "
-
-#: src/multi.c:978
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr " %s ұ?"
 
-#: src/multi.c:1015
+#: src/multi.c:1139
+msgid "Delete"
+msgstr ""
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr " -  "
 
-#: src/multi.c:1034
-msgid "Select All"
-msgstr " "
-
-#: src/multi.c:1039
-msgid "Select Autos"
-msgstr "ڵ "
-
-#: src/multi.c:1043
-msgid "Select None"
-msgstr " "
-
-#: src/multi.c:1057
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr ""
 
-#: src/multi.c:1061
-msgid "Sign On/Off"
-msgstr "/"
-
-#: src/multi.c:1065
-msgid "Delete"
-msgstr ""
-
-#: src/multi.c:1380
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr " "
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr ": %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr " -  "
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr ""
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1399
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s   ϴ"
 
-#: src/multi.c:1410
+#: src/multi.c:1594
+msgid "Signon Error"
+msgstr " "
+
+#: src/multi.c:1604
 msgid "Notice"
 msgstr "˸"
 
-#: src/multi.c:1420
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s  ϴ"
 
-#: src/multi.c:1421
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr " "
 
-#: src/perl.c:875
-msgid "Perl Scripts"
-msgstr " ũƮ"
-
-#: src/plugins.c:113
-msgid "Gaim - Plugin List"
-msgstr " - ÷ "
-
-#: src/plugins.c:178
-msgid "Gaim - Plugins"
-msgstr " - ÷ "
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
-msgid "Loaded Plugins"
-msgstr "÷"
-
-#: src/plugins.c:238
-msgid "Filepath:"
-msgstr " :"
-
-#: src/plugins.c:256
-msgid "Load"
-msgstr "ҷ"
-
-#: src/plugins.c:259
-msgid "Load a plugin from a file"
-msgstr "Ͽ ÷ ҷ"
-
-#: src/plugins.c:261
-msgid "Configure"
-msgstr ""
-
-#: src/plugins.c:264
-msgid "Configure settings of the selected plugin"
-msgstr "õ ÷ "
-
-#: src/plugins.c:266
-msgid "Reload"
-msgstr "ٽ б"
-
-#: src/plugins.c:270
-msgid "Reload the selected plugin"
-msgstr " ÷ ٽ ϱ"
-
-#: src/plugins.c:272
-msgid "Unload"
-msgstr ""
-
-#: src/plugins.c:275
-msgid "Unload the selected plugin"
-msgstr "õ ÷ "
-
-#: src/plugins.c:280
-msgid "Close this window"
-msgstr "â ݱ"
-
-#: src/prefs.c:192
-msgid "General Options"
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
+#, fuzzy
+msgid "Interface Options"
 msgstr "Ϲ ɼ"
 
-#: 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 "ٸ    ɼ   ˴ϴ."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Ÿ "
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "׵θ ư "
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "ģ ã â "
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr " â "
 
-#. Preferences should be positive
+#: src/prefs.c:200
+#, fuzzy
+msgid "Style"
+msgstr "/"
+
+#: src/prefs.c:201
+#, fuzzy
+msgid "_Bold"
+msgstr "β"
+
+#: src/prefs.c:202
+#, fuzzy
+msgid "_Italics"
+msgstr ""
+
+#: src/prefs.c:203
+#, fuzzy
+msgid "_Underline"
+msgstr ""
+
+#: src/prefs.c:204
+#, fuzzy
+msgid "_Strikethough"
+msgstr " ģ ۾"
+
+#: src/prefs.c:206
+#, fuzzy
+msgid "Face"
+msgstr ""
+
+#: src/prefs.c:209
+#, fuzzy
+msgid "Use custo_m face"
+msgstr "ڰ ʹ Ȱ"
+
+#: src/prefs.c:221
+msgid "Use custom si_ze"
+msgstr ""
+
+#: src/prefs.c:228
+msgid "Color"
+msgstr ""
+
 #: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr " ģ Ÿ  ˸"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "  ð ֱ"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr " "
+#, fuzzy
+msgid "_Text color"
+msgstr " "
 
 #: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "   ð ֱ"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "X   ð ֱ"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr " ȭ "
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "HTML ±״  "
-
-#: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "ģ / "
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "ģ / "
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "ڽ ڸ/ƿ "
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "  "
+
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
+#, fuzzy
+msgid "Display"
+msgstr "ģ ǥ"
 
 #: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "ڽ //ڸ "
+#, fuzzy
+msgid "Show graphical _smileys"
+msgstr "̸Ƽ ׸ ֱ"
+
+#: src/prefs.c:275
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "޽ ð ǥ"
 
 #: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "ģ     α "
-
-#: src/prefs.c:279
-msgid "Browser"
-msgstr ""
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr ""
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "ݽ"
-
-#: src/prefs.c:294
-msgid "Mozilla"
-msgstr ""
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "URL  ũ ֱ"
+
+#: src/prefs.c:278
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Ʋ öڸ Ͽ ǥ"
+
+#: src/prefs.c:281
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr " "
+
+#: src/prefs.c:282
+#, fuzzy
+msgid "Ignore font _faces"
+msgstr "۲ "
+
+#: src/prefs.c:283
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr " ũ "
 
 #: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "⺻  â "
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "׳ URL ó"
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Ű  ޽ "
+
+#: src/prefs.c:298
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Ʈ-Ű  ޽ "
+
+#: src/prefs.c:300
+#, fuzzy
+msgid "Window Closing"
+msgstr "â ũ"
+
+#: src/prefs.c:301
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Esc Ű  â "
+
+#: src/prefs.c:302
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Ʈ-W Ű  â "
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Ʈ-{B/I/U/S}  HTL ± "
 
 #: src/prefs.c:306
-msgid "Galeon"
-msgstr ""
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr " (%s URL)"
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Ͻ ɼ"
-
-#: 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:393
-msgid "Proxy Type"
-msgstr "Ͻ "
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Ʈ-() Ͽ ׸ "
+
+#: src/prefs.c:318
+#, fuzzy
+msgid "Buttons"
+msgstr "Ʒ"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "޽/ä//ڸ ư "
+
+#: src/prefs.c:320
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "ư ׸ ֱ"
+
+#: src/prefs.c:322
+msgid "Buddy List Window"
+msgstr "ģâ"
+
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
+msgstr "Ϻ â ġ ũ "
+
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
+msgstr "޽  ڵ â ø"
+
+#: src/prefs.c:326
+#, fuzzy
+msgid "Group Display"
+msgstr "׷ ǥ"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "ӵ ģ  ׷ "
+
+#: src/prefs.c:328
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "׷쿡 ο ǥ"
+
+#: src/prefs.c:330
+#, fuzzy
+msgid "Buddy Display"
+msgstr "ģ ǥ"
+
+#: src/prefs.c:331
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "ģ  ׸ ֱ"
+
+#: src/prefs.c:332
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "  ǥ"
+
+#: src/prefs.c:333
+#, fuzzy
+msgid "Show idle _times"
+msgstr "  ð ֱ"
+
+#: src/prefs.c:334
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "ڸ ģ ȸ ǥϱ"
+
+#: src/prefs.c:351 src/prefs.c:393
+#, fuzzy
+msgid "Window"
+msgstr "޽ â"
+
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "  ư Դϴ: "
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "ܸ"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "ڸ"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "ܰ "
+
+#: src/prefs.c:358 src/prefs.c:400
+#, fuzzy
+msgid "New window _width:"
+msgstr " ȭâ  ũ"
+
+#: src/prefs.c:359 src/prefs.c:401
+#, fuzzy
+msgid "New window _height:"
+msgstr " ȭâ  ũ"
+
+#: src/prefs.c:360 src/prefs.c:402
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "ȭ Է  "
+
+#: src/prefs.c:361 src/prefs.c:403
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "޽  ڵ â ø"
+
+#: src/prefs.c:362
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "޽   ڵ â ݱ"
+
+#: src/prefs.c:365
+msgid "Buddy Icons"
+msgstr "ģ "
+
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
+msgstr "ģ  "
+
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
+msgstr "ִϸ̼ "
+
+#: src/prefs.c:370
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "â  ֱ"
+
+#: src/prefs.c:372
+#, fuzzy
+msgid "Typing Notification"
+msgstr "˾â  "
+
+#: src/prefs.c:373
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr " ģ Ÿ  ˸"
 
 #: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Ͻ "
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Ͻ  "
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS v4 Ͻ"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS v5 Ͻ"
-
-#: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP Ͻ"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "ȣƮ"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Ʈ"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr ""
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "н"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "ģ ɼ"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "ģâ"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
+msgid "Tab Completion"
+msgstr "ڵϼ"
+
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
+msgstr " Ű  ڵϼϱ"
+
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
+msgstr "  ڵϼϱ"
+
+#: src/prefs.c:410
+#, fuzzy
+msgid "_Show people joining/leaving in window"
+msgstr "ģ ϴ/° â "
+
+#: src/prefs.c:411
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:427
+msgid "IM Tabs"
+msgstr ""
+
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
 msgstr " ġ"
 
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
 msgid "Top"
 msgstr ""
 
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
 msgid "Bottom"
 msgstr "Ʒ"
 
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr "޽/ä//ڸ ư "
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "α׿   ģ ڵ "
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "ģ ø αٿ ǥ"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Ϻ â ġ ũ "
-
-#: 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:614
-msgid "Hide groups with no online buddies"
-msgstr "ӵ ģ  ׷ "
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "׷쿡 ο ǥ"
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:434
+#, fuzzy
+msgid ""
+"Show all _instant messages in one tabbed\n"
+"window"
+msgstr " ä ϳ â  "
+
+#: src/prefs.c:435
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr " Ǵ   ֱ"
+
+#: src/prefs.c:437
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "ä"
+
+#: src/prefs.c:444
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr " ä ϳ â  "
+
+#: src/prefs.c:447
+msgid "Combined Tabs"
+msgstr ""
+
+#: src/prefs.c:448
+#, fuzzy
+msgid ""
+"Show IMs and chats in _same tabbed\n"
+"window."
+msgstr "äõ ȭ  â  "
+
+#: src/prefs.c:450
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "ģ "
+
+#: src/prefs.c:471
+msgid "Proxy Type"
+msgstr "Ͻ "
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Ͻ "
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Ͻ  "
+
+#: src/prefs.c:483
+msgid "Proxy Server"
+msgstr "Ͻ "
+
+#: src/prefs.c:496
+#, fuzzy
+msgid "_Host"
+msgstr "ȣƮ"
+
+#: src/prefs.c:510
+msgid "Port"
+msgstr "Ʈ"
+
+#: src/prefs.c:526
+#, fuzzy
+msgid "_User"
+msgstr ""
+
+#: src/prefs.c:540
+#, fuzzy
+msgid "Pa_ssword"
+msgstr "н"
+
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr ""
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr ""
+
+#: src/prefs.c:606
+#, fuzzy
+msgid "Browser Options"
+msgstr "Ͻ ɼ"
+
+#: src/prefs.c:607
+#, fuzzy
+msgid "Open new _window by default"
+msgstr "⺻  â "
 
 #: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "ģ ǥ"
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "ģ  ׸ ֱ"
+#, fuzzy
+msgid "Message Logs"
+msgstr "޽"
+
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr " ޽"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
+msgstr " ȭ "
+
+#: src/prefs.c:625
+#, fuzzy
+msgid "Strip _HTML from logs"
+msgstr "HTML ±״  "
+
+#: src/prefs.c:627
+#, fuzzy
+msgid "System Logs"
+msgstr "ý α "
+
+#: src/prefs.c:628
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
+msgstr "ģ / "
+
+#: src/prefs.c:630
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
+msgstr "ģ / "
+
+#: src/prefs.c:632
+#, fuzzy
+msgid "Log when buddies go away/come _back"
+msgstr "ڽ ڸ/ƿ "
+
+#: src/prefs.c:633
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
+msgstr "ڽ //ڸ "
 
 #: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "  ǥ"
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "  ð ֱ"
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr "ڸ ģ ȸ ǥϱ"
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "ȭ ɼ"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Ű ɼ"
-
-#: src/prefs.c:683
-msgid "Enter sends message"
-msgstr "Ű  ޽ "
-
-#: src/prefs.c:684
-msgid "Control-Enter sends message"
-msgstr "Ʈ-Ű  ޽ "
-
-#: src/prefs.c:685
-msgid "Escape closes window"
-msgstr "Esc Ű  â "
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
+msgstr "ģ     α "
+
+#: src/prefs.c:667
+msgid "Sound Options"
+msgstr "Ҹ ɼ"
+
+#: src/prefs.c:668
+#, fuzzy
+msgid "_No sounds when you log in"
+msgstr "ӽ Ҹ  "
+
+#: src/prefs.c:669
+#, fuzzy
+msgid "_Sounds while away"
+msgstr "ڸ Ҹ "
+
+#: src/prefs.c:672
+#, fuzzy
+msgid "Sound Method"
+msgstr "Ҹ  "
+
+#: src/prefs.c:673
+msgid "_Method"
+msgstr ""
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
 
 #: src/prefs.c:686
-msgid "Control-W closes window"
-msgstr "Ʈ-W Ű  â "
-
-#: src/prefs.c:692
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Ʈ-{B/I/U/S}  HTL ± "
-
-#: src/prefs.c:693
-msgid "Control-(number) inserts smileys"
-msgstr "Ʈ-() Ͽ ׸ "
-
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "Ÿӽ  ϱ  F2 "
+#, fuzzy
+msgid "Internal"
+msgstr " "
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
 
 #: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "ȭǥ  Ϲ ɼ"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "̸Ƽ ׸ ֱ"
-
-#: 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:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "޽  ڸ ¿ "
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "ڸ߿   ޽ "
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr " "
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "۲ "
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr " ũ "
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "TiK ڵȭ ޽ "
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "ڸ ο ȭ "
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "޽ ɼ"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "޽ â"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "  ư Դϴ: "
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "ܰ "
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "ܸ"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "ڸ"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr " ȭ ϳ â  "
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "äõ ȭ  â  "
-
-#: src/prefs.c:967 src/prefs.c:1119
-msgid "Raise windows on events"
-msgstr "޽  ڵ â ø"
-
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "â  ֱ"
-
-#: src/prefs.c:969
-msgid "Show aliases in tabs/titles/ticker"
-msgstr " Ǵ   ֱ"
-
-#: src/prefs.c:970
-msgid "Hide window on send"
-msgstr "޽   ڵ â ݱ"
-
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "â ũ"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr " ȭâ  ũ"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr " ȭâ  ũ"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "ȭ Է  "
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr " ġ"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr ""
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr ""
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "ģ "
-
-#: src/prefs.c:1031
-msgid "Hide Buddy Icons"
-msgstr "ģ  "
-
-#: src/prefs.c:1037
-msgid "Disable Buddy Icon Animation"
-msgstr "ִϸ̼ "
-
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "ä ɼ"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "׷ ä â"
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr " ä ϳ â  "
-
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "ȭ äð  â  "
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "ģ ϴ/° â "
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "ڵϼ"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr " Ű  ڵϼϱ"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "  ڵϼϱ"
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "޲ ɼ"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr " ۾"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr ""
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "ؽƮ  ۲"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "ؽƮ   ũ"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr " - Ҹ "
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "׽Ʈ"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr ""
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Ҹ ɼ"
-
-#: src/prefs.c:1649
-msgid "No sounds when you log in"
-msgstr "ӽ Ҹ  "
-
-#: src/prefs.c:1655 src/prefs.c:1922
-msgid "Sounds while away"
-msgstr "ڸ Ҹ "
-
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "Ҹ  "
-
-#: src/prefs.c:1739
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Ҹ  ɾ\n"
 "(%s  ̸)"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "  Ҹ :"
-
-#: src/prefs.c:1893 src/prefs.c:2953
+#: src/prefs.c:732
+#, fuzzy
+msgid "_Sending messages removes away status"
+msgstr "޽  ڸ ¿ "
+
+#: src/prefs.c:733
+#, fuzzy
+msgid "_Queue new messages when away"
+msgstr "ڸ߿   ޽ "
+
+#: src/prefs.c:734
+#, fuzzy
+msgid "_Ignore new conversations when away"
+msgstr "ڸ ο ȭ "
+
+#: src/prefs.c:736
+#, fuzzy
+msgid "Auto-response"
+msgstr "ڵ 亯  "
+
+#: src/prefs.c:739
+msgid "Seconds before _resending:"
+msgstr ""
+
+#: src/prefs.c:741
+#, fuzzy
+msgid "_Don't send auto-response"
+msgstr "ڵ 亯  "
+
+#: src/prefs.c:742
+#, fuzzy
+msgid "_Only send auto-response when idle"
+msgstr "Խÿ ڵ 亯 "
+
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "ڵ 亯  "
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr " "
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "   ð ֱ"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "X   ð ֱ"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "â ũ"
+
+#: src/prefs.c:763
+#, fuzzy
+msgid "Auto-away"
+msgstr "ڸ"
+
+#: src/prefs.c:764
+msgid "Set away _when idle"
+msgstr ""
+
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "ڸ"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
+msgid "Gaim - Sound Configuration"
+msgstr " - Ҹ "
+
+#: src/prefs.c:1217
+msgid "Test"
+msgstr "׽Ʈ"
+
+#: src/prefs.c:1225
+msgid "Choose..."
+msgstr ""
+
+#: src/prefs.c:1353
+#, fuzzy
+msgid "_Edit"
+msgstr ""
+
+#: src/prefs.c:1391
+#, fuzzy
+msgid "Interface"
+msgstr "νϽ:"
+
+#: src/prefs.c:1392
+#, fuzzy
+msgid "Fonts"
+msgstr "۲"
+
+#: src/prefs.c:1393
+#, fuzzy
+msgid "Message Text"
+msgstr "޽  "
+
+#: src/prefs.c:1394
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1396
+msgid "IM Window"
+msgstr "޽ â"
+
+#: src/prefs.c:1397
+#, fuzzy
+msgid "Chat Window"
+msgstr "׷ ä â"
+
+#: src/prefs.c:1398
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1399
+msgid "Proxy"
+msgstr "Ͻ"
+
+#: src/prefs.c:1400
+msgid "Browser"
+msgstr ""
+
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr ""
+
+#: src/prefs.c:1403
+msgid "Sounds"
+msgstr "Ҹ"
+
+#: src/prefs.c:1404
+#, fuzzy
+msgid "Sound Events"
+msgstr "Ҹ"
+
+#: src/prefs.c:1405
+#, fuzzy
+msgid "Away / Idle"
+msgstr "ڸ : "
+
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "ڸ"
 
-#: src/prefs.c:1930
-msgid "Don't send auto-response"
-msgstr "ڵ 亯  "
-
-#: src/prefs.c:1931
-msgid "Only send auto-response when idle"
-msgstr "Խÿ ڵ 亯 "
-
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr " ð   ڵ 亯( ):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr " "
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "     ڸ ޽ : "
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "޽"
-
-#: src/prefs.c:2045
-msgid "Edit"
-msgstr ""
-
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr " ڸ"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "̹ ɼ"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr " :"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr " ڰ   ֵ "
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr " Ͽ ִ ڸ   ֵ "
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr " "
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr " ڸ ź"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr " Ͽ ִ ڸ "
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr " "
-
-#: src/prefs.c:2493
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr "÷"
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr " - ȯ漳"
 
-#: src/prefs.c:2576
-msgid "Gaim debug output window"
-msgstr "   â"
-
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Ϲ"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Ͻ"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "ȭ"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Ҹ"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "̹"
-
-#: src/prpl.c:70
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr " â"
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 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."
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is recommended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
-"  ҽ ϵ   εϷ õ߽ϴ. "
-" ε  ϴ."
-
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr " "
-
-#: src/prpl.c:93
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s  %s ߽ϴ. %s  Դϴ."
-
-#: src/prpl.c:96
-msgid "Disconnect"
-msgstr ""
-
-#: src/prpl.c:133
-msgid "Accept?"
-msgstr "޾Ƶϱ?"
-
-#: src/prpl.c:199
+
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr " - "
 
-#: src/prpl.c:419
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr " -  "
 
-#: src/prpl.c:445
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr " "
 
-#: src/prpl.c:570
+#: src/prpl.c:626
 #, 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:578
+#: src/prpl.c:634
 msgid ""
 "\n"
 "\n"
@@ -3473,89 +4271,607 @@
 "\n"
 " ģ Ͽ ߰ұ?"
 
-#: src/prpl.c:621
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "     ִ  ϴ."
 
-#: src/prpl.c:658
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr " - "
 
-#: src/prpl.c:673
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:690
+#: src/prpl.c:745
 msgid "Register"
 msgstr ""
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "йȣ Էϼ"
 
-#: src/server.c:585
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d ޽)"
 
-#: src/server.c:591
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 ޽)"
 
-#: src/server.c:783
-msgid "Warned"
-msgstr ""
-
-#: src/server.c:876
+#: src/server.c:966
 msgid "Yes"
 msgstr "Ȯ"
 
-#: src/server.c:877
+#: src/server.c:967
 msgid "No"
 msgstr ""
 
-#: src/server.c:1076
+#: src/server.c:1163
 msgid "More Info"
 msgstr " "
 
-#: src/sound.c:63
+#: src/sound.c:68
 msgid "Buddy logs in"
 msgstr "ģ  "
 
-#: src/sound.c:64
+#: src/sound.c:69
 msgid "Buddy logs out"
 msgstr "ģ   "
 
-#: src/sound.c:65
+#: src/sound.c:70
 msgid "Message received"
 msgstr "޽ ޾ "
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr "޽ ޾ ȭ ۵ "
 
-#: src/sound.c:67
+#: src/sound.c:72
 msgid "Message sent"
 msgstr "޽  "
 
-#: src/sound.c:68
+#: src/sound.c:73
 msgid "Person enters chat"
 msgstr "ȭ濡 մ  "
 
-#: src/sound.c:69
+#: src/sound.c:74
 msgid "Person leaves chat"
 msgstr "ȭ濡 մ  "
 
-#: src/sound.c:70
+#: src/sound.c:75
 msgid "You talk in chat"
 msgstr "ȭ濡 ڽ  "
 
-#: src/sound.c:71
+#: src/sound.c:76
 msgid "Others talk in chat"
 msgstr "ȭ濡 ٸ  "
 
-#: src/sound.c:74
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr "ȭ濡   ̸  "
+
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "- "
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "- "
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "http û   ϴ."
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr " ģ    (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "ģ     (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr " ģ    (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "˻ 񽺿   (%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "йȣ   (%s)"
+
+#~ msgid ""
+#~ "%s has requested a DCC chat.  Would you like to establish the direct "
+#~ "connection?"
+#~ msgstr "%s DCC ä û߽ϴ.  ޾Ƶ̽ðڽϱ?"
+
+#~ msgid "Incorrect current password! Password NOT Changed!"
+#~ msgstr " йȣ Ʋϴ! йȣ  ʾҽϴ."
+
+#~ msgid "Password Change Error!"
+#~ msgstr "йȣ  !"
+
+#~ msgid "New password same as old password! Password NOT Changed!"
+#~ msgstr " йȣ  йȣ մϴ!  ʾҽϴ."
+
+#~ msgid "Password Change"
+#~ msgstr "йȣ "
+
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "߸  ̵"
+
+#~ msgid "MSN Error"
+#~ msgstr "MSN "
+
+#~ msgid "Chat Error!"
+#~ msgstr "ä !"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr " - ä"
+
+#~ msgid "Gaim - ICQ Authorization Granted"
+#~ msgstr " - ICQ  ޾Ƶ鿩"
+
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr ""
+#~ "%d %s  ޽  ܾ ϰ ־   ϴ."
+
+#~ msgid "Gaim - Error"
+#~ msgstr " - "
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr " - ī SNAC "
+
+#~ msgid "Reason unknown"
+#~ msgstr "   "
+
+#~ msgid "Error"
+#~ msgstr ""
+
+#~ msgid "Gaim - Warning"
+#~ msgstr " - "
+
+#~ 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 ּҸ   , ̴ Ȼ    ֽϴ. ׷ "
+#~ " ұ?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC ٽ "
+
+#~ msgid "Chat Error"
+#~ msgstr "ä "
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC Ͻ"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "    ϴ!"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim on irc.openprojects.net"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: irc.openprojects.net  #gaim ä"
+
+#~ msgid ""
+#~ "Active Developers\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Crazy Patch Writers\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Retired Developers\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+#~ msgstr ""
+#~ " ۾ \n"
+#~ "====================\n"
+#~ "Rob Flynn (̳) [ rob@marko.net ]\n"
+#~ "Sean Egan (ڴ)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "ũ ġ \n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ " \n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer ( )   [ markster@marko.net ]"
+
+#~ msgid "Web Site"
+#~ msgstr "Ʈ"
+
+#~ msgid "Password: "
+#~ msgstr "йȣ: "
+
+#~ msgid "About"
+#~ msgstr "... Ͽ"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr " õմϴ...."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "ӵǾ  ʽϴ. Ŭϸ α ȭ ɴϴ."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "ڸ: %d "
+
+#~ msgid "Away."
+#~ msgstr "ڸ"
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr " ø   ϴ!"
+
+#~ msgid "About..."
+#~ msgstr "... Ͽ"
+
+#~ msgid "Perl"
+#~ msgstr "(ũƮ)"
+
+#~ msgid "Load Script"
+#~ msgstr " ũƮ "
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "ũƮ  "
+
+#~ msgid "List Scripts"
+#~ msgstr " ũƮ"
+
+#~ msgid "Whisper"
+#~ msgstr "ӼӸ"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr " - ȭ "
+
+#~ msgid "Message Error"
+#~ msgstr "޽ "
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "޽   ϴ :    "
+
+#~ msgid "Currently at %d, "
+#~ msgstr " %d, "
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "%d ġ űϴ\n"
+
+#~ msgid "Bold Text"
+#~ msgstr "β ۾"
+
+#~ msgid "Italics Text"
+#~ msgstr " ۾"
+
+#~ msgid "Underline Text"
+#~ msgstr " ģ ۾"
+
+#~ msgid "Strike"
+#~ msgstr ""
+
+#~ msgid "Decrease font size"
+#~ msgstr " ũ ̱"
+
+#~ msgid "Small"
+#~ msgstr "۰"
+
+#~ msgid "Normal font size"
+#~ msgstr " ũ "
+
+#~ msgid "Normal"
+#~ msgstr ""
+
+#~ msgid "Increase font size"
+#~ msgstr " ũ Ű"
+
+#~ msgid "Big"
+#~ msgstr "ũ"
+
+#~ msgid "Link"
+#~ msgstr "ũ"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "ϸ  "
+
+#~ msgid "Smiley"
+#~ msgstr "ϸ"
+
+#~ msgid "Image"
+#~ msgstr "׸"
+
+#~ msgid "Sound"
+#~ msgstr "Ҹ"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr " - ڿ  "
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr " %sԿ  ?"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr " - %s Ͽ "
+
+#~ msgid "Remove Buddy"
+#~ msgstr "ģ "
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ " ģ Ͽ '%s'\n"
+#~ "ұ?"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr " - ޽ "
+
+#~ msgid "IM who:"
+#~ msgstr " ģ"
+
+#~ msgid "User:"
+#~ msgstr ":"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr " -   "
+
+#~ msgid "Add Group"
+#~ msgstr "׷ ߰"
+
+#~ msgid "Add Buddy"
+#~ msgstr "ģ ߰"
+
+#~ msgid "Contact"
+#~ msgstr "̵"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "ģ˸ "
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr " - йȣ  "
+
+#~ msgid "Alias Buddy"
+#~ msgstr "ģ  "
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "%s    ϴ. - %s"
+
+#~ msgid "Rename Group"
+#~ msgstr "׷ ̸ "
+
+#~ msgid "Preferences Error"
+#~ msgstr "ȯ漳 "
+
+#~ msgid "Plugin Error"
+#~ msgstr "÷ "
+
+#~ msgid "Login Error"
+#~ msgstr "α "
+
+#~ msgid "Select All"
+#~ msgstr " "
+
+#~ msgid "Select Autos"
+#~ msgstr "ڵ "
+
+#~ msgid "Select None"
+#~ msgstr " "
+
+#~ msgid "Sign On/Off"
+#~ msgstr "/"
+
+#~ msgid "Perl Scripts"
+#~ msgstr " ũƮ"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr " - ÷ "
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr " - ÷ "
+
+#~ msgid "Loaded Plugins"
+#~ msgstr "÷"
+
+#~ msgid "Filepath:"
+#~ msgstr " :"
+
+#~ msgid "Load"
+#~ msgstr "ҷ"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "Ͽ ÷ ҷ"
+
+#~ msgid "Configure"
+#~ msgstr ""
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "õ ÷ "
+
+#~ msgid "Reload"
+#~ msgstr "ٽ б"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr " ÷ ٽ ϱ"
+
+#~ msgid "Unload"
+#~ msgstr ""
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "õ ÷ "
+
+#~ msgid "Close this window"
+#~ msgstr "â ݱ"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr "ٸ    ɼ   ˴ϴ."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Ÿ "
+
+#~ msgid "Use borderless buttons"
+#~ msgstr "׵θ ư "
+
+#~ msgid "Show Buddy Ticker"
+#~ msgstr "ģ ã â "
+
+#~ msgid "Report Idle Times"
+#~ msgstr "  ð ֱ"
+
+#~ msgid "Konqueror"
+#~ msgstr ""
+
+#~ msgid "Opera"
+#~ msgstr ""
+
+#~ msgid "Netscape"
+#~ msgstr "ݽ"
+
+#~ msgid "Mozilla"
+#~ msgstr ""
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "׳ URL ó"
+
+#~ msgid "Galeon"
+#~ msgstr ""
+
+#~ msgid "Manual (%s for URL)"
+#~ msgstr " (%s URL)"
+
+#~ msgid ""
+#~ "Not all protocols can use these proxy options. Please see the README file "
+#~ "for details."
+#~ msgstr ""
+#~ "Ͻø     ֽϴ. ڼ  ϸ README "
+#~ " оʽÿ."
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS v4 Ͻ"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS v5 Ͻ"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP Ͻ"
+
+#~ msgid "Buddy List Options"
+#~ msgstr "ģ ɼ"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "α׿   ģ ڵ "
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "ģ ø αٿ ǥ"
+
+#~ msgid "Raise Buddy List on Signons and Signoffs"
+#~ msgstr "ģ /  ģ â ø"
+
+#~ msgid "Conversation Options"
+#~ msgstr "ȭ ɼ"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Ű ɼ"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "Ÿӽ  ϱ  F2 "
+
+#~ msgid "Display and General Options"
+#~ msgstr "ȭǥ  Ϲ ɼ"
+
+#~ msgid "Ignore TiK Automated Messages"
+#~ msgstr "TiK ڵȭ ޽ "
+
+#~ msgid "IM Options"
+#~ msgstr "޽ ɼ"
+
+#~ msgid "Tab Placement"
+#~ msgstr " ġ"
+
+#~ msgid "Chat Options"
+#~ msgstr "ä ɼ"
+
+#~ msgid "Show conversations in the same tabbed window"
+#~ msgstr "ȭ äð  â  "
+
+#~ msgid "Italic Text"
+#~ msgstr " ۾"
+
+#~ msgid "Select"
+#~ msgstr ""
+
+#~ msgid "Font Face for Text"
+#~ msgstr "ؽƮ  ۲"
+
+#~ msgid "Font Size for Text"
+#~ msgstr "ؽƮ   ũ"
+
+#~ msgid "Sound played when:"
+#~ msgstr "  Ҹ :"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr " ð   ڵ 亯( ):"
+
+#~ msgid "Auto Away after"
+#~ msgstr " "
+
+#~ msgid "minutes using"
+#~ msgstr "     ڸ ޽ : "
+
+#~ msgid "Make Away"
+#~ msgstr " ڸ"
+
+#~ msgid "Privacy Options"
+#~ msgstr "̹ ɼ"
+
+#~ msgid "Allow List"
+#~ msgstr " "
+
+#~ msgid "Block List"
+#~ msgstr " "
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "   â"
+
+#~ msgid "General"
+#~ msgstr "Ϲ"
+
+#~ msgid "Conversations"
+#~ msgstr "ȭ"
+
+#~ 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 ""
+#~ "  ҽ ϵ   εϷ õ߽ϴ. "
+#~ " ε  ϴ."
+
+#~ msgid "Protocol Error"
+#~ msgstr " "
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s  %s ߽ϴ. %s  Դϴ."
+
+#~ msgid "Disconnect"
+#~ msgstr ""
+
+#~ msgid "Accept?"
+#~ msgstr "޾Ƶϱ?"
+
+#~ msgid "Warned"
+#~ msgstr ""
--- a/po/nl.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/nl.po	Sun Jan 05 23:21:50 2003 +0000
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.60\n"
-"POT-Creation-Date: 2003-01-03 13:44+0100\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\n"
 "PO-Revision-Date: 2003-01-03 14:30+0100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -15,9 +15,9 @@
 msgid "New..."
 msgstr "Nieuw..."
 
-#: plugins/docklet/docklet.c:123 src/protocols/gg/gg.c:75
-#: src/protocols/jabber/jabber.c:1165 src/buddy.c:499 src/buddy.c:2532
-#: src/buddy.c:2662 src/prefs.c:731
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
 msgid "Away"
 msgstr "Afwezig"
 
@@ -71,11 +71,11 @@
 
 #: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
 msgid ""
-"Interacts with a System Tray applet (in GNOME or KDE, for example) to display "
-"the current status of Gaim, allow fast access to commonly used functions, and "
-"to toggle display of the buddy list or login window. Also allows messages to "
-"be queued until the icon is clicked, similar to ICQ (although the icon "
-"doesn't flash yet =)."
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
 msgstr ""
 "Communiceert met het Systeemvak (zit o.a. in GNOME en KDE) om op die manier "
 "de status van Gaim weer te geven, snel toegang te geven tot veelgebruikte "
@@ -89,42 +89,42 @@
 msgid "System Tray Icon"
 msgstr "Systeemvakpictogram"
 
-#: plugins/chatlist.c:68 src/buddy_chat.c:281
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Chat met vrienden"
 
-#: plugins/chatlist.c:159 plugins/chatlist.c:161 plugins/chatlist.c:351
-#: plugins/chatlist.c:353
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Gaim Chat"
 
-#: plugins/chatlist.c:302
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "Chatruimtes"
 
-#: plugins/chatlist.c:314
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr "Verversen"
 
 #. buttons
-#: plugins/chatlist.c:315 src/protocols/icq/gaim_icq.c:279
-#: src/protocols/oscar/oscar.c:2176 src/buddy.c:494 src/buddy.c:2760
-#: src/buddy_chat.c:908 src/buddy_chat.c:1588 src/conversation.c:2309
-#: src/conversation.c:2896 src/dialogs.c:2601 src/prpl.c:638
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Toevoegen"
 
-#: plugins/chatlist.c:316 src/buddy.c:496 src/buddy.c:2762
-#: src/buddy_chat.c:906 src/buddy_chat.c:1590 src/conversation.c:2293
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
 #: src/conversation.c:2890
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: plugins/chatlist.c:332
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "Lijst van beschikbare chatruimtes"
 
-#: plugins/chatlist.c:342
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "Lijst van geabonneerde chatruimtes"
 
@@ -157,112 +157,113 @@
 msgid "Change"
 msgstr "Veranderen"
 
-#: plugins/notify.c:344
+#: plugins/notify.c:389
 msgid "Unable to write to config file"
 msgstr "Kan niet naar configuratiebestand schrijven"
 
-#: plugins/notify.c:344
+#: plugins/notify.c:389
 msgid "Notify plugin"
 msgstr "Meldplugin"
 
-#: plugins/notify.c:507
+#: plugins/notify.c:561
 msgid "Notify For"
 msgstr "Melding geven voor"
 
-#: plugins/notify.c:508
+#: plugins/notify.c:562
 msgid "_IM windows"
 msgstr "_Berichtvensters"
 
-#: plugins/notify.c:513
+#: plugins/notify.c:567
 msgid "_Chat windows"
 msgstr "_Chatvensters"
 
 #. --------------
-#: plugins/notify.c:519
+#: plugins/notify.c:573
 msgid "Notification Methods"
 msgstr "Meldingmethode"
 
-#: plugins/notify.c:522
-msgid "Prepend _string into window title:"
+#: plugins/notify.c:576
+#, fuzzy
+msgid "Prepend _string into window title (hit enter to save):"
 msgstr "_String om ervoor te plakken in venstertitel:"
 
-#: plugins/notify.c:531
+#: plugins/notify.c:587
 msgid "_Quote window title"
 msgstr "Venstertitel _citeren"
 
-#: plugins/notify.c:536
+#: plugins/notify.c:592
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "\"_URGENT\" (hoge prioriteit) doorgeven aan het vensterbeheer."
 
-#: plugins/notify.c:541
+#: plugins/notify.c:597
 msgid "Insert c_ount of new messages into window title"
 msgstr "Aantal _nieuwe berichten weergeven in venstertitel"
 
-#: plugins/notify.c:546
+#: plugins/notify.c:602
 msgid "_Notify even if conversation is in focus"
 msgstr "_Opmerking zelfs weergeven wanneer het gesprek reeds de aandacht heeft"
 
 #. --------------
-#: plugins/notify.c:552
+#: plugins/notify.c:608
 msgid "Notification Removal"
 msgstr "Meldingverwijdering"
 
-#: plugins/notify.c:553
+#: plugins/notify.c:609
 msgid "Remove when conversation window gains _focus"
 msgstr "Verwijderen wanneer het gespreksvenster de _aandacht krijgt"
 
-#: plugins/notify.c:558
+#: plugins/notify.c:614
 msgid "Remove when conversation window _receives click"
 msgstr "Verwijderen wanneer het gespreksvenster een _muisklik ontvangt"
 
-#: plugins/notify.c:563
+#: plugins/notify.c:619
 msgid "Remove when _typing in conversation window"
 msgstr "Verwijderen wanneer er ge_typt wordt in het gespreksvenster."
 
-#: plugins/notify.c:568
+#: plugins/notify.c:624
 msgid "Appl_y"
 msgstr "Toe_passen"
 
-#: plugins/autorecon.c:49 plugins/autorecon.c:60
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Wanneer je offline wordt geschopt, herstelt dit de verbinding."
 
-#: plugins/autorecon.c:56
+#: plugins/autorecon.c:61
 msgid "Auto Reconnect"
 msgstr "Verbinding herstellen"
 
-#: plugins/timestamp.c:67
+#: plugins/timestamp.c:73
 msgid "Timestamp"
 msgstr "Tijd in gesprek"
 
-#: plugins/timestamp.c:69
+#: plugins/timestamp.c:75
 msgid "Adds iChat-style timestamps to conversations every 5 minutes."
 msgstr ""
 "Voegt op iChat-achtige manier iedere 5 minuten de tijd toe aan een gesprek."
 
-#: plugins/history.c:67
+#: plugins/history.c:72
 msgid "History"
 msgstr "Geschiedenis"
 
-#: plugins/history.c:69
+#: plugins/history.c:74
 msgid "Shows recently logged conversations in new conversations "
 msgstr "Geeft recente gesprekken weer in een nieuw gesprek"
 
-#: plugins/iconaway.c:47
+#: plugins/iconaway.c:52
 msgid "Iconify on away"
 msgstr "Minimaliseren bij afwezigheid"
 
-#: plugins/iconaway.c:49 plugins/iconaway.c:60
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
 msgid "Iconifies the away box and the buddy list when you go away."
 msgstr ""
 "Minimaliseert het afwezigheidsvenster en de vriendenlijst bij afwezigheid."
 
-#: plugins/iconaway.c:56
+#: plugins/iconaway.c:61
 msgid "Iconify On Away"
 msgstr "Minimaliseren bij afwezigheid"
 
-#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2352
-#: src/protocols/msn/msn.c:2457
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Beschikbaar"
 
@@ -314,7 +315,7 @@
 msgid "Unknown Error Code."
 msgstr "Onbekende Foutcode."
 
-#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2507
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -422,7 +423,7 @@
 msgstr "Geslacht"
 
 #. Line 5
-#: src/protocols/gg/gg.c:739 src/dialogs.c:2133 src/dialogs.c:2838
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Stad"
 
@@ -479,8 +480,8 @@
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
-"Gaim kon geen verbinding maken met de GaduGadu vriendenlijst-server. Probeert "
-"u het later nogmaals."
+"Gaim kon geen verbinding maken met de GaduGadu vriendenlijst-server. "
+"Probeert u het later nogmaals."
 
 #: src/protocols/gg/gg.c:1048
 msgid "Couldn't export buddy list"
@@ -518,8 +519,8 @@
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
-"Gaim kon uw wachtwoord niet veranderen wegens een communicatieprobleem met de "
-"GaduGadu-server. Probeert u het later nogmaals."
+"Gaim kon uw wachtwoord niet veranderen wegens een communicatieprobleem met "
+"de GaduGadu-server. Probeert u het later nogmaals."
 
 #: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
@@ -529,9 +530,8 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
 #: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
-#: src/dialogs.c:2249
 msgid "Change Password"
 msgstr "Wachtwoord veranderen"
 
@@ -556,8 +556,8 @@
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
-"Gaim kon het gebruikersprofiel niet benaderen wegens een communicatieprobleem "
-"met de adresboek-server. Probeert u het later nogmaals."
+"Gaim kon het gebruikersprofiel niet benaderen wegens een "
+"communicatieprobleem met de adresboek-server. Probeert u het later nogmaals."
 
 #: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
 msgid "Nick:"
@@ -571,27 +571,27 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim is een fout tegen gekomen bij de communicatie met de ICQ-server."
 
-#: src/protocols/icq/gaim_icq.c:279 src/protocols/irc/irc.c:1288
-#: src/protocols/oscar/oscar.c:2022 src/protocols/oscar/oscar.c:4638
-#: src/protocols/toc/toc.c:1987 src/buddy_chat.c:317 src/buddy_chat.c:401
-#: src/dialogs.c:2191 src/dialogs.c:2314 src/dialogs.c:2379 src/dialogs.c:2590
-#: src/dialogs.c:2772 src/dialogs.c:2949 src/dialogs.c:3016 src/dialogs.c:3649
-#: src/dialogs.c:3847 src/dialogs.c:4004 src/dialogs.c:4492 src/dialogs.c:5234
-#: src/multi.c:1040 src/multi.c:1139 src/multi.c:1457 src/prpl.c:280
-#: src/prpl.c:638
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
 msgid "Cancel"
 msgstr "Annuleren"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
-#: src/protocols/msn/msn.c:1163 src/protocols/msn/msn.c:1318
-#: src/protocols/oscar/oscar.c:2122
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
 msgid "Authorize"
 msgstr "Toestemmen"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
-#: src/protocols/msn/msn.c:1163 src/protocols/msn/msn.c:1318
-#: src/protocols/oscar/oscar.c:2122 src/protocols/oscar/oscar.c:2176
-#: src/dialogs.c:2589
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
 msgid "Deny"
 msgstr "Blokkeren"
 
@@ -599,9 +599,9 @@
 msgid "Send message through server"
 msgstr "Verzend bericht via server"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2641
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
 #: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
-#: src/protocols/oscar/oscar.c:4677 src/protocols/oscar/oscar.c:4729
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
 #: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Extra info"
@@ -615,10 +615,10 @@
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr ""
-"(Er is een fout opgetreden bij het converteren van het bericht. Controleer de "
-"optie 'Codering' in het account)"
-
-#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2351
+"(Er is een fout opgetreden bij het converteren van het bericht. Controleer "
+"de optie 'Codering' in het account)"
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCC gesprek met %s afgesloten"
@@ -627,7 +627,7 @@
 msgid "No topic is set"
 msgstr "Geen onderwerp ingesteld"
 
-#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1539
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s heeft het onderwerp veranderd naar: %s</B>"
@@ -687,17 +687,17 @@
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
 msgstr ""
-"Dit vereist een directe verbinding tussen de twee computers. Berichten zullen "
-"niet via de IRC-server gaan."
-
-#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2022
-#: src/protocols/oscar/oscar.c:4638
+"Dit vereist een directe verbinding tussen de twee computers. Berichten "
+"zullen niet via de IRC-server gaan."
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
 msgid "Connect"
 msgstr "Verbinden"
 
-#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:306
-#: src/protocols/msn/msn.c:1327 src/protocols/msn/msn.c:1343
-#: src/protocols/msn/msn.c:1828
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Kan niet schrijven"
 
@@ -711,59 +711,59 @@
 msgid "Kicked by %s: %s"
 msgstr "Weg geschopt door %s: %s"
 
-#: src/protocols/irc/irc.c:1457 src/protocols/irc/irc.c:2660
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
 msgid "CTCP ClientInfo"
 msgstr "CTCP ClientInfo"
 
-#: src/protocols/irc/irc.c:1463 src/protocols/irc/irc.c:2666
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
 msgid "CTCP UserInfo"
 msgstr "CTCP Gebruikersinfo"
 
-#: src/protocols/irc/irc.c:1469 src/protocols/irc/irc.c:2672
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
 msgid "CTCP Version"
 msgstr "CTCP Versie"
 
-#: src/protocols/irc/irc.c:1489 src/protocols/irc/irc.c:2678
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1969
+#: src/protocols/irc/irc.c:1972
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "Onderwerp voor %s is %s"
 
-#: src/protocols/irc/irc.c:2061
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "U heeft %s verlaten"
 
-#: src/protocols/irc/irc.c:2062
+#: src/protocols/irc/irc.c:2065
 msgid "IRC Part"
 msgstr "IRC Deel"
 
-#: src/protocols/irc/irc.c:2229
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Ruimte: "
 
-#: src/protocols/irc/irc.c:2233 src/aim.c:325 src/multi.c:641
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Wachtwoord: "
 
-#: src/protocols/irc/irc.c:2647
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC gesprek"
 
-#: src/protocols/irc/irc.c:2718 src/protocols/jabber/jabber.c:2860
-#: src/protocols/msn/msn.c:2905 src/protocols/napster/napster.c:615
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/irc/irc.c:2724 src/protocols/jabber/jabber.c:4224
-#: src/protocols/msn/msn.c:2911 src/protocols/napster/napster.c:621
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/protocols/irc/irc.c:2730
+#: src/protocols/irc/irc.c:2733
 msgid "Encoding:"
 msgstr "Codering:"
 
@@ -795,8 +795,8 @@
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/protocols/jabber/jabber.c:1167 src/protocols/jabber/jabber.c:1185
-#: src/buddy.c:2795 src/multi.c:245
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Online"
 
@@ -839,8 +839,8 @@
 msgid "No such user."
 msgstr "Gebruiker bestaat niet."
 
-#: src/protocols/jabber/jabber.c:1757 src/protocols/msn/msn.c:1353
-#: src/dialogs.c:927
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Vrienden"
 
@@ -862,7 +862,7 @@
 
 #: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
 #: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
-#: src/protocols/msn/msn.c:1978 src/protocols/msn/msn.c:2007
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Kan geen verbinding maken"
 
@@ -875,7 +875,7 @@
 msgstr "Identificatiemethode wordt aangevraagd"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1999
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Verbinding wordt gemaakt"
 
@@ -909,8 +909,8 @@
 msgid "View Error Msg"
 msgstr "Foutmeldingen weergeven"
 
-#: src/protocols/jabber/jabber.c:3246 src/protocols/oscar/oscar.c:4690
-#: src/buddy_chat.c:895
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Haal afwezigheidsbericht op"
 
@@ -946,7 +946,7 @@
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: src/protocols/jabber/jabber.c:3481 src/dialogs.c:3029
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
@@ -971,7 +971,7 @@
 msgstr "Postcode"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3487 src/dialogs.c:2155 src/dialogs.c:2860
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Land"
 
@@ -979,7 +979,7 @@
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: src/protocols/jabber/jabber.c:3489 src/dialogs.c:2934
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "E-mail"
 
@@ -1003,7 +1003,7 @@
 msgid "Birthday"
 msgstr "Geboortedatum"
 
-#: src/protocols/jabber/jabber.c:3495 src/dialogs.c:3037 src/prefs.c:985
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -1035,168 +1035,168 @@
 msgid "Set User Info"
 msgstr "Gebruikersinfo instellen"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntaxfout (waarschijnlijk een bug in Gaim)"
 
-#: src/protocols/msn/msn.c:224
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "Ongeldige parameter (waarschijnlijk een bug in Gaim)"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:228
 msgid "Invalid User"
 msgstr "Ongeldige gebruiker"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr "Geen geldige internetnaam (FQDN) aanwezig"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr "Reeds aangemeld"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:237
 msgid "Invalid Username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Friendly Name"
 msgstr "Ongeldige bijnaam"
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr "Lijst is vol"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr "Staat er al"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:249
 msgid "Not on list"
 msgstr "Niet in de lijst"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr "Gebruiker is offline"
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr "Reeds in die modus"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr "Reeds in de tegenovergestelde lijst"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr "Schakelserver fout"
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr "Melding overzetten mislukt"
 
-#: src/protocols/msn/msn.c:267
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr "Niet alle verplichte velden zijn ingevuld"
 
-#: src/protocols/msn/msn.c:270 src/protocols/oscar/oscar.c:399
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 msgid "Not logged in"
 msgstr "Niet aangemeld"
 
-#: src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:275
 msgid "Internal server error"
 msgstr "Interne serverfout"
 
-#: src/protocols/msn/msn.c:277
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr "Database-server fout"
 
-#: src/protocols/msn/msn.c:280
+#: src/protocols/msn/msn.c:281
 msgid "File operation error"
 msgstr "Bestandsfout"
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:284
 msgid "Memory allocation error"
 msgstr "Geheugenfout"
 
-#: src/protocols/msn/msn.c:287
+#: src/protocols/msn/msn.c:288
 msgid "Server busy"
 msgstr "Server bezig"
 
-#: src/protocols/msn/msn.c:290
+#: src/protocols/msn/msn.c:291
 msgid "Server unavailable"
 msgstr "Server niet beschikbaar"
 
-#: src/protocols/msn/msn.c:293
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr "Meldingsserver is offline"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:297
 msgid "Database connect error"
 msgstr "Database verbindingsprobleem"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr "Server wordt uitgeschakeld (verlaat het schip!)"
 
-#: src/protocols/msn/msn.c:303
+#: src/protocols/msn/msn.c:304
 msgid "Error creating connection"
 msgstr "Fout bij maken verbinding"
 
-#: src/protocols/msn/msn.c:309
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr "Sessie-overload"
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr "Gebruiker is te actief"
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr "Te veel sessies"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr "Niet verwacht"
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr "Onbegrijpelijk vriendenbestand"
 
-#: src/protocols/msn/msn.c:325
+#: src/protocols/msn/msn.c:326
 msgid "Authentication failed"
 msgstr "Identificatie mislukt"
 
-#: src/protocols/msn/msn.c:328
+#: src/protocols/msn/msn.c:329
 msgid "Not allowed when offline"
 msgstr "Niet toegestaan tijdens offline-status"
 
-#: src/protocols/msn/msn.c:331
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr "Nieuwe gebruikers worden niet geaccepteerd"
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr "Gebruiker niet gecontroleerd"
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:338
 msgid "Unknown Error Code"
 msgstr "Onbekende foutcode"
 
-#: src/protocols/msn/msn.c:490
+#: src/protocols/msn/msn.c:491
 #, c-format
 msgid "%s has closed the conversation window"
 msgstr "%s heeft het gespreksvenster gesloten"
 
-#: src/protocols/msn/msn.c:561
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr "Een MSN-bericht is misschien niet aangekomen."
 
-#: src/protocols/msn/msn.c:1058
+#: src/protocols/msn/msn.c:1041
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim kon een MSN-bericht niet verzenden"
 
-#: src/protocols/msn/msn.c:1059
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
@@ -1204,401 +1204,401 @@
 "Gaim heeft communicatieproblemen met de MSN schakelserver. Probeert u het "
 "later nogmaals."
 
-#: src/protocols/msn/msn.c:1092 src/protocols/msn/msn.c:1111
-#: src/protocols/msn/msn.c:2282 src/protocols/msn/msn.c:2404
-#: src/protocols/msn/msn.c:2422 src/protocols/msn/msn.c:2542
-#: src/protocols/msn/msn.c:2555 src/protocols/msn/msn.c:2581
-#: src/protocols/msn/msn.c:2638 src/protocols/msn/msn.c:2656
-#: src/protocols/msn/msn.c:2691 src/protocols/msn/msn.c:2725
-#: src/protocols/msn/msn.c:2766 src/protocols/msn/msn.c:2773
-#: src/protocols/msn/msn.c:2786 src/protocols/msn/msn.c:2794
-#: src/protocols/msn/msn.c:2823 src/protocols/msn/msn.c:2832
-#: src/protocols/msn/msn.c:2845 src/protocols/msn/msn.c:2853
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
 msgid "Write error"
 msgstr "Schrijffout"
 
-#: src/protocols/msn/msn.c:1160
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "De gebruiker %s (%s) wil %s toevoegen aan zijn/haar vriendenlijst."
 
-#: src/protocols/msn/msn.c:1210 src/protocols/msn/msn.c:1985
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
 msgid "Unable to write to server"
 msgstr "Kan niet naar server schrijven"
 
-#: src/protocols/msn/msn.c:1317
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "De gebruiker %s (%s) wil u toevoegen aan zijn/haar vriendenlijst"
 
-#: src/protocols/msn/msn.c:1418
+#: src/protocols/msn/msn.c:1401
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 "De verbinding is verbroken. U heeft uzelf aangemeld vanaf een andere locatie."
 
-#: src/protocols/msn/msn.c:1553 src/protocols/msn/msn.c:1869
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
 msgid "Got invalid XFR\n"
 msgstr "Ongeldige XFR onvangen\n"
 
-#: src/protocols/msn/msn.c:1593
+#: src/protocols/msn/msn.c:1576
 msgid "Error transfering"
 msgstr "Fout bij bestandsoverdracht"
 
-#: src/protocols/msn/msn.c:1677 src/protocols/msn/msn.c:1916
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 msgid "Error reading from server"
 msgstr "Fout bij inlezen van informatie van server"
 
-#: src/protocols/msn/msn.c:1761
+#: src/protocols/msn/msn.c:1744
 msgid "Unable to connect to Notification Server"
 msgstr "Kan geen verbinding maken met de meldingsserver"
 
-#: src/protocols/msn/msn.c:1768
+#: src/protocols/msn/msn.c:1751
 msgid "Unable to talk to Notification Server"
 msgstr "Kan niet communiceren met de meldingsserver"
 
-#: src/protocols/msn/msn.c:1784
+#: src/protocols/msn/msn.c:1767
 msgid "Protocol not supported"
 msgstr "Protocol niet ondersteund"
 
-#: src/protocols/msn/msn.c:1791
+#: src/protocols/msn/msn.c:1774
 msgid "Unable to request INF\n"
 msgstr "Kan geen INF aanvragen\n"
 
-#: src/protocols/msn/msn.c:1798
+#: src/protocols/msn/msn.c:1781
 msgid "Unable to login using MD5"
 msgstr "Kan niet aanmelden met MD5"
 
-#: src/protocols/msn/msn.c:1805
+#: src/protocols/msn/msn.c:1788
 msgid "Unable to send USR\n"
 msgstr "Kan geen USR sturen\n"
 
-#: src/protocols/msn/msn.c:1810
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr "Wachtwoord-toestemming aangevraagd"
 
-#: src/protocols/msn/msn.c:1856
+#: src/protocols/msn/msn.c:1839
 msgid "Unable to send password"
 msgstr "Kan wachtwoord niet verzenden"
 
-#: src/protocols/msn/msn.c:1861
+#: src/protocols/msn/msn.c:1844
 msgid "Password sent"
 msgstr "Wachtwoord verzonden"
 
-#: src/protocols/msn/msn.c:1890
+#: src/protocols/msn/msn.c:1873
 msgid "Unable to transfer"
 msgstr "Kan niet overzetten"
 
-#: src/protocols/msn/msn.c:1898
+#: src/protocols/msn/msn.c:1881
 msgid "Unable to parse message"
 msgstr "Kan het bericht niet verwerken"
 
-#: src/protocols/msn/msn.c:1991
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr "Synchronisatie met server"
 
-#: src/protocols/msn/msn.c:2353 src/protocols/msn/msn.c:2380
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr "Weg van de computer"
 
-#: src/protocols/msn/msn.c:2354 src/protocols/msn/msn.c:2382
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr "Ben zo terug"
 
-#: src/protocols/msn/msn.c:2355 src/protocols/msn/msn.c:2384
-#: src/protocols/msn/msn.c:2445
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 msgid "Busy"
 msgstr "Bezig"
 
-#: src/protocols/msn/msn.c:2356 src/protocols/msn/msn.c:2386
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr "Aan de telefoon"
 
-#: src/protocols/msn/msn.c:2357 src/protocols/msn/msn.c:2388
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr "Aan het lunchen"
 
-#: src/protocols/msn/msn.c:2358 src/protocols/msn/msn.c:2390
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 msgid "Hidden"
 msgstr "Onzichtbaar"
 
-#: src/protocols/msn/msn.c:2447
+#: src/protocols/msn/msn.c:2428
 msgid "Be right back"
 msgstr "Ben zo terug"
 
-#: src/protocols/msn/msn.c:2449
+#: src/protocols/msn/msn.c:2430
 msgid "Away from the computer"
 msgstr "Bij de computer vandaan"
 
-#: src/protocols/msn/msn.c:2451
+#: src/protocols/msn/msn.c:2432
 msgid "On the phone"
 msgstr "Aan de telefoon"
 
-#: src/protocols/msn/msn.c:2453
+#: src/protocols/msn/msn.c:2434
 msgid "Out to lunch"
 msgstr "Aan het lunchen"
 
-#: src/protocols/msn/msn.c:2455 src/prefs.c:748
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
 msgid "Idle"
 msgstr "Afwezig"
 
-#: src/protocols/msn/msn.c:2492
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr "Bijnaam herstellen"
 
-#: src/protocols/msn/msn.c:2498 src/protocols/oscar/oscar.c:2574
-#: src/protocols/oscar/oscar.c:4703 src/buddy.c:2192
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
 msgid "Send File"
 msgstr "Bestanden Verzenden"
 
-#: src/protocols/msn/msn.c:2574
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr "Nieuwe MSN bijnaam is te lang."
 
-#: src/protocols/msn/msn.c:2589 src/protocols/msn/msn.c:2610
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 msgid "Set Friendly Name"
 msgstr "Bijnaam instellen"
 
-#: src/protocols/msn/msn.c:2590
+#: src/protocols/msn/msn.c:2571
 msgid "Set Friendly Name:"
 msgstr "Bijnaam instellen:"
 
-#: src/protocols/msn/msn.c:2591 src/protocols/msn/msn.c:2611
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr "Alle bijnamen opnieuw opvragen"
 
-#: src/protocols/msn/msn.c:2751
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
-"An MSN screenname must be in the form \"user@server.com\".  Perhaps you meant "
-"%s@hotmail.com.  No changes were made to your allow list."
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 "Een MSN gebruiker moet de vorm \"gebruiker@server.bla\" hebben. Misschien "
 "bedoelde u %s@hotmail.com. Er is niets veranderd aan de lijst."
 
-#: src/protocols/msn/msn.c:2754 src/protocols/msn/msn.c:2811
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 msgid "Invalid MSN screenname"
 msgstr "Ongeldige MSN bijnaam"
 
-#: src/protocols/msn/msn.c:2808
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
-"An MSN screenname must be in the form \"user@server.com\".  Perhaps you meant "
-"%s@hotmail.com.  No changes were made to your block list."
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 "Een MSN gebruiker moet de vorm \"gebruiker@server.bla\" hebben. Misschien "
 "bedoelde u %s@hotmail.com. Er is niets veranderd aan de lijst."
 
-#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4202
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
 #: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Welke groep binnengaan:"
 
-#: src/protocols/oscar/oscar.c:395
+#: src/protocols/oscar/oscar.c:394
 msgid "Invalid error"
 msgstr "Ongeldige fout"
 
+#: src/protocols/oscar/oscar.c:395
+msgid "Invalid SNAC"
+msgstr "Ongeldige SNAC"
+
 #: src/protocols/oscar/oscar.c:396
-msgid "Invalid SNAC"
-msgstr "Ongeldige SNAC"
-
-#: src/protocols/oscar/oscar.c:397
 msgid "Rate to host"
 msgstr "Frequentie naar host"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:397
 msgid "Rate to client"
 msgstr "Frequentie naar cliënt"
 
+#: src/protocols/oscar/oscar.c:399
+msgid "Service unavailable"
+msgstr "Service niet beschikbaar"
+
 #: src/protocols/oscar/oscar.c:400
-msgid "Service unavailable"
-msgstr "Service niet beschikbaar"
-
-#: src/protocols/oscar/oscar.c:401
 msgid "Service not defined"
 msgstr "Service niet gedefinieerd"
 
-#: src/protocols/oscar/oscar.c:402
+#: src/protocols/oscar/oscar.c:401
 msgid "Obsolete SNAC"
 msgstr "Verouderde SNAC"
 
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr "Niet ondersteund door host"
+
 #: src/protocols/oscar/oscar.c:403
-msgid "Not supported by host"
-msgstr "Niet ondersteund door host"
-
-#: src/protocols/oscar/oscar.c:404
 msgid "Not supported by client"
 msgstr "Niet ondersteund door cliënt"
 
-#: src/protocols/oscar/oscar.c:405
+#: src/protocols/oscar/oscar.c:404
 msgid "Refused by client"
 msgstr "Gewegerd door cliënt"
 
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr "Antwoord te groot"
+
 #: src/protocols/oscar/oscar.c:406
-msgid "Reply too big"
-msgstr "Antwoord te groot"
+msgid "Responses lost"
+msgstr "Reacties verloren"
 
 #: src/protocols/oscar/oscar.c:407
-msgid "Responses lost"
-msgstr "Reacties verloren"
+msgid "Request denied"
+msgstr "Aanvraag geweigerd"
 
 #: src/protocols/oscar/oscar.c:408
-msgid "Request denied"
-msgstr "Aanvraag geweigerd"
+msgid "Busted SNAC payload"
+msgstr "SNAC bagage kapot"
 
 #: src/protocols/oscar/oscar.c:409
-msgid "Busted SNAC payload"
-msgstr "SNAC bagage kapot"
-
-#: src/protocols/oscar/oscar.c:410
 msgid "Insufficient rights"
 msgstr "Niet genoeg rechten"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:410
 msgid "In local permit/deny"
 msgstr "In lokale toestaan/weigeren"
 
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr "Te kwaadaardig (afzender)"
+
 #: src/protocols/oscar/oscar.c:412
-msgid "Too evil (sender)"
-msgstr "Te kwaadaardig (afzender)"
+msgid "Too evil (receiver)"
+msgstr "Te kwaadaardig (ontvanger)"
 
 #: src/protocols/oscar/oscar.c:413
-msgid "Too evil (receiver)"
-msgstr "Te kwaadaardig (ontvanger)"
+msgid "User temporarily unavailable"
+msgstr "Gebruiker tijdelijk niet beschikbaar"
 
 #: src/protocols/oscar/oscar.c:414
-msgid "User temporarily unavailable"
-msgstr "Gebruiker tijdelijk niet beschikbaar"
+msgid "No match"
+msgstr "Geen overeenkomstige resultaten"
 
 #: src/protocols/oscar/oscar.c:415
-msgid "No match"
-msgstr "Geen overeenkomstige resultaten"
+msgid "List overflow"
+msgstr "Te grote lijst"
 
 #: src/protocols/oscar/oscar.c:416
-msgid "List overflow"
-msgstr "Te grote lijst"
+msgid "Request ambiguous"
+msgstr "Dubieuze aanvraag"
 
 #: src/protocols/oscar/oscar.c:417
-msgid "Request ambiguous"
-msgstr "Dubieuze aanvraag"
-
-#: src/protocols/oscar/oscar.c:418
 msgid "Queue full"
 msgstr "Wachtrij vol"
 
-#: src/protocols/oscar/oscar.c:419
+#: src/protocols/oscar/oscar.c:418
 msgid "Not while on AOL"
 msgstr "Niet tijdens AOL"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Directe verbinding met %s afgesloten"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Directe verbinding met %s mislukt"
 
-#: src/protocols/oscar/oscar.c:503
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "Verbindingsfout!\n"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "Fatale verbindingsgout!\n"
 
-#: src/protocols/oscar/oscar.c:515 src/protocols/toc/toc.c:555
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
 #: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Verbinding verbroken"
 
-#: src/protocols/oscar/oscar.c:527 src/protocols/toc/toc.c:805
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "De verbinding met chatruimte %s is verbroken"
 
-#: src/protocols/oscar/oscar.c:540
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Chatruimte is momenteel niet bereikbaar."
 
-#: src/protocols/oscar/oscar.c:561 src/protocols/oscar/oscar.c:1888
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
 msgid "Buddy canceled transfer"
 msgstr "Andere zijde heeft overdracht afgebroken"
 
-#: src/protocols/oscar/oscar.c:612 src/protocols/oscar/oscar.c:674
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Kan geen verbinding maken met host"
 
-#: src/protocols/oscar/oscar.c:620
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Wachtwoord verzonden, wacht op antwoord\n"
 
-#: src/protocols/oscar/oscar.c:655
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "Interne verbindingsfout\n"
 
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Aanmelden bij AIM niet mogelijk"
 
-#: src/protocols/oscar/oscar.c:661
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Aanmelding: %s"
 
-#: src/protocols/oscar/oscar.c:743
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Afgemeld.\n"
 
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:910
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Kan geen verbinding maken"
 
-#: src/protocols/oscar/oscar.c:770
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Verbinding hersteld, Cookie verzonden"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:811 src/protocols/toc/toc.c:503
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:816
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Uw Account is momenteel afgesloten"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:820
+#: src/protocols/oscar/oscar.c:819
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "De AOL service is momenteel niet bereikbaar."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:824
+#: src/protocols/oscar/oscar.c:823
 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 ""
-"U heeft zich te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
-"keer. Als u verdergaat moet u nog langer wachten "
+"U heeft zich te snel aan en afgemeld. Wacht 10 minuten en probeer het nog "
+"een keer. Als u verdergaat moet u nog langer wachten "
 
 #. client too old
-#: src/protocols/oscar/oscar.c:829
+#: src/protocols/oscar/oscar.c:828
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Het programma wat u gebruikt is te oud. Haal een nieuwe versie op bij %s"
 
-#: src/protocols/oscar/oscar.c:834 src/protocols/toc/toc.c:586
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Identificatie mislukt"
 
-#: src/protocols/oscar/oscar.c:856
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Interne Fout"
 
-#: src/protocols/oscar/oscar.c:949 src/protocols/oscar/oscar.c:976
-#: src/protocols/oscar/oscar.c:1060
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -1607,36 +1607,36 @@
 "U wordt waarschijnlijk binnenkort afgemeld. U kunt misschien beter TOC "
 "gebruiken tot dit probleem is opgelost. Kijk op %s voor nieuwe versies."
 
-#: src/protocols/oscar/oscar.c:951 src/protocols/oscar/oscar.c:978
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim kon geen geldige AIM aanmeld-hash krijgen."
 
-#: src/protocols/oscar/oscar.c:1062
+#: src/protocols/oscar/oscar.c:1061
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim kon geen geldige aanmeld-hash krijgen."
 
-#: src/protocols/oscar/oscar.c:1500 src/protocols/oscar/oscar.c:4504
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte verbinding met %s hersteld"
 
-#: src/protocols/oscar/oscar.c:1610
+#: src/protocols/oscar/oscar.c:1609
 msgid "Transfer timed out"
 msgstr "Tijd voor overdracht verlopen"
 
-#: src/protocols/oscar/oscar.c:1632
+#: src/protocols/oscar/oscar.c:1631
 msgid "Couldn't open listener to send file"
 msgstr "Kan luisteraar niet benaderen om bestand over te zenden"
 
-#: src/protocols/oscar/oscar.c:1633
+#: src/protocols/oscar/oscar.c:1632
 msgid "File transfer aborted"
 msgstr "Bestandsoverdracht afgebroken"
 
-#: src/protocols/oscar/oscar.c:1832 src/protocols/oscar/oscar.c:1852
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
 msgid "(There was an error receiving this message)"
 msgstr "(Er is een fout opgetreden bij het ontvangen van dit bericht)"
 
-#: src/protocols/oscar/oscar.c:2022
+#: src/protocols/oscar/oscar.c:2020
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -1646,48 +1646,47 @@
 "IM berichten. Omdat je IP-adres bekend wordt kan dit worden opgevat als een "
 "inbreuk op de privacy."
 
-#: src/protocols/oscar/oscar.c:2118
+#: src/protocols/oscar/oscar.c:2116
 #, c-format
 msgid ""
-"The user %lu wants to add you to their buddy list for the following reason: "
-"%s"
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
 msgstr ""
 "De gebruiker %lu wil u toevoegen aan zijn/haar vriendenlijst om de volgende "
 "reden: %s"
 
-#: src/protocols/oscar/oscar.c:2118 src/protocols/oscar/oscar.c:2129
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
 msgid "No reason given."
 msgstr "Geen reden gegeven."
 
-#: src/protocols/oscar/oscar.c:2122
+#: src/protocols/oscar/oscar.c:2120
 msgid "Authorization Request"
 msgstr "Identificatie-aanvraag"
 
-#: src/protocols/oscar/oscar.c:2129
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
-"The user %lu 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 ""
 "De gebruiker %lu heeft uw aanvraag om hem/haar toe te voegen aan uw lijst "
 "geweigerd met de volgende reden:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2130
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr "ICQ identificatie geweigerd."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2136
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
-msgid ""
-"The user %lu 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 ""
 "De gebruiker %lu heeft toestemming gegeven. Hij/zij wordt toegevoegd aan uw "
 "vriendenlijst."
 
-#: src/protocols/oscar/oscar.c:2143
+#: src/protocols/oscar/oscar.c:2141
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -1700,7 +1699,7 @@
 "Afzender: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2151
+#: src/protocols/oscar/oscar.c:2149
 #, c-format
 msgid ""
 "You have received an ICQ email\n"
@@ -1721,208 +1720,193 @@
 "5=%s\n"
 "6=%s\n"
 
-#: src/protocols/oscar/oscar.c:2172
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "ICQ-gebruiker %lu heeft u een contact toegestuurd: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2176
+#: src/protocols/oscar/oscar.c:2174
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "Wilt u deze persoon toevoegen aan uw vriendenlijst?"
 
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "U heeft %d bericht van %s niet ontvangen omdat deze ongeldig was."
+
 #: src/protocols/oscar/oscar.c:2255
-#, c-format
-msgid "You missed %d message from %s because it was invalid."
-msgstr "U heeft %d bericht van %s niet ontvangen omdat deze ongeldig was."
-
-#: src/protocols/oscar/oscar.c:2256
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
 msgstr "U heeft %d berichten van %s niet ontvangen omdat deze ongeldig waren."
 
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgstr "U heeft %d bericht van %s niet ontvangen omdat deze te groot was."
+
 #: src/protocols/oscar/oscar.c:2265
-#, c-format
-msgid "You missed %d message from %s because it was too large."
-msgstr "U heeft %d bericht van %s niet ontvangen omdat deze te groot was."
-
-#: src/protocols/oscar/oscar.c:2266
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
 msgstr "U heeft %d berichten van %s niet ontvangen omdat deze te groot waren."
 
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgstr ""
+"U heeft %d bericht van %s niet ontvangen omdat deze te snel verzonden werd."
+
 #: src/protocols/oscar/oscar.c:2275
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You missed %d message from %s because the rate limit has been exceeded."
-msgstr ""
-"U heeft %d bericht van %s niet ontvangen omdat deze te snel verzonden werd."
-
-#: src/protocols/oscar/oscar.c:2276
-#, c-format
-msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr ""
 "U heeft %d berichten van %s niet ontvangen omdat deze te snel verzonden "
 "werden."
 
-#: src/protocols/oscar/oscar.c:2285
-#, c-format
-msgid "You missed %d message from %s because he/she was too evil."
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
 msgstr ""
 "U heeft %d bericht van %s niet ontvangen omdat deze te kwaadaardig was."
 
-#: src/protocols/oscar/oscar.c:2286
-#, c-format
-msgid "You missed %d messages from %s because he/she was too evil."
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
 msgstr ""
 "U heeft %d bericht van %s niet ontvangen omdat deze te kwaadaardig was."
 
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
+msgstr "U heeft %d bericht van %s niet ontvangen omdat u te kwaadaardig bent."
+
 #: src/protocols/oscar/oscar.c:2295
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
-msgstr "U heeft %d bericht van %s niet ontvangen omdat u te kwaadaardig bent."
-
-#: src/protocols/oscar/oscar.c:2296
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr ""
 "U heeft %d berichten van %s niet ontvangen omdat u te kwaadaardig bent."
 
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgstr "U heeft %d bericht niet ontvangen van %s om onbekende redenen."
+
 #: src/protocols/oscar/oscar.c:2304
-#, c-format
-msgid "You missed %d message from %s for an unknown reason."
-msgstr "U heeft %d bericht niet ontvangen van %s om onbekende redenen."
-
-#: src/protocols/oscar/oscar.c:2305
-#, c-format
-msgid "You missed %d messages from %s for an unknown reason."
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "U heeft %d berichten niet ontvangen van %s om onbekende redenen."
 
-#: src/protocols/oscar/oscar.c:2343
+#: src/protocols/oscar/oscar.c:2342
 #, c-format
 msgid "%s has declined to receive a file from %s.\n"
 msgstr "%s wil geen bestand ontvangen van %s.\n"
 
-#: src/protocols/oscar/oscar.c:2388
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:2390
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>Status:</B> %s<BR><HR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw fout: %s\n"
 
-#: src/protocols/oscar/oscar.c:2447
+#: src/protocols/oscar/oscar.c:2446
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: src/protocols/oscar/oscar.c:2470 src/protocols/oscar/oscar.c:2478
-#: src/protocols/oscar/oscar.c:2530
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 msgid "No reason was given."
 msgstr "Geen reden opgegeven."
 
 #. Data is assumed to be the destination sn.
-#: src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Uw bericht aan %s is niet verzonden:"
 
-#: src/protocols/oscar/oscar.c:2529
+#: src/protocols/oscar/oscar.c:2528
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Gebruikersinformatie voor %s niet beschikbaar:"
 
-#: src/protocols/oscar/oscar.c:2559 src/buddy.c:2177
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Vriendplaatje"
 
-#: src/protocols/oscar/oscar.c:2562 src/buddy.c:2180
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Stem"
 
-#: src/protocols/oscar/oscar.c:2565 src/buddy.c:2183
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "IM Afbeelding"
 
-#: src/protocols/oscar/oscar.c:2568 src/buddy.c:500 src/buddy.c:2186
-#: src/buddy.c:2531
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:2571 src/buddy.c:2189
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Bestanden Ophalen"
 
-#: src/protocols/oscar/oscar.c:2578 src/buddy.c:2196
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Spellen"
 
-#: src/protocols/oscar/oscar.c:2581 src/buddy.c:2199
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Koersen"
 
-#: src/protocols/oscar/oscar.c:2584 src/buddy.c:2202
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Vriendenlijst verzenden"
 
-#: src/protocols/oscar/oscar.c:2587 src/buddy.c:2205
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "Everybuddy bug"
 
-#: src/protocols/oscar/oscar.c:2590 src/buddy.c:2208
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "AP-gebruiker"
 
-#: src/protocols/oscar/oscar.c:2593 src/buddy.c:2211
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:2596 src/buddy.c:2214
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:2599 src/buddy.c:2217
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:2602 src/buddy.c:2220
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ onbekend"
 
-#: src/protocols/oscar/oscar.c:2605 src/buddy.c:2223
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Trillian codering"
 
-#: src/protocols/oscar/oscar.c:2657
+#: src/protocols/oscar/oscar.c:2655
 msgid ""
-"<I>Unable to display information because it was sent in an unknown "
-"encoding.</I>"
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
 msgstr ""
 "<I>Kan geen informatie weergeven omdat deze is verstuurd in een onbekende "
 "codering."
 
-#: src/protocols/oscar/oscar.c:2664
-msgid ""
-"<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 AIM gebruiker<br><IMG SRC=\"aol_icon.gif\"> : AOL gebruiker "
-"<br><IMG SRC=\"dt_icon.gif\"> : AIM testgebruiker <br><IMG "
-"SRC=\"admin_icon.gif\"> : Systeembeheerder <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactieve software <br><IMG SRC=\"wireless_icon.gif\"> : "
-"Draadloze gebruiker <br>"
-
-#: src/protocols/oscar/oscar.c:2692
+#: src/protocols/oscar/oscar.c:2677
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -1935,27 +1919,27 @@
 "%s%s%s<BR>\n"
 "<HR>\n"
 
-#: src/protocols/oscar/oscar.c:2724
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>Gebruiker heeft geen afwezigheidsbericht</i>"
 
-#: src/protocols/oscar/oscar.c:2736
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Mogelijkheden: "
 
-#: src/protocols/oscar/oscar.c:2744
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Geen Informatie Gegeven</i>"
 
-#: src/protocols/oscar/oscar.c:2769
+#: src/protocols/oscar/oscar.c:2751
 msgid "Your AIM connection may be lost."
 msgstr "Uw AIM-verbinding is misschien verbroken."
 
-#: src/protocols/oscar/oscar.c:3027
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr "Snelheidsoverschrijding."
 
-#: src/protocols/oscar/oscar.c:3028
+#: src/protocols/oscar/oscar.c:3011
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -1963,15 +1947,15 @@
 "Uw laatste bericht is niet verzonden omdat deze te snel verzonden is. Wacht "
 "alstublieft 10 seconden en probeer het dan nogmaals."
 
-#: src/protocols/oscar/oscar.c:3480
+#: src/protocols/oscar/oscar.c:3463
 msgid "Account Confirmation Requested"
 msgstr "Accountbevestiging aangevraagd"
 
-#: src/protocols/oscar/oscar.c:3507
+#: src/protocols/oscar/oscar.c:3490
 msgid "Error Changing Account Info"
 msgstr "Fout bij aanpassen van accountgegevens"
 
-#: src/protocols/oscar/oscar.c:3510
+#: src/protocols/oscar/oscar.c:3493
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1980,7 +1964,7 @@
 "Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde gebruikersnaam "
 "is niet gelijk aan het origineel."
 
-#: src/protocols/oscar/oscar.c:3513
+#: src/protocols/oscar/oscar.c:3496
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1989,7 +1973,7 @@
 "Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde gebruikersnaam "
 "eindigt op een spatie."
 
-#: src/protocols/oscar/oscar.c:3516
+#: src/protocols/oscar/oscar.c:3499
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -1998,7 +1982,7 @@
 "Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde gebruikersnaam "
 "te lang is."
 
-#: src/protocols/oscar/oscar.c:3519
+#: src/protocols/oscar/oscar.c:3502
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -2007,7 +1991,7 @@
 "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres al is "
 "aangevraagd door een ander."
 
-#: src/protocols/oscar/oscar.c:3522
+#: src/protocols/oscar/oscar.c:3505
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -2016,7 +2000,7 @@
 "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres reeds te veel "
 "gebruikersnamen toegewezen heeft gekregen."
 
-#: src/protocols/oscar/oscar.c:3525
+#: src/protocols/oscar/oscar.c:3508
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -2024,12 +2008,12 @@
 msgstr ""
 "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres ongeldig is."
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3511
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fout 0x%04x: Onbekende fout."
 
-#: src/protocols/oscar/oscar.c:3538
+#: src/protocols/oscar/oscar.c:3521
 #, c-format
 msgid ""
 "Your screen name is currently formated as follows:\n"
@@ -2038,62 +2022,62 @@
 "Uw gebruikersnaam wordt op het moment als volgt weergegeven:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3539 src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
 msgid "Account Info"
 msgstr "Accountinformatie"
 
-#: src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3527
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Het e-mail adres vor %s is %s"
 
-#: src/protocols/oscar/oscar.c:3737
+#: src/protocols/oscar/oscar.c:3720
 msgid "Unable to set AIM profile."
 msgstr "Kan AIM-profiel niet instellen."
 
-#: src/protocols/oscar/oscar.c:3738
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"U heeft waarschijnlijk uw profiel aangepast voordat u volledig aangemeld was. "
-"Uw profiel is niet ingesteld. Probeert u het nogmaals wanneer u volledig "
-"aangemeld bent."
-
-#: src/protocols/oscar/oscar.c:3744
+"U heeft waarschijnlijk uw profiel aangepast voordat u volledig aangemeld "
+"was. Uw profiel is niet ingesteld. Probeert u het nogmaals wanneer u "
+"volledig aangemeld bent."
+
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has truncated "
-"and set it."
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
 msgstr ""
 "De maximale profiellengte van %d bytes is overschreden. Gaim heeft het "
 "afgebroken op deze lengte."
 
-#: src/protocols/oscar/oscar.c:3781
+#: src/protocols/oscar/oscar.c:3764
 msgid "Unable to set AIM away message."
 msgstr "Kan geen AIM afwezigheidsbericht instellen."
 
-#: src/protocols/oscar/oscar.c:3782
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it again "
-"when you are fully connected."
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
 msgstr ""
 "U heeft waarschijnlijk uw afwezigheidsbericht aangepast voordat u volledig "
 "aangemeld was. Uw afwezigheidsbericht is niet ingesteld. Probeert u het "
 "nogmaals wanneer u volledig aangemeld bent."
 
-#: src/protocols/oscar/oscar.c:3798
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
-"The away message length of %d bytes has been exceeded.  Gaim has truncated it "
-"and set you away."
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
 msgstr ""
 "De lengte van %d bytes van het afwezigheidsbericht is overschreden. Gaim "
 "heeft het bericht afgebroken op deze lengte."
 
-#: src/protocols/oscar/oscar.c:4185
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -2103,20 +2087,20 @@
 "wanneer uw weer onder deze limiet zit zullen alle vrienden voorkomen in de "
 "online-lijst."
 
-#: src/protocols/oscar/oscar.c:4206 src/protocols/toc/toc.c:1148
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Uitwisselen:"
 
-#: src/protocols/oscar/oscar.c:4627
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Kan geen directe verbinding openen"
 
-#: src/protocols/oscar/oscar.c:4637
+#: src/protocols/oscar/oscar.c:4620
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "U heeft ervoor gekozen om een directe verbinding te openen met %s."
 
-#: src/protocols/oscar/oscar.c:4638
+#: src/protocols/oscar/oscar.c:4621
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -2124,7 +2108,7 @@
 "Omdat dit uw IP-adres zichtbaar maakt voor de andere partij, kan het worden "
 "gezien als inbreuk op uw privacy. Wilt u doorgaan?"
 
-#: src/protocols/oscar/oscar.c:4652
+#: src/protocols/oscar/oscar.c:4635
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
@@ -2133,24 +2117,24 @@
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Programma heeft geen "
 "ondersteuning voor statusberichten.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4659
+#: src/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status "
-"message.</I><BR>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Gebruiker heeft geen "
 "statusbericht.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4684
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "Statusbericht tonen"
 
-#: src/protocols/oscar/oscar.c:4697
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Direct bericht"
 
-#: src/protocols/oscar/oscar.c:4711
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Mogelijkheden tonen"
 
@@ -2295,8 +2279,8 @@
 #: src/protocols/toc/toc.c:829
 msgid ""
 "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."
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "Wanneer dit gebeurt negeert TOC alle berichten die u stuurt, en wordt u "
 "misschien van het netwerk geschopt. Gaim voorkomt deze situatie door geen "
@@ -2391,59 +2375,59 @@
 msgid "About Gaim v%s"
 msgstr "Gaim v%s info"
 
-#: src/about.c:111
+#: src/about.c:112
 msgid ""
-"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, Yahoo!, "
-"MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is written "
-"using Gtk+ and is licensed under the GPL.<BR><BR>"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim is een modulair programma om expresberichten uit te wisselen via AIM, "
 "ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr en GaduGadu en dat allemaal "
-"tegelijk! Het is geschreven m.b.v. Gtk+ en wordt verspreid onder een "
-"GPL-licentie.<BR><BR>"
-
-#: src/about.c:121
+"tegelijk! Het is geschreven m.b.v. Gtk+ en wordt verspreid onder een GPL-"
+"licentie.<BR><BR>"
+
+#: src/about.c:122
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #gaim op irc.freenode.net<BR><BR>"
 
-#: src/about.c:125
+#: src/about.c:126
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Actieve Ontwikkelaars:</FONT><BR>"
 
-#: src/about.c:127
+#: src/about.c:128
 msgid ""
-"  Rob Flynn (maintainer) &lt;<A "
-"HREF=\"mailto:rob@marko.net\">rob@marko.net</A>&gt;<BR>  Sean Egan (coder) &lt;<A "
-"HREF=\"mailto:bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
 msgstr ""
-"  Rob Flynn (maintainer) &lt;<A "
-"HREF=\"mailto:rob@marko.net\">rob@marko.net</A>&gt;<BR>  Sean Egan (coder) &lt;<A "
-"HREF=\"mailto:bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
-
-#: src/about.c:135
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+
+#: src/about.c:136
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Gestoorde Patch-schrijvers:</FONT><BR>"
 
-#: src/about.c:143
+#: src/about.c:144
 msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Win32 versie:</FONT><BR>"
 
-#: src/about.c:150
+#: src/about.c:151
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Ex ontwikkelaars:</FONT><BR>"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid ""
-"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A "
-"HREF=\"mailto:warmenhoven@yahoo.com\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
 "HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
 msgstr ""
-"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A "
-"HREF=\"mailto:warmenhoven@yahoo.com\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
 "HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
 
-#: src/about.c:173 src/dialogs.c:4270 src/prpl.c:493 src/prpl.c:740
-#: src/server.c:1160
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
 msgid "Close"
 msgstr "Sluiten"
 
@@ -2479,22 +2463,22 @@
 msgid "Set All Away"
 msgstr "Zet alles op afwezig"
 
-#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1137
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Groep"
 
 #: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
-#: src/buddy_chat.c:869
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "Bericht"
 
-#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:886 src/buddy_chat.c:1597
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
 #: src/conversation.c:2915
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1127 src/dialogs.c:3833
-#: src/dialogs.c:3846
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
@@ -2683,97 +2667,97 @@
 msgid "Edit Buddies"
 msgstr "Bewerken"
 
-#: src/buddy_chat.c:275
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Chat openen"
 
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Deelnemen aan chat als:"
 
-#: src/buddy_chat.c:313
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Deelnemen"
 
-#: src/buddy_chat.c:402 src/buddy_chat.c:405 src/buddy_chat.c:1452
-#: src/buddy_chat.c:1547
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: src/buddy_chat.c:421 src/dialogs.c:1800 src/dialogs.c:3823
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Vriend"
 
-#: src/buddy_chat.c:426
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Bericht"
 
-#: src/buddy_chat.c:463
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Vriend uitnodigen in chatruimte"
 
-#: src/buddy_chat.c:876
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Negeren Opheffen"
 
-#: src/buddy_chat.c:878 src/prefs.c:280
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Negeren"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:954 src/buddy_chat.c:1093 src/buddy_chat.c:1659
-#: src/buddy_chat.c:1692
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s in ruimte"
 
-#: src/buddy_chat.c:963
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s is de ruimte binnengekomen."
 
-#: src/buddy_chat.c:965
+#: src/buddy_chat.c:959
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] is de ruimte binnengekomen."
 
-#: src/buddy_chat.c:1044
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heet nu %s"
 
-#: src/buddy_chat.c:1102
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s is weggegaan (%s)."
 
-#: src/buddy_chat.c:1104
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s is weggegaan."
 
-#: src/buddy_chat.c:1210
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Chatruimtes"
 
-#: src/buddy_chat.c:1290
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Onderwerp:"
 
-#: src/buddy_chat.c:1329
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0 personen in ruimte"
 
-#: src/buddy_chat.c:1436 src/buddy_chat.c:1546 src/buddy_chat.c:1579
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
 #: src/conversation.c:2874
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/buddy_chat.c:1594 src/conversation.c:2906
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "Waarschuwen"
 
-#: src/buddy_chat.c:1600 src/conversation.c:2925
+#: src/buddy_chat.c:1592 src/conversation.c:2925
 msgid "Block"
 msgstr "Blokkeren"
 
@@ -2860,7 +2844,7 @@
 msgid "Save Icon As..."
 msgstr "Plaatje opslaan als..."
 
-#: src/dialogs.c:424
+#: src/dialogs.c:422
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -2873,57 +2857,58 @@
 "Dit zal %s zijn/haar waarschuwingsniveau verhogen en strengere regels zullen "
 "worden toegepast.\n"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:431
 msgid "Warn _anonymously?"
 msgstr "_Anoniem waarschuwen?"
 
-#: src/dialogs.c:440
+#: src/dialogs.c:438
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonieme waarschuwingen zijn minder erg.</b>"
 
-#: src/dialogs.c:460
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "'%s' wordt van de vriendenlijst verwijderd.\n"
 
-#: src/dialogs.c:708
+#: src/dialogs.c:706
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
 "Geef alstublieft de bijnaam van de persoon met wie u een directe verbinding "
 "wilt.\n"
 
-#: src/dialogs.c:724 src/dialogs.c:818
+#: src/dialogs.c:722 src/dialogs.c:816
 msgid "_Screenname:"
 msgstr "_Gebruikersnaam:"
 
-#: src/dialogs.c:737 src/dialogs.c:831
+#: src/dialogs.c:735 src/dialogs.c:829
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/dialogs.c:806
+#: src/dialogs.c:804
 msgid ""
-"Please enter the screenname of the person whose info you would like to view.\n"
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
 msgstr ""
 "Geef alstublieft de bijnaam van de persoon waarvan u de informatie wilt "
 "opvragen.\n"
 
-#: src/dialogs.c:958
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - Groep toevoegen"
 
-#: src/dialogs.c:975
+#: src/dialogs.c:973
 msgid "Please enter the name of the group to be added.\n"
 msgstr "Geef alstublieft de naam van de toe te voegen groep.\n"
 
-#: src/dialogs.c:984 src/dialogs.c:4383
+#: src/dialogs.c:982 src/dialogs.c:4356
 msgid "_Group:"
 msgstr "_Groep:"
 
-#: src/dialogs.c:1076
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Vriend toevoegen"
 
-#: src/dialogs.c:1095
+#: src/dialogs.c:1088
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2934,267 +2919,267 @@
 "opgeven. Deze alias wordt dan gebruikt in plaats van de echte naam (wanneer "
 "mogelijk).\n"
 
-#: src/dialogs.c:1114
+#: src/dialogs.c:1107
 msgid "Screen Name"
 msgstr "Gebruikersnaam"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1146
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Toevoegen aan"
 
-#: src/dialogs.c:1479
+#: src/dialogs.c:1468
 msgid "Gaim - Privacy"
 msgstr "Gaim - Privacy"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1479
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Privacy-instellingen worden direct actief."
 
-#: src/dialogs.c:1499
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Privacy instellen voor:"
 
-#: src/dialogs.c:1516
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Alle gebruikers mogen contact opnemen"
 
-#: src/dialogs.c:1520
+#: src/dialogs.c:1509
 msgid "Allow only users on my buddy list"
 msgstr "Alleen gebruikers uit mijn lijst toestaan"
 
-#: src/dialogs.c:1524
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "Alleen onderstaande gebruikers toestaan"
 
-#: src/dialogs.c:1562
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Alle Gebruikers Blokkeren"
 
-#: src/dialogs.c:1566
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Onderstaande gebruikers blokkeren"
 
-#: src/dialogs.c:1631
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Vul een vriend in om een alarm voor in te stellen."
 
-#: src/dialogs.c:1770
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nieuw vriend-alarm "
 
 #. <pounce type="who">
-#: src/dialogs.c:1780
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Wie Alarmeren"
 
-#: src/dialogs.c:1791
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Account"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1817
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "Wanneer Alermeren"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Alermeren bij aanmelden"
 
-#: src/dialogs.c:1836
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Alarmeren bij terugkeer van afwezigheid"
 
-#: src/dialogs.c:1845
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Alarmeren bij terugkeer van Inactief"
 
-#: src/dialogs.c:1854
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "Geef een melding wanneer een vriend iets aan het typen is"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1864
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Alarm Actie"
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "Open Berichtvenster"
 
-#: src/dialogs.c:1884
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Popup Melding"
 
-#: src/dialogs.c:1893 src/prefs.c:296
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Verstuur bericht"
 
-#: src/dialogs.c:1914
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Commando uitvoeren bij alarm"
 
-#: src/dialogs.c:1936
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Speel geluid af bij alarm"
 
 #. </pounce type="action">
-#: src/dialogs.c:1958
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Sla dit alarm op na activatie"
 
-#: src/dialogs.c:1978
+#: src/dialogs.c:1967
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: src/dialogs.c:1984
+#: src/dialogs.c:1973
 msgid "C_ancel"
 msgstr "_Annuleren"
 
-#: src/dialogs.c:2055
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Profiel Wijzigen"
 
-#: src/dialogs.c:2063
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Directory Info"
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Sta zoekopdrachten toe om uw info te vinden"
 
 #. Line 1
-#: src/dialogs.c:2088 src/dialogs.c:2790
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Voornaam"
 
 #. Line 2
-#: src/dialogs.c:2099 src/dialogs.c:2802
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Tweede Naam"
 
 #. Line 3
-#: src/dialogs.c:2111 src/dialogs.c:2814
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Achternaam"
 
 #. Line 4
-#: src/dialogs.c:2122 src/dialogs.c:2826
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Meisjesnaam"
 
 #. Line 6
-#: src/dialogs.c:2144 src/dialogs.c:2849
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Staat"
 
-#: src/dialogs.c:2187 src/dialogs.c:2375 src/dialogs.c:3637 src/dialogs.c:4279
-#: src/dialogs.c:5242
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/dialogs.c:2209
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Nieuwe wachtwoorden zijn niet gelijk"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Vul alle velden voledig in"
 
-#: src/dialogs.c:2239
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Wachtwoord Veranderen"
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Oud Wachtwoord"
 
-#: src/dialogs.c:2282
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Nieuw Wachtwoord"
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Nieuw Wachtwoord (herhalen)"
 
 #. Build OK Button
-#: src/dialogs.c:2310 src/dialogs.c:2468 src/dialogs.c:2771 src/dialogs.c:2945
-#: src/dialogs.c:3015 src/dialogs.c:4497
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:2338
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Gebruikersinfo instellen"
 
-#: src/dialogs.c:2453
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Het resultaat van uw zoekopdracht:"
 
-#: src/dialogs.c:2587
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Toestaan"
 
-#: src/dialogs.c:2627
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Toestemming toevoegen"
 
-#: src/dialogs.c:2629
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Blokkade toevoegen"
 
-#: src/dialogs.c:2688
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Gesprek bijhouden in logboek"
 
-#: src/dialogs.c:2766 src/dialogs.c:2927
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Vriend zoeken"
 
-#: src/dialogs.c:2894
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Vriend zoeken via info"
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Vriend zoeken via e-mail"
 
-#: src/dialogs.c:3010
+#: src/dialogs.c:2997
 msgid "Insert Link"
 msgstr "Verwijzing invoegen"
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - URL toevoegen"
 
-#: src/dialogs.c:3164 src/dialogs.c:3184
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Tekstkleur selecteren"
 
-#: src/dialogs.c:3216 src/dialogs.c:3236
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Achtergrondkleur selecteren"
 
-#: src/dialogs.c:3311 src/dialogs.c:3335
+#: src/dialogs.c:3284 src/dialogs.c:3308
 msgid "Select Font"
 msgstr "Lettertype selecteren"
 
-#: src/dialogs.c:3412
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importeren naar:"
 
-#: src/dialogs.c:3436
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Vriendenlijst importeren"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3497
+#: src/dialogs.c:3470
 msgid "You cannot save an away message with a blank title"
 msgstr "U kunt geen afwezigheidsbericht maken zonder titel"
 
-#: src/dialogs.c:3498
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
@@ -3203,99 +3188,99 @@
 "te slaan."
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3505
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "U kunt geen leeg bericht maken"
 
-#: src/dialogs.c:3568
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Nieuw afwezigheidsbericht"
 
-#: src/dialogs.c:3577
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Nieuw afwezigheidsbericht"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Afwezig titel:"
 
-#: src/dialogs.c:3641
+#: src/dialogs.c:3614
 msgid "Save & Use"
 msgstr "Opslaan & gebruiken"
 
-#: src/dialogs.c:3645
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Gebruiken"
 
 #. show everything
-#: src/dialogs.c:3779
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Lachen!"
 
-#: src/dialogs.c:3868
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias voor vriend"
 
-#: src/dialogs.c:3906 src/dialogs.c:3913
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Kon niet schrijven naar %s."
 
-#: src/dialogs.c:3937
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Logboek opslaan"
 
-#: src/dialogs.c:3967
+#: src/dialogs.c:3940
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Kon het bestand %s niet verwijderen."
 
-#: src/dialogs.c:3994
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Logboek opschonen?"
 
-#: src/dialogs.c:4009
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4190
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:4253
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Gesprek"
 
-#: src/dialogs.c:4274
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Opschonen"
 
-#: src/dialogs.c:4357
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Groep hernoemen"
 
-#: src/dialogs.c:4374
+#: src/dialogs.c:4347
 msgid "Please enter a new name for the selected group.\n"
 msgstr "Geef alstublieft de nieuwe naam voor deze groep.\n"
 
-#: src/dialogs.c:4462
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Vriend hernoemen"
 
-#: src/dialogs.c:4471
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Vriend hernoemen"
 
-#: src/dialogs.c:4478
+#: src/dialogs.c:4452
 msgid "New name:"
 msgstr "Nieuwe Naam:"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4555
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Selecteer Perl Script"
 
-#: src/gaimrc.c:1347
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kan configuratiebestand %s niet openen."
@@ -3403,8 +3388,8 @@
 msgstr ""
 "U probeert zich aan te melden m.b.v. het TOC-protocol. Omdat dit protocol "
 "inferieur is aan OSCAR, wat compatibel is, wordt TOC tegenwoordig als plugin "
-"meegeleverd. Om u aan te melden kunt u overschakelen naar OSCAR of de "
-"TOC-plugin laden."
+"meegeleverd. Om u aan te melden kunt u overschakelen naar OSCAR of de TOC-"
+"plugin laden."
 
 #: src/multi.c:1084
 msgid "Protocol not found."
@@ -3485,8 +3470,8 @@
 #: src/perl.c:343
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr ""
-"GAIM::register niet aangeroepen met de juiste argumenten.  Lees de "
-"PERL-HOWTO."
+"GAIM::register niet aangeroepen met de juiste argumenten.  Lees de PERL-"
+"HOWTO."
 
 #: src/prefs.c:180
 msgid "Interface Options"
@@ -4140,7 +4125,7 @@
 msgid "Gaim - Preferences"
 msgstr "Gaim - Voorkeuren"
 
-#: src/prefs.c:1566
+#: src/prefs.c:1565
 msgid "Gaim - Debug Window"
 msgstr "Gaim - Debugvenster"
 
@@ -4150,8 +4135,8 @@
 
 #: src/prpl.c:101
 msgid ""
-"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, it "
-"was probably not compiled from the same version of the source as this "
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
 "application was, and cannot be guaranteed to work.  It is recommended that "
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
@@ -4196,8 +4181,8 @@
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
-"U heeft op het moment geen protocollen tot uw beschikking waarmee u een nieuw "
-"account kunt aanmaken."
+"U heeft op het moment geen protocollen tot uw beschikking waarmee u een "
+"nieuw account kunt aanmaken."
 
 #: src/prpl.c:714
 msgid "Gaim - Registration"
@@ -4215,24 +4200,24 @@
 msgid "Please enter your password"
 msgstr "Vul uw wachtwoord in"
 
-#: src/server.c:649
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d berichten)"
 
-#: src/server.c:655
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 bericht)"
 
-#: src/server.c:967
+#: src/server.c:966
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:968
+#: src/server.c:967
 msgid "No"
 msgstr "Nee"
 
-#: src/server.c:1164
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Meer info"
 
@@ -4276,6 +4261,20 @@
 msgid "Someone says your name in chat"
 msgstr "Iemand zegt uw naam in de chatruimte"
 
+#~ msgid ""
+#~ "<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 AIM gebruiker<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+#~ "gebruiker <br><IMG SRC=\"dt_icon.gif\"> : AIM testgebruiker <br><IMG SRC="
+#~ "\"admin_icon.gif\"> : Systeembeheerder <br><IMG SRC=\"ab_icon.gif\"> : "
+#~ "ActiveBuddy Interactieve software <br><IMG SRC=\"wireless_icon.gif\"> : "
+#~ "Draadloze gebruiker <br>"
+
 #~ msgid "Accounts"
 #~ msgstr "Accounts"
 
--- a/po/pl.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/pl.po	Sun Jan 05 23:21:50 2003 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.60\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\n"
 "PO-Revision-Date: 2002-06-30 07:59+0100\n"
 "Last-Translator: Przemysaw Suek <pbs@linux.net.pl>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -13,353 +13,525 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "Zajty"
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "Powrt"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+msgid "Auto-login"
+msgstr "Automatyczne logowanie"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "Wypisz si"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Dwiki"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "Konta"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "Preferencje"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "O Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Wyjcie"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - konfiguracja dwiku"
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "Ikona kupla"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Czat z kumplem"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Gaim Czat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr "Zamknij"
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "Pokoje czat"
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr "Odwie"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Dodaj"
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Usu"
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "Lista dostpnych czatw"
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "Lista subskrybowanych czatw"
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr "Waciwoci wskanika stosu Gnome"
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr "Odwieanie w minutach"
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr "Wprowad symbole w oknie poniej rozdzielajc je \"+\""
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr "Zaznacz to by wywietla tylko symbole i cen:"
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr "Zaznacz to by przewija od lewej do prawej"
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 msgid "(No"
 msgstr "(Nie"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 msgid "Change"
 msgstr "Zmie"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "Nie mona zapisa pliku %s."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "Niezalogowany."
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "Okno IM"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "Okno grupy czatu"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "Powiadomienie Popup"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "Powiadomienie Popup"
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "Nie mona si poczy"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "Test"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "Poka wszystkie rozmowy w jednym oknie z zakadkami"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Dostpny"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr "Dostpny tylko dla przyjaci"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr "Zajty"
-
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr "Zajty tylko dla przyjaci"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "Niewidoczny tylko dla przyjaci"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "Niedostpny"
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "Nie mona znale adresu hosta."
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "Nie mona poczy si z serwerem."
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "Nieprawidowa odpowied z serwera."
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "Bd podczas odczytu z gniazda sieciowego."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 msgid "Error while writing to socket."
 msgstr "Bd podczas zapisu do gniazda sieciowego."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 msgid "Authentication failed."
 msgstr "Autoryzacja nie powioda si."
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "Nieznany Kod Bdu."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr "Pseudonim"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Uytkownik Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "Nie mona poczy"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "Nie mona czytac gniazda"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "Nie mona si poczy"
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "Czytanie danych"
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "Zrwnowaanie (?)"
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr "Czytanie klucza serwera"
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "Wymiana sum kontrolnych kluczy"
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "Bd krytyczny w bibliotece GG\n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "Nie mona 'pingn' serwera"
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "Wylij jako wiadomo"
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr "Szukam adresu serwera GG"
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "Podano bdny Numer Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Poczenie do %s niepowiodo si"
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "Nie mona 'pingn' serwera"
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "Wylij jako wiadomo"
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr "Szukam adresu serwera GG"
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "Podano bdny Numer Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Prbujesz wysa wiadomo do bdnego Numeru Gadu-Gadu!"
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "Nie mona uzyska rezultatw przeszukiwania"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Wyszukiwarka Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Aktywny"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "tak"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "nie"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "Uin"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "Imi"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "Nazwisko"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "Pseudonim"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "Rok urodzenia"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "Pe"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Miasto"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Nie ma adnej listy kumpli na serwerze. Przykro mi!"
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Nie mona zaimportowa listy kumpli z serwera."
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Lista kumpli poprawnie przetransmitowana na serwer."
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Nie mona przetransferowa listy kumpli na serwer."
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Lista kumpli poprawnie usunita z serwera"
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Nie mona usun listy kumpli z serwera"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "Pomylna zmiana hasa."
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Nie mona byo zmieni hasa"
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "Nie mona zaimportowa listy kumpli z serwera."
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "Nie mona otworzy bezporedniego IM"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Nie mona wysa hasa"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "Przeszukiwanie Katalogu"
 
@@ -367,352 +539,483 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Zmie haso"
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "Importuj list kumpli z serwera"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "Eksportuj list kumpli na serwer"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "Usu list kumpli z serwera"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "Nie mona czytac pliku %s."
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr "Pseudonim"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Uytkownik Gadu-Gadu"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "Odrzu"
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "Wylij wiadomo poprzez serwer"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Pobierz informacj"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Uyj Gaim"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "Zamknito CHAT DCC z %s"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "Nie ma na licie"
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s zmieni temat na: %s</B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "Czytanie klucza serwera"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "Bd IRC"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "Brak nicka / kanau "
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "Bd IRC"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "Brak serwera"
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
+msgstr "Nie podano nicka"
+
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
 msgstr ""
 
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
-msgstr "Nie podano nicka"
-
-#: src/protocols/irc/irc.c:976
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 msgid ""
-"%s has requested a DCC chat.  Would you like to establish the direct "
-"connection?"
-msgstr "%s zada czatu DCC. Czy chcesz ustanowi poczenie bezporednie?"
-
-#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "Poczony"
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Nie mona zapisa"
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "Zostae wykopany z %s: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "Wykopany przez %s: %s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "Pobierz informacje o uytkowniku"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Opucie %s"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "Wyjcie z IRC"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Kana:"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Haso"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "Chat DCC"
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "Serwer:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "Nie mona wysa hasa"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "Nie mona wysa hasa"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Dostpny"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr "Rozszerzona zajto"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr "Nie przeszkadza"
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Bd Jabber"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr "Bd %s: %s"
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 msgid "Unknown Error in presence"
 msgstr "Nieznany bd w prezencji."
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Uytkownik %s chce doda Ci do swojej listy kumpli."
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "Brak uytkownika"
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Kumple"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr "Autentykowanie"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "Nieznany bd logowania."
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 msgid "Password successfully changed."
 msgstr "Zmiana hasa powioda si."
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "Poczenie utracone"
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Nie mona si poczy"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "Poczony"
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "danie metody autentykacji"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "czenie"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 msgid "Jabber Error"
 msgstr "Bd Jabber"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "Pokj:"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr "Serwer:"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "Uchwyt:"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "Nie mona si poczy"
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 msgid "Chats"
 msgstr "Czaty"
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 msgid "View Error Msg"
 msgstr "Poka komunikat bdu"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Pobierz wiadomo Zajty"
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr "Odso Od"
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr "Tymczasowo schowaj Od"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr "Usu ze spisu"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 msgid "Cancel Presence Notification"
 msgstr "Anuluj pokazywanie powiadomienia"
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "Pena nazwa"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "Nazwisko"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "Nazwisko panieskie"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Adres ulica"
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "Rozszerzony adres"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "Miejsce (lokalizacja)"
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "Kod pocztowy"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Kraj"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "Nazwa organizacji"
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "Jednostka organizacyjna"
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Tytu"
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr "Rola"
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "Data urodzenia"
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Opis"
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -720,374 +1023,582 @@
 "Wszystkie ponisze pola s opcjonalne. Wprowad jedynie te informacje, ktre "
 "uwaasz za stosowne"
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "Identyfikacja uytkownika"
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Edycja vCard Jabber"
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "Poprawa rejestracja na serwerze!"
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "Nieznany bd rejestracji"
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "Ustaw informacje o uytkowniku"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Bd skadni (prawdopodobnie bd w Gaim)"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "Niepoprawny parametr (prawdopodobnie bd w Gaim)"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 msgid "Invalid User"
 msgstr "Niepoprawny yytkownik"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr "Pomienito pen nazw domeny (FQDN)"
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr "Ju zalogowany"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 msgid "Invalid Username"
 msgstr "Niepoprawna nazwa uytkownika"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Friendly Name"
 msgstr "Niepoprawna przujazna nazwa"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr "Pena lista"
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr "Ju tu jeste"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 msgid "Not on list"
 msgstr "Nie ma na licie"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr "Uytkownik jest niedostpny"
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr "Jeste ju w trybie"
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr "Jest ju na przeciwnej licie"
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr "Bd tablicy pocze (Switchboard)"
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr "Bd (Notify Transfer)"
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr "Pominito wymagane pola"
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 msgid "Not logged in"
 msgstr "Niezalogowany."
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 msgid "Internal server error"
 msgstr "Bd wewntrzny serwera"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr "Bd serwera bazy danych"
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 msgid "File operation error"
 msgstr "Bd operacji na pliku"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 msgid "Memory allocation error"
 msgstr "Bd alokacji pamici"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 msgid "Server busy"
 msgstr "Serwer zajty"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 msgid "Server unavailable"
 msgstr "Server niedostpny"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr "Serwer obecnoci jest wyczony"
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 msgid "Database connect error"
 msgstr "Bd poczenia z baz danych"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr "Serwer koczy prac (opu okrt)"
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 msgid "Error creating connection"
 msgstr "Bd podczas tworzenia poczenia"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr "Sesja przeciona"
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr "Uytkownik jest zbyt aktywny"
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr "Zbyt wiele sesji"
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr "Nieoczekiwano."
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr "Zy plik przyjaciela"
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 msgid "Authentication failed"
 msgstr "Autoryzacja nie powioda si."
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 msgid "Not allowed when offline"
 msgstr "Niedopuszczalne gdy niedostpny"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr "Bez akceptacji nowych uytkownikw"
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr "Uytkownik niezweryfikowany"
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 msgid "Unknown Error Code"
 msgstr "Nieznany Kod Bdu."
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 #, fuzzy
 msgid "An MSN message may not have been received."
 msgstr "Wiadomo moga zosta nieodebrana."
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim nie mg wysa wiadomoci"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "Bd AOL"
+
+#: src/protocols/msn/msn.c:1143
 #, 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:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+msgid "Unable to write to server"
+msgstr "Nie mona zapisa na serwer"
+
+#: src/protocols/msn/msn.c:1300
 #, 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:1179
+#: src/protocols/msn/msn.c:1401
 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:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 msgid "Error reading from server"
 msgstr "Bd podczas odczytu z serwera"
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "Nie mona poczy si z serwerem."
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "Nie mona zapisa na serwer"
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Akcje protokou"
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "Nie mona otworzy bezporedniego IM"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "Nie mona zalogowa do AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "Nie mona wysa wiadomoci: zbyt dua"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr "danie wysania hasa"
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 msgid "Unable to send password"
 msgstr "Nie mona wysa hasa"
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 msgid "Password sent"
 msgstr "Haso wysane"
 
-#: src/protocols/msn/msn.c:1752
-msgid "Unable to write to server"
-msgstr "Nie mona zapisa na serwer"
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "Nie mona zapisa"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "Nie mona wysa wiadomoci: zbyt dua"
+
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr "Synchronizacja z serwerem"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr "Nie ma mnie przy komputerze"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr "Zaraz bd"
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 msgid "Busy"
 msgstr "Zajty"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr "Na telefonie"
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr "Na lanczu"
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+#, fuzzy
+msgid "Be right back"
+msgstr "Zaraz bd"
+
+#: src/protocols/msn/msn.c:2430
+#, fuzzy
+msgid "Away from the computer"
+msgstr "Nie ma mnie przy komputerze"
+
+#: src/protocols/msn/msn.c:2432
+#, fuzzy
+msgid "On the phone"
+msgstr "Na telefonie"
+
+#: src/protocols/msn/msn.c:2434
+#, fuzzy
+msgid "Out to lunch"
+msgstr "Na lanczu"
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr "Bezczynno: "
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr "Wyczy przyjazn nazw"
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "Wylij plik"
+
+#: src/protocols/msn/msn.c:2555
 #, fuzzy
 msgid "New MSN friendly name too long."
 msgstr "Przyjazna nazwa zbyt duga."
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 msgid "Set Friendly Name"
 msgstr "Ustaw przyjazn nazw"
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 msgid "Set Friendly Name:"
 msgstr "Ustaw przyjazn nazw:"
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr "Wyczy wszystkie przyjazne nazwy"
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr "Niepoprawna nazwa uytkownika"
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Do jakiej grupy przyczy:"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "Niepoprawny yytkownik"
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Niepoprawna nazwa"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Server niedostpny"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Usuga DIR tymczasowo niedostpna."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Zamknito bezporedni IM z %s"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Bd bezporedniej IM z %s"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "bd poczenia (rend)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "bd poczenia .. major..\n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Rozczony."
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Zostae rozczony z pokojem %s."
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Czat jest w tej chwili niedostpny"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Nie mona byo poczy si z hostem"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Haso wysano, oczekiwanie na odpowied\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "wewntrzny bd poczenia\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Nie mona zalogowa do AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Zapisz si: %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Wypisano.\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Nie mona poczy"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Ustanowiono poczenie, wysano ciasteczko"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Niepoprawny nick lub haso."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Twoje konto jest w tej chwili zawieszone."
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "Usuga tymczasowo niedostpna."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1097,46 +1608,85 @@
 "duej."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Wersja klienta, ktrej uywasz, jest zbyt stara. Uaktualnij j."
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Autoryzacja nie powioda si"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Bd wewntrzny"
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim nie mg wysa wiadomoci"
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim nie mg wysa wiadomoci"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Ustanowiono bezporedni IM z %s"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+#, fuzzy
+msgid "Transfer timed out"
+msgstr "Bd (Notify Transfer)"
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "Nie mona otworzy pliku konfiguracji %s."
+
+#: src/protocols/oscar/oscar.c:1632
+#, fuzzy
+msgid "File transfer aborted"
+msgstr "Bd (Notify Transfer)"
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr "Uytkownik %s chce doda Ci do swojej listy kumpli."
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+msgid "No reason given."
+msgstr "Nie podano powodu."
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Gaim - Odmowa autoryzacji ICQ"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1147,228 +1697,260 @@
 "uytkownikw z nastpujcego powodu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-msgid "No reason given."
-msgstr "Nie podano powodu."
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 #, fuzzy
 msgid "ICQ authorization denied."
 msgstr "Gaim - Odmowa autoryzacji ICQ"
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, 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:1587
-#, 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:1588
-#, 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:1597
+#: src/protocols/oscar/oscar.c:2141
 #, 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:1598
-#, 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:1607
-#, 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:1608
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
 #, 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:1617
-#, 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:1618
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
 #, 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:1627
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"Chcesz ich doa do swojej listy kumpli?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "Opucie %d wiadomo od %s poniewa bya ona niepoprawna."
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "Opucie %d wiadomoci od %s poniewa byy one niepoprawne."
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgstr "Opucie %d wiadomo od %s poniewa bya ona zbyt dua."
+
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
+msgstr "Opucie %d wiadomoci od %s poniewa byy one zbyt due."
+
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu 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:2275
+#, fuzzy, c-format
+msgid ""
+"You missed %hu 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:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr "Opucie %d wiadomo od %s poniewa bya ona zbyt okrutna."
+
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
+msgstr "Opucie %d wiadomo od %s poniewa bya ona zbyt okrutna."
+
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
 msgstr "Opucie %d wiadomo od %s poniewa jeste zbyt okrutny."
 
-#: src/protocols/oscar/oscar.c:1628
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr "Opucie %d wiadomoci od %s poniewa jeste zbyt okrutny."
 
-#: src/protocols/oscar/oscar.c:1636
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Opucie %d wiadomo od %s z nieznanych powodw."
 
-#: src/protocols/oscar/oscar.c:1637
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Opucie %d wiadomoci od %s z nieznanych powodw."
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2342
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
+#, fuzzy, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Stan:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1707
-#, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+#: src/protocols/oscar/oscar.c:2389
+#, fuzzy, c-format
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>Stan:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1736
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1755
-#, 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:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "Nieznany bd logowania."
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "Nie podano powodu."
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "Twoja wiadomo do %s nie zostaa wysana: %s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "Informacja uytkownika dla %s niedostpna: %s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Ikona kupla"
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Gos"
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "Obraz IM"
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Czat"
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Pobierz plik"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr "Wylij plik"
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Gry"
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Zapasy"
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Wylij list kumpli"
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "Bd EveryBuddy"
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "Uytkownik AP"
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "Icq RTF"
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "Serwer przekazujcy ICQ"
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "Nieznany ICQ"
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Szyfrowanie Trillian"
 
-#: src/protocols/oscar/oscar.c:1886
+#: src/protocols/oscar/oscar.c:2655
 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>"
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
 msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Opis:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Zwyky uytkownik AIM<br><IMG SRC=\"aol_icon.gif\"> : AOL User "
-"<br><IMG SRC=\"dt_icon.gif\"> : Testowy uytkownik AIM <br><IMG SRC="
-"\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> :  "
-"Uytkownik urzdzenia bezprzewodowego<br>"
-
-#: src/protocols/oscar/oscar.c:1914
-#, c-format
+
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "Nazwa uytkownika : <B>%s</B>  %s <BR>\n"
 "Poziom ostrzee : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>Uytkownik nie ma wiadomoci zajtoci</i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Uprawnienia klienta: "
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Brak podanych informacji</i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "Twoje poczenie moe by utracone."
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
@@ -1377,55 +1959,118 @@
 "Ostatnia wiadomo nie zostaa wysana poniewa przekroczye limit "
 "prdkoci. Zaczekaj 10 sekund i sprbuj ponownie."
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "Gaim - Odmowa autoryzacji ICQ"
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "Gaim - Zaakceptowano autoryzacj ICQ"
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "Bd podczas tworzenia poczenia"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "Konto"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "Nie mona czytac pliku %s."
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim nie mg wysa wiadomoci"
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1435,154 +2080,154 @@
 "Dopki przekraczasz limit niektrzy kolesie nie bd pokazywani jako "
 "dostpni."
 
-#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Wymiana:"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Nie mona otworzy bezporedniego IM"
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
 #, 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?"
+msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
-"Wybrae otwarcie bezporedniego poczenia IM z %s. Robic to pozwolisz im "
-"zobaczy twj adres IP i moe to by ryzykiem zabezpiecze. Czy chcesz "
-"kontynuowa?"
-
-#: src/protocols/oscar/oscar.c:3586
-#, c-format
+
+#: src/protocols/oscar/oscar.c:4621
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
-"support sending status messages.</I><BR>"
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
+#, fuzzy, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
 msgstr ""
 "<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:3593
-#, c-format
+#: src/protocols/oscar/oscar.c:4642
+#, fuzzy, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
 msgstr ""
 "<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:3618
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "Pobierz wiadomo o stanie"
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Bezporednia IM"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Pobierz uprawnienia: "
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Nie mona zapisa pliku %s."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Nie mona czytac pliku %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Wiadomo zbyt duga, ostatnie %s bajtw obcito."
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s nie jest w tej chwili zalogowany."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Ostrzeenie %s niedopuszczalne"
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Wiadomo zostaa odrzucona, przekraczasz limit prdkoci serwera."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Czat w %s jest niedostpny."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Wysyasz wiadomoci do %s zbyt szybko."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Opucie IM od %s poniewa by zbyt duy."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Opucie IM od %s poniewa by wysany zbyt szybko."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "Awaria."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "Zbyt wiele dopasowa."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "Potrzeba wicej kwalifikatorw."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "Usuga DIR tymczasowo niedostpna."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "Zastrzeone wyszukiwanie email."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Zignorowano sowo kluczowe."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "Brak kluczowych."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "Uytkownik nie ma informacji o katalogu."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "Kraj nie obsugiwany."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Nieznana awaria: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "Usuga tymczasowo niedostpna."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "Twj poziom ostrzee jest zbyt wysoki by mg si zalogowa."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1591,37 +2236,37 @@
 "ponownie. Jeli bdziesz teraz prbowa dalej, bdziesz musia zaczeka "
 "duej."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Nieznany bd rejestrowania: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Nieznany bd, %d. Info: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "Poczenie zamknite"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "Oczekiwanie na odpowied..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC powrci. Moesz wysa wiadomoci ponownie."
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "Pomylna zmiana hasa."
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -1632,76 +2277,101 @@
 "wiadomoci wysane do niego i moe ci wyrzuci jeli wysyasz wiadomo. "
 "Gaim zabezbieczy przed tym. Jest tak tylko tymczasowo, bd cierpliwy."
 
-#: src/protocols/toc/toc.c:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "Pobierz informacj o katalogu"
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "Port"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "Nie mona poczy w celu przesyu!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "Nie mona poczy w celu przesyu!"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "Nie mona poczy w celu przesyu!"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - zapisz jako..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s da %s akceptacji pliku %d : %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1963
+#: src/protocols/toc/toc.c:1980
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s da %s akceptacji plikw %d : %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s da od ciebie wysania mu pliku"
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr "Akceptuj"
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "Twoja wiadomo nie zostaa wysana."
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "Zlocate"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Klasa:"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "Przykad:"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "Odbiorca:"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "O Gaim v%s"
 
-#: src/about.c:135
+#: src/about.c:112
+#, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim jest modularnym klientem \"Instant Messaging\" mogcym uywa \n"
 "protokow takich jak AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, \n"
@@ -1710,204 +2380,151 @@
 "\n"
 "URL: "
 
-#: src/about.c:137
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
+#: src/about.c:122
+#, fuzzy
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "\n"
 "\n"
 "IRC: #gaim na irc.openprojects.net"
 
-#: src/about.c:147
-#, fuzzy
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
 msgstr ""
-"Aktywni Deweloperzy\n"
-"====================\n"
-"Rob Flynn (opiekun)    [ rob@marko.net ]\n"
-"Sean Egan (koder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Autorzy Szalonych atek\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Zmczeni Deweloperzy\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (autor oryginau)     [ markster@marko.net ]"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "Strona Web"
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr "Wypisz si"
-
-#: src/aim.c:162
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "Zamknij"
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "Wpisz swoj nazw logowania"
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Logowanie"
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "Nazwa ekranu: "
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr "Haso: "
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "Wyjcie"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr "Konta"
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr "Zapisz si"
-
-#: src/aim.c:354
-msgid "About"
-msgstr "O ..."
-
-#: src/aim.c:355
-msgid "Options"
-msgstr "Opcje"
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr "Wtyczki"
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr "Preferencje"
-
-#: src/aim.c:841 src/multi.c:1481
-msgid "Auto-login"
-msgstr "Automatyczne logowanie"
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - Zajty!"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "Jestem z powrotem!"
 
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr "Powrt"
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "Nowy komunikat Zajty"
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "Usu wiadomo Zajty"
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Ustaw wszystkie Zajty"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Grupa"
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Info"
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Pseudo"
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr "Dodaj wychwyconego kumpla"
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "Poka log"
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "Zmie nazw"
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "Od-pseudo"
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr "Nowe wychwycenie kumpla"
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "Usu wychwycenie kumpla"
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 wiadomo)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[Kliknij by edytowa]"
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Zalogowany: %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Ostrzeenia: %d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Uprawnienia: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1918,943 +2535,877 @@
 "Nazwa ekranu: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "Bezczynno: "
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s zalogowany."
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s wylogowany."
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Informacje o wybranym kumplu"
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "Wylij IM"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "Rozpocznij/przycz do czatu kumpla"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Aktywuj wiadomo Zajty"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - lista kumpli"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Plik"
 
-#: src/buddy.c:2667
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr "Dodaj kumpla"
 
-#: src/buddy.c:2669
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr "Przycz do czatu"
 
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr "Nowa IM"
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "Nowy komunikat Zajty"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr "Pobierz informacje o uytkowniku"
 
-#: src/buddy.c:2678
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "Importuj list kumpli"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "Ukryty"
+
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "Narzdzia"
 
-#: src/buddy.c:2706
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr "Wychwy kumpla"
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "Konta"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Preferencje"
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Akcje protokou"
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "Prywatno"
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "Poka log systemowy"
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr "Wczytaj skrypt"
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "Wyaduj wszystkie skrypty"
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr "Lista skryptw"
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 msgid "Online Help"
 msgstr "Pomoc on-line"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 msgid "Debug Window"
 msgstr "Okno odpluskwiania"
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "O Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "Lista kumpli"
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "Dodaj nowego kumpla"
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "Dodaj now grup"
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "Usu wybranego kumpla/grup"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Edytuj kumpli"
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - lista kumpli"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Przycz do czatu"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Przycz do czatu jako:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Przycz"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Wywoaj"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Kole"
 
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Wiadomo"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - zawoaj kumpla do pokoju czat"
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Od-ignoruj"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Ignoruj"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s w pokoju"
 
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s wszed do pokoju."
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s wszed do pokoju."
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s znany jest jako %s"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s wyszed z pokoju (%s)."
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s wyszed z pokoju"
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - grupy czatw"
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Temat:"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "Nie ma ludzi w pokoju"
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr "Szept"
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Wylij "
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
-msgid "Block"
-msgstr "Blokuj"
-
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "Ostrze"
 
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - zapisz rozmow"
-
-#: src/conversation.c:492
+#: src/buddy_chat.c:1592 src/conversation.c:2925
+msgid "Block"
+msgstr "Blokuj"
+
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Wstaw obraz"
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "Nie mona wysa wiadomoci: zbyt dua"
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "Nie mona wysa wiadomoci: zbyt dua"
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr "W tej chwili przy %d, "
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "Ustawianie pozycji na %d\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr "Tekst pogrubiony"
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr "Pogrubienie"
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr "Tekst pochylony"
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr "Pochylenie"
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr "Tekst podkrelony"
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr "Podkrelenie"
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr "Tekst przekrelony"
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr "Przekrelenie"
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "Zmiejsz wielko czcionki"
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr "Maa"
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "Normalna wielko czcionki"
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr "Normalna"
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr "Zwiksz wielko czcionki"
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr "Dua"
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "Wybierz czcionk"
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr "Czcionka"
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "Kolor tekstu"
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr "Kolor"
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr "Kolor ta"
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "Zapisz rozmow"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "Wstaw odnonik"
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr "Odnonik"
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr "Wstaw umiechnit twarz"
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "Umiech"
-
-#: src/conversation.c:2272
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "Wstaw obraz IM"
 
-#: src/conversation.c:2272
-msgid "Image"
-msgstr "Obraz"
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "Zamknij"
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "Opcje"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "Zacz logowanie"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr "Logowanie"
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr "Zapisz rozmow"
-
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr "Zapisz"
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "Zacz dwiki"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
 msgstr ""
 
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr "Dwik"
-
-#: src/conversation.c:2782
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - rozmowy"
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Wylij wiadomo jako: "
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - zapisz ikon"
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Wycz animacj"
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Zacz animacj"
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Ukryj ikon"
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Zapisz ikon jako..."
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "Gaim - ostrzec uytkownika?"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "Czy naprawd chcesz ostrzec uytkownika %s?"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "Ostrzec anonimowo?"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "Anonimowe ostrzeenia s mniej przykre."
 
-#: src/dialogs.c:471
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Usuwanie '%s' z listy kumpli.\n"
 
-#: src/dialogs.c:496
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - Usun %s?"
-
-#: src/dialogs.c:509
-msgid "Remove Buddy"
-msgstr "Usu kumpla"
-
-#: src/dialogs.c:519
-#, c-format
-msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
-"Zamierzasz usun '%s' ze swojej\n"
-"listy kumpli. Kontynuowa ? "
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr "Akceptuj"
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "Ok"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - Uytkownik IM"
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr "kto IM:"
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "Uytkownik:"
-
-#: src/dialogs.c:816
-msgid "Account:"
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "Nazwa ekranu:"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
 msgstr "Konto:"
 
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "Gaim - Pobierz informacje o uytkowniku"
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr "Dodaj grup"
-
-#: src/dialogs.c:1004
+#: src/dialogs.c:804
+msgid ""
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - Dodaj grup"
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupa"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Dodaj kumpla"
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr "Dodaj kumpla"
-
-#: src/dialogs.c:1110
-msgid "Contact"
-msgstr "Kontakt"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Nazwa ekranu: "
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Dodaj do"
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Zajty!"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
-#: src/dialogs.c:1451
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Ustaw prywatno dla:"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Pozwl wszystkim uytkownikom na kontakt ze mn"
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "Pozwl tylko uytkownikom poniej"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "Pozwl tylko uytkownikom poniej"
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr "Lista zezwole"
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Zabro wszystkim uytkownikom"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Blokuj uytkownikw poniej"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "Lista blokowa"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Wprowad kumpla do wywoania."
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nowe wywoanie kumpla"
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Wychwy Kto"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Konto"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "Wychwy Kiedy"
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Wywoaj przy zapisywaniu si"
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Wywoaj przy powrocie z Zajty"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Wywoaj przy powrocie z bezczynnoci"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "Dwik gdy kole napisze do Ciebie"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Akcje protokou"
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "Otwrz okno IM"
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Powiadomienie Popup"
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Wylij wiadomo"
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Wykonaj polecenie przy wywoaniu"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Odtwrz dwik przy wywoaniu"
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Zapisz to wywoanie po aktywacji"
 
-#: src/dialogs.c:1971
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr "Zapisz"
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "Anuluj"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - ustaw informacje katalogowe"
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Informacja katalogowa"
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dopuszczaj przeszukiwania Web w celu znalezienia twojego info"
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Imi"
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Drugie imi"
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Nazwisko"
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Nazwisko panieskie"
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Stan"
 
-#: src/dialogs.c:2126
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr "Zapisz"
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Nowe hasa nie s zgodne"
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Wypenij cakowicie wszystkie pola"
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Zmiana hasa"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Haso oryginalne"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Nowe haso"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Nowe haso (ponownie)"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "Ok"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - ustaw informacj uytkownika"
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Poniej s wyniki twojego wyszukiwania: "
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Akceptuj"
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr "Odrzu"
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - dodaj akceptacj"
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - dodaj odrzucenie"
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - loguj rozmow"
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Szukaj kumpla"
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - znajd kumpla wg informacji"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - znajd kumpla wg adresu email"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "Wstaw odnonik"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Dodaj URL"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Wybierz kolor tekstu"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Wybierz kolor ta"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "Wybierz czcionk"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - importuj list kumpli"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "Nie moesz stworzy wiadomoci Zajty bez tytuu"
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "Nie moesz stworzy pustej wiadomoci Zajty"
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - nowa wiadomo zajty"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Nowa wiadomo zajty"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Tytu Zajty: "
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "Zapisz i uyj"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Uyj"
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "Zapisz i uyj"
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Umiech!"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr "Pseudo kumpla"
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - pseudo kumpla"
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "Nie mona byo poczy si z hostem"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - zapisz plik logu"
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "Nie mona otworzy pliku konfiguracji %s."
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Naprawd wyczyci log?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "Okej"
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Rozmowa"
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Wyczy"
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - zmie nazw grupy"
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr "Zmie nazw grupy"
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
-msgid "New name:"
-msgstr "Nowa nazwa:"
-
-#: src/dialogs.c:4484
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - zmie nazw kumpla"
 
-#: src/dialogs.c:4494
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Zmie nazw kumpla"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "Nowa nazwa:"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - wybierz skrypt Perl"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nie mona otworzy pliku konfiguracji %s."
 
-#: src/html.c:183
+#: src/html.c:185
 #, c-format
 msgid "Received: '%s'\n"
 msgstr "Odebrano: '%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Bd otwierania poczenia.\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim nie mg wysa wiadomoci"
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "Nazwa ekranu:"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "Protok:"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - wczytaj ikon uytkownika"
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "Ikona kolegi"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Przegldaj"
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "Zeruj"
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "Opcje czcionki"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "Nazwa ekranu:"
 
-#: src/multi.c:559
+#: src/multi.c:653
 msgid "Alias:"
 msgstr "Pseudo:"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Protok:"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "Pamitaj haso"
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Automatyczne logowanie"
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "Powiadomienie o nowej poczcie"
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "Opcje proxy"
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "Powiadomienie o nowej poczcie"
+
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Opcje"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "Rejestracja na serwerze"
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - modyfikuj konto"
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "Wprowad haso"
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Haso"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "Zapisz si"
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "Akcje protokou"
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2862,40 +3413,45 @@
 "Nie moesz zalogowa si na to konto; nie masz zaadowanego odpowiedniego "
 "protokou lub nie ma on funkcji logowania."
 
-#: src/multi.c:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Jeste pewien, e chcesz usun %s?"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "Usu"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - edytor kont"
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr "Wybierz wszystkie"
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr "Wybierz automaty"
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "Wybierz aden"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "Modyfikuj"
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "Zapisz / wypisz si"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr "Usu"
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "Brak"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Zapisz si: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - edytor kont"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "Anuluj"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -2904,20 +3460,20 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nie mg si zalogowa"
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "Bd zapisywania si"
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 msgid "Notice"
 msgstr "Uwaga"
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s nie mg si zalogowa"
@@ -2926,515 +3482,537 @@
 # #, c-format
 # msgid "%s has been signed off"
 # msgstr "%s wylogowa si: %s"
-#: src/multi.c:1430
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr "Bd poczenia"
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim - lista wtyczek"
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - wtyczki"
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-msgid "Loaded Plugins"
-msgstr "Wczytane wtyczki"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr "Wybierz wszystkie"
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr "cieka do plikw:"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr "Wczytaj"
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "Wczytaj wtyczk z pliku"
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr "Konfiguruj"
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "Konfiguruj ustawienia wybranej wtyczki"
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr "Wczytaj ponownie"
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "Wczytaj ponownie wybran wtyczk"
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr "Wyaduj"
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "Wyaduj wybran wtyczk"
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "Zamknij to okno"
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr "Opcje oglne"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "Poka okno odpluskwiania"
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "Uywaj przyciskw bez obrysu"
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "Stan"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr "Pogrubienie"
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr "Pochylenie"
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr "Podkrelenie"
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr "Tekst przekrelony"
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr "Anuluj"
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "Uytkownik jest zbyt aktywny"
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "Uytkownik jest zbyt aktywny"
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr "Kolor"
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "Kolor tekstu"
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "Kolor ta"
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr "Ekrany kumpli"
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "Poka graficzne twarzyczki ;-)"
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "Poka znaczniki czasu wiadomoci"
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "Poka URLe jako linki"
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "Podwietlaj le napisane sowa"
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "Ignoruj kolory"
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "Ignoruj krj czcionki"
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "Ignoruj wielkoci czcionki"
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "Ignoruj automatyzowane wiadomoci TIK"
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "Enter wysya wiadomo"
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "Control-Enter wysya wiadomo"
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "Okno IM"
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "Escape zamyka okno"
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "Control-W zamyka okno"
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Control-[B/I/U/S] wstawia tagi HTML"
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "Control-(liczba) wstawia twarzyczki :-)"
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr "D"
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "Ukryj przyciski IM/Info/Czat"
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "Poka obrazki na przyciskach"
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "Okno listy kumpli"
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "Zapisz wielko/pozycj okna"
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "Powiksz okno przy zdarzeniach"
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr "Ekrany grup"
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "Ukryj grupy bez dostpnych kumpli"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "Poka liczby w grupach"
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr "Ekrany kumpli"
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 #, fuzzy
 msgid "Show buddy type _icons"
 msgstr "Poka ikony typu kumpli"
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "Poka poziomy ostrzee"
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "Poka czasy bezczynnoci"
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 #, fuzzy
 msgid "Grey i_dle buddies"
 msgstr "Bezczynni kumple w szarym kolorze"
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "Okno IM"
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "Poka przyciski jako: "
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "Obrazki"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "Tekst"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "Obrazki i tekst"
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "Szeroko nowego okna:"
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "Wysoko nowego okna:"
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "Wprowad wysoko widgetu"
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "Powiksz okno przy zdarzeniach"
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "Ukryj okno przy wysyaniu"
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "Ikony kumpla"
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "Ukryj ikony kumpla"
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "Wycz animacj ikon kumpli"
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "Poka logowania w oknie"
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr "Powiadomienie Popup"
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "Wychwy kumpli, do ktrych piszesz"
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "Uzupenianie tab"
 
-#: src/prefs.c:505
-#, fuzzy
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "Uzupenianie nickw tabulatorem"
 
-#: src/prefs.c:506
-#, fuzzy
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "Uzupenianie tab w starym stylu"
 
-#: src/prefs.c:509
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr "Poka ludzi przyczajcych si/wychodzcych w oknie"
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Ustawienie zakadek"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr "Gra"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "D"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr "Lewo"
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "Prawo"
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 #, fuzzy
 msgid "Show a_liases in tabs/titles"
 msgstr "Pokazuj aliasy w zakadkach/tytuach/wskaniku"
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr "Czaty"
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr "Lista kumpli"
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "Typ proxy"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Typ proxy"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Bez proxy"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Serwer proxy"
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr "Serwer"
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr "Uytkownik"
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr "Haso"
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "Przegldarka"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr "Rcznie"
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr "Opcje proxy"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "Domylnie otwieraj nowe okno"
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr "Wiadomoci"
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr "Nowa IM"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "Loguj wszystkie rozmowy"
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr "Wycignij HTML z logw"
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "Poka log systemowy"
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "Loguj gdy kumple zapisuj/wypisuj si"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Loguj gdy kumple staj si bezczynni/od-bezczynni"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "Loguj gdy kumple staj si zajci/wracaj"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Loguj swoje wasne zapisywania/bezczynnoci/zajtoci"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Oddzielne pliki logw dla kadego zapisania si kumpla"
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "Opcje dwiku"
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "Bez dwikw gdy si logujesz"
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "Dwiki podczas zajtoci"
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr "Sposb odgrywania"
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "Sposb odgrywania"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "Bd wewntrzny"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3443,158 +4021,225 @@
 "Polecenie odegrania plikw\n"
 "(%s dla nazwy pliku)"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "Wysanie wiadomoci usuwa stan Zajty"
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "Kolejkuj nowe wiadomoci gdy zajty"
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "Ignoruj nowe rozmowy gdy zajty"
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "Nie wysyaj automatycznej odpowiedzi"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "Nie wysyaj automatycznej odpowiedzi"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "Wysyaj automatyczn odpowied tylko gdy bezczynny"
 
-#: src/prefs.c:828
-#, fuzzy
-msgid "Idle"
-msgstr "Bezczynno: "
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "Nie wysyaj automatycznej odpowiedzi"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr "Brak"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Uyj Gaim"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "Uyj X"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "Okno IM"
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr "Zajty"
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "Wiadomoci Zajty"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - konfiguracja dwiku"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "Wybierz..."
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr "Edycja"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 #, fuzzy
 msgid "Interface"
 msgstr "Przykad:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr "Czcionka"
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr "Wiadomo wysana"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "Okno IM"
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "Okno grupy czatu"
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "Przegldarka"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "Logowanie"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr "Dwiki"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr "Zdarzenia"
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Tytu Zajty: "
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "Wiadomoci Zajty"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - preferencje"
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Gaim okno wyjcia odplukswiania"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "Okno odpluskwiania"
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
 msgstr ""
 
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"not the same version I cannot safely tell you which one it was. Needless to "
-"say, it was not successfully loaded."
-msgstr ""
-"Prbowae wczyta protok, ktry nie zosta skompilowany t sam wersj "
-"rda co aplikacja. Niesczliwie si skada, poniewa nie jest to ta sama "
-"wersja i nie mog powiedzie Ci, ktra to bya. Co by nie gada, protok "
-"nie zosta zaadowany."
-
-#: src/prpl.c:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3602,33 +4247,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s uywa %s, ktry usunito. %s jest teraz niedostpny."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "Akcpetujesz?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "Gaim - prompt"
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nowa poczta"
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "Otwrz poczt"
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s wykona %s swojego kumpla%s%s%s"
 
-#: src/prpl.c:590
+#: src/prpl.c:634
 msgid ""
 "\n"
 "\n"
@@ -3638,7 +4278,7 @@
 "\n"
 "Chcesz ich doa do swojej listy kumpli?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3646,83 +4286,398 @@
 "Nie masz w tej chwili adnych dostpnych protokow, ktrymi mgby "
 "zarejestrowa nowe konta."
 
-#: src/prpl.c:670
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr "Gaim - Rejestracja"
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr "Informacje rejestracji"
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Wpisz swoje haso"
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d wiadomoci)"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 wiadomo)"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr "Tak"
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr "Nie"
 
-#: src/server.c:1101
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Wicej informacji"
 
-#: src/sound.c:63
+#: src/sound.c:68
 msgid "Buddy logs in"
 msgstr "Kumpel loguje si"
 
-#: src/sound.c:64
+#: src/sound.c:69
 msgid "Buddy logs out"
 msgstr "Kumpel wylogowuje si"
 
-#: src/sound.c:65
+#: src/sound.c:70
 msgid "Message received"
 msgstr "Odebrano wiadomo"
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr "Odebrana wiadomo rozpoczyna rozmow"
 
-#: src/sound.c:67
+#: src/sound.c:72
 msgid "Message sent"
 msgstr "Wiadomo wysana"
 
-#: src/sound.c:68
+#: src/sound.c:73
 msgid "Person enters chat"
 msgstr "Osoba wchodzi na czat"
 
-#: src/sound.c:69
+#: src/sound.c:74
 msgid "Person leaves chat"
 msgstr "Osoba opuszcza czat"
 
-#: src/sound.c:70
+#: src/sound.c:75
 msgid "You talk in chat"
 msgstr "Miwsz na czacie"
 
-#: src/sound.c:71
+#: src/sound.c:76
 msgid "Others talk in chat"
 msgstr "Inni mwi na czacie"
 
-#: src/sound.c:74
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr "Kto wymawia Twoje imi na czacie"
 
+#~ msgid ""
+#~ "%s has requested a DCC chat.  Would you like to establish the direct "
+#~ "connection?"
+#~ msgstr "%s zada czatu DCC. Czy chcesz ustanowi poczenie bezporednie?"
+
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "Opucie %d wiadomoci od %s poniewa byy one zbyt okrutne."
+
+#~ 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 ""
+#~ "<br><BODY BGCOLOR=WHITE><hr><I>Opis:</I><br><br><IMG SRC=\"free_icon.gif"
+#~ "\"> : Zwyky uytkownik AIM<br><IMG SRC=\"aol_icon.gif\"> : AOL User "
+#~ "<br><IMG SRC=\"dt_icon.gif\"> : Testowy uytkownik AIM <br><IMG SRC="
+#~ "\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
+#~ "ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> :  "
+#~ "Uytkownik urzdzenia bezprzewodowego<br>"
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Gaim - Zaakceptowano autoryzacj ICQ"
+
+#~ 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 ""
+#~ "Wybrae otwarcie bezporedniego poczenia IM z %s. Robic to pozwolisz "
+#~ "im zobaczy twj adres IP i moe to by ryzykiem zabezpiecze. Czy chcesz "
+#~ "kontynuowa?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Active Developers\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Crazy Patch Writers\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Retired Developers\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+#~ msgstr ""
+#~ "Aktywni Deweloperzy\n"
+#~ "====================\n"
+#~ "Rob Flynn (opiekun)    [ rob@marko.net ]\n"
+#~ "Sean Egan (koder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Autorzy Szalonych atek\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Zmczeni Deweloperzy\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (autor oryginau)     [ markster@marko.net ]"
+
+#~ msgid "Web Site"
+#~ msgstr "Strona Web"
+
+#~ msgid "Password: "
+#~ msgstr "Haso: "
+
+#~ msgid "About"
+#~ msgstr "O ..."
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr "Wczytaj skrypt"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "Wyaduj wszystkie skrypty"
+
+#~ msgid "List Scripts"
+#~ msgstr "Lista skryptw"
+
+#~ msgid "Whisper"
+#~ msgstr "Szept"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - zapisz rozmow"
+
+#~ msgid "Currently at %d, "
+#~ msgstr "W tej chwili przy %d, "
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "Ustawianie pozycji na %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr "Tekst pogrubiony"
+
+#~ msgid "Bold"
+#~ msgstr "Pogrubienie"
+
+#~ msgid "Italics Text"
+#~ msgstr "Tekst pochylony"
+
+#~ msgid "Italics"
+#~ msgstr "Pochylenie"
+
+#~ msgid "Underline Text"
+#~ msgstr "Tekst podkrelony"
+
+#~ msgid "Underline"
+#~ msgstr "Podkrelenie"
+
+#~ msgid "Strike through Text"
+#~ msgstr "Tekst przekrelony"
+
+#~ msgid "Strike"
+#~ msgstr "Przekrelenie"
+
+#~ msgid "Decrease font size"
+#~ msgstr "Zmiejsz wielko czcionki"
+
+#~ msgid "Small"
+#~ msgstr "Maa"
+
+#~ msgid "Normal font size"
+#~ msgstr "Normalna wielko czcionki"
+
+#~ msgid "Normal"
+#~ msgstr "Normalna"
+
+#~ msgid "Increase font size"
+#~ msgstr "Zwiksz wielko czcionki"
+
+#~ msgid "Big"
+#~ msgstr "Dua"
+
+#~ msgid "Font"
+#~ msgstr "Czcionka"
+
+#~ msgid "Text Color"
+#~ msgstr "Kolor tekstu"
+
+#~ msgid "Background Color"
+#~ msgstr "Kolor ta"
+
+#~ msgid "Link"
+#~ msgstr "Odnonik"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "Wstaw umiechnit twarz"
+
+#~ msgid "Smiley"
+#~ msgstr "Umiech"
+
+#~ msgid "Image"
+#~ msgstr "Obraz"
+
+#~ msgid "Sound"
+#~ msgstr "Dwik"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - ostrzec uytkownika?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "Czy naprawd chcesz ostrzec uytkownika %s?"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - Usun %s?"
+
+#~ msgid "Remove Buddy"
+#~ msgstr "Usu kumpla"
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "Zamierzasz usun '%s' ze swojej\n"
+#~ "listy kumpli. Kontynuowa ? "
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - Uytkownik IM"
+
+#~ msgid "IM who:"
+#~ msgstr "kto IM:"
+
+#~ msgid "User:"
+#~ msgstr "Uytkownik:"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim - Pobierz informacje o uytkowniku"
+
+#~ msgid "Add Group"
+#~ msgstr "Dodaj grup"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Dodaj kumpla"
+
+#~ msgid "Contact"
+#~ msgstr "Kontakt"
+
+#~ msgid "Allow List"
+#~ msgstr "Lista zezwole"
+
+#~ msgid "Block List"
+#~ msgstr "Lista blokowa"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "Pseudo kumpla"
+
+#~ msgid "Rename Group"
+#~ msgstr "Zmie nazw grupy"
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim nie mg wysa wiadomoci"
+
+#~ msgid "Select All"
+#~ msgstr "Wybierz wszystkie"
+
+#~ msgid "Select Autos"
+#~ msgstr "Wybierz automaty"
+
+#~ msgid "Select None"
+#~ msgstr "Wybierz aden"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "Zapisz / wypisz si"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim - lista wtyczek"
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - wtyczki"
+
+#~ msgid "Loaded Plugins"
+#~ msgstr "Wczytane wtyczki"
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr "Wybierz wszystkie"
+
+#~ msgid "Filepath:"
+#~ msgstr "cieka do plikw:"
+
+#~ msgid "Load"
+#~ msgstr "Wczytaj"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "Wczytaj wtyczk z pliku"
+
+#~ msgid "Configure"
+#~ msgstr "Konfiguruj"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "Konfiguruj ustawienia wybranej wtyczki"
+
+#~ msgid "Reload"
+#~ msgstr "Wczytaj ponownie"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "Wczytaj ponownie wybran wtyczk"
+
+#~ msgid "Unload"
+#~ msgstr "Wyaduj"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "Wyaduj wybran wtyczk"
+
+#~ msgid "Close this window"
+#~ msgstr "Zamknij to okno"
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "Uywaj przyciskw bez obrysu"
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "Ignoruj automatyzowane wiadomoci TIK"
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "Powiksz okno przy zdarzeniach"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Gaim okno wyjcia odplukswiania"
+
+#~ 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 ""
+#~ "Prbowae wczyta protok, ktry nie zosta skompilowany t sam wersj "
+#~ "rda co aplikacja. Niesczliwie si skada, poniewa nie jest to ta "
+#~ "sama wersja i nie mog powiedzie Ci, ktra to bya. Co by nie gada, "
+#~ "protok nie zosta zaadowany."
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s uywa %s, ktry usunito. %s jest teraz niedostpny."
+
+#~ msgid "Accept?"
+#~ msgstr "Akcpetujesz?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "gadu-Gadu: Bd"
 
@@ -3747,18 +4702,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "Bd zmiany hasa (%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "Brak nicka / kanau "
-
-#~ msgid "IRC Error"
-#~ msgstr "Bd IRC"
-
-#~ msgid "No such server"
-#~ msgstr "Brak serwera"
-
-#~ msgid "IRC Part"
-#~ msgstr "Wyjcie z IRC"
-
 #~ msgid "Incorrect current password! Password NOT Changed!"
 #~ msgstr "Niepoprawne obezne haso! Haso NIE zmienione!"
 
@@ -3777,9 +4720,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "Bad MSN"
 
-#~ msgid "Invalid name"
-#~ msgstr "Niepoprawna nazwa"
-
 #~ msgid "Chat Error!"
 #~ msgstr "Bd Czat!"
 
@@ -3795,9 +4735,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "Powd nieznany"
 
-#~ msgid "AOL error"
-#~ msgstr "Bd AOL"
-
 #~ msgid "Error"
 #~ msgstr "Bd"
 
@@ -3898,15 +4835,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "Raportuj czasy bezczynnoci"
 
-#~ msgid "None"
-#~ msgstr "Brak"
-
-#~ msgid "Gaim Use"
-#~ msgstr "Uyj Gaim"
-
-#~ msgid "X Use"
-#~ msgstr "Uyj X"
-
 #~ msgid "Opera"
 #~ msgstr "Opera"
 
@@ -3929,9 +4857,6 @@
 #~ "Nie wszystkie protokoy mog uywa proxy. Przeczytaj plik README by "
 #~ "dowiedzie si szczegw"
 
-#~ msgid "No Proxy"
-#~ msgstr "Bez proxy"
-
 #~ msgid "SOCKS 4"
 #~ msgstr "Socks 4"
 
@@ -3944,12 +4869,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Opcje listy kumpli"
 
-#~ msgid "Tab Placement:"
-#~ msgstr "Ustawienie zakadek"
-
-#~ msgid "Top"
-#~ msgstr "Gra"
-
 #~ msgid "Raise Buddy List on Signons and Signoffs"
 #~ msgstr "Poka list kumpli przy logowaniach i wylogowaniach"
 
@@ -3968,42 +4887,18 @@
 #~ msgid "IM Options"
 #~ msgstr "Opcje IM"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "Poka przyciski jako: "
-
-#~ msgid "Pictures And Text"
-#~ msgstr "Obrazki i tekst"
-
-#~ msgid "Pictures"
-#~ msgstr "Obrazki"
-
-#~ msgid "Text"
-#~ msgstr "Tekst"
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "Poka wszystkie rozmowy w jednym oknie z zakadkami"
-
 #~ msgid "Window Sizes"
 #~ msgstr "Wielkoci okna"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Ustawienie zakadek"
 
-#~ msgid "Left"
-#~ msgstr "Lewo"
-
-#~ msgid "Right"
-#~ msgstr "Prawo"
-
 #~ msgid "Chat Options"
 #~ msgstr "Opcje czatu"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Poka wszystkie rozmowy w jednym oknie z zakadkami"
 
-#~ msgid "Font Options"
-#~ msgstr "Opcje czcionki"
-
 #~ msgid "Italic Text"
 #~ msgstr "Pochylony tekst"
 
@@ -4040,12 +4935,6 @@
 #~ msgid "KFM"
 #~ msgstr "KFM"
 
-#~ msgid "Enable sounds"
-#~ msgstr "Zacz dwiki"
-
-#~ msgid "Manual"
-#~ msgstr "Rcznie"
-
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "Dwik gdy kole si loguje"
 
--- a/po/ro.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/ro.po	Sun Jan 05 23:21:50 2003 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim-0.60cvs\n"
-"POT-Creation-Date: 2002-09-01 20:50+0300\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\n"
 "PO-Revision-Date: 2002-09-01 23:49+0300\n"
 "Last-Translator: Miu Moldovan <dumol@go.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -13,295 +13,468 @@
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:271
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "Absen"
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "Revenire"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+msgid "Auto-login"
+msgstr "Autentificare automat"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "Deautentificare"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Sunete"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "Conturi"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "Preferine"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "Despre Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Ieire"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - Configurare sunet"
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "Iconi"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Chat cu un contact"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:406
-#: plugins/chatlist.c:408
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Chat Gaim"
 
-#: plugins/chatlist.c:338 src/about.c:155 src/buddy_chat.c:1351
-#: src/buddy_chat.c:1448 src/buddy_chat.c:1478 src/conversation.c:2911
-#: src/dialogs.c:1527 src/dialogs.c:4244 src/multi.c:1065 src/plugins.c:317
-#: src/prpl.c:447 src/prpl.c:693 src/server.c:1089
-msgid "Close"
-msgstr "nchide"
-
-#: plugins/chatlist.c:343
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "Camere de chat"
 
-#: plugins/chatlist.c:362
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr "Reactualizare"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:363 src/buddy.c:482 src/buddy.c:2813
-#: src/buddy_chat.c:915 src/buddy_chat.c:1483 src/conversation.c:2449
-#: src/conversation.c:2926 src/dialogs.c:960 src/dialogs.c:1140
-#: src/dialogs.c:1478 src/dialogs.c:1512 src/dialogs.c:2502 src/multi.c:1049
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Adaug"
 
-#: plugins/chatlist.c:364 src/buddy.c:484 src/buddy.c:2815
-#: src/buddy_chat.c:913 src/buddy_chat.c:1485 src/conversation.c:2435
-#: src/conversation.c:2923 src/dialogs.c:1482 src/dialogs.c:1516
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "terge"
 
-#: plugins/chatlist.c:387
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "Lista chaturilor existente"
 
-#: plugins/chatlist.c:397
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "Lista chaturilor subscrise"
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr "Proprietile indicatorului de aciuni Gnome"
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr "Frecvena reactualizrii n minute"
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr "Introducei simbolurile delimitate prin \"+\" n csua de mai jos."
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr "Bifai aceast csu pentru a afia doar simboluri i preuri:"
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr "Bifai aceast csu pentru glisare de la stnga la dreapta:"
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 msgid "(No"
 msgstr "(Nu"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 msgid "Change"
 msgstr "Schimb"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1925
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "Nu pot scrie fiierul %s."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "Neautentificat"
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "Fereastr mesaje"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "Fereastr chat"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "Fereastr de notificare"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "Fereastr de notificare"
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+#, fuzzy
+msgid "Appl_y"
+msgstr "Aplic"
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "Nu m pot conecta"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "Test"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+msgid "Shows recently logged conversations in new conversations "
+msgstr ""
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Disponibil"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr "Disponibil doar pentru prieteni"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:487
-#: src/buddy.c:2574 src/buddy.c:2712 src/prefs.c:790
-msgid "Away"
-msgstr "Absen"
-
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr "Absent doar pentru prieteni"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 msgid "Invisible"
 msgstr "Invizibil"
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "Invizibil doar pentru prieteni"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "Nedisponibil"
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "Nu pot gsi adresa serverului."
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "Nu m pot conecta la server."
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "Rspuns invalid de la server."
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "Eroare la citirea n socket."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 msgid "Error while writing to socket."
 msgstr "Eroare la scrierea n socket."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 msgid "Authentication failed."
 msgstr "Autentificare euat."
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "Cod necunoscut de eroare."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2056
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr "Pseudonim:"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Utilizator Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "Nu m pot conecta"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "Nu pot citi socket-ul"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "Nu m pot conecta."
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "Citesc date"
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "Echilibrare sincronizare"
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr "Primesc cheia serverului"
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "Schimb key hash"
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "Eroare critiv n extensia GG\n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "Serverul nu rspunde la ping"
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "Trimite ca mesaj"
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr "Caut serverul GG"
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "Ai specificat un UIN Gadu-Gadu invalid"
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Conectarea la %s a euat"
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "Serverul nu rspunde la ping"
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "Trimite ca mesaj"
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr "Caut serverul GG"
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "Ai specificat un UIN Gadu-Gadu invalid"
+
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Ai ncercat s trimitei un mesaj ctre un UIN Gadu-Gadu invalid."
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "Nu am putut obine rezultatele cutrii"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Motorul de cutare Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Activ"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "da"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "nu"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "Prenume"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "Nume"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "Pseudonim"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "Anul naterii"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "Sex"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2034 src/dialogs.c:2738
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Ora"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Nu exist nici o list de contacte pe serverul Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Nu am putut importa lista de contacte de pe server"
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Lista de contacte a fost transferat cu succes pe serverul Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Nu am putut transfera lista de contacte pe serverul Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Lista de contacte a fost tears de pe serverul Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Nu am putut terge lista de contacte de pe serverul Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "Parola a fost schimbat cu succes"
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Parola nu a putut fi schimbat"
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Eroare n conexiunea la serverul Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -309,37 +482,38 @@
 "Gaim nu a putut da curs cererii dumneavoastr datorit unei probleme n "
 "conexiunea la serverul Gadu-Gadu. V rugm s ncercai mai trziu."
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Nu pot importa lista de contacte Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
-"Gaim nu s-a putut conecta la serverul Gadu-Gadu cu listele de contact."
-"V rugm ncercai din nou mai trziu."
-
-#: src/protocols/gg/gg.c:1038
+"Gaim nu s-a putut conecta la serverul Gadu-Gadu cu listele de contact.V "
+"rugm ncercai din nou mai trziu."
+
+#: src/protocols/gg/gg.c:1048
 msgid "Couldn't export buddy list"
 msgstr "Nu am putut exporta lista de contacte"
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
-"Gaim nu s-a putut conecta la serverul cu lista de contacte. ncercai mai trziu."
-
-#: src/protocols/gg/gg.c:1060
+"Gaim nu s-a putut conecta la serverul cu lista de contacte. ncercai mai "
+"trziu."
+
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Nu pot terge lista de contacte Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 msgid "Unable to access directory"
 msgstr "Nu pot accesa directorul"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -347,11 +521,11 @@
 "Gaim nu a putut cuta n director deoarece nu s-a putut conecta la server. "
 "V rugm ncercai din nou mai trziu."
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Nu pot schimba parola Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -359,7 +533,7 @@
 "Gaim nu a putut schimba parola datorit unei erori de conectare la serverul "
 "Gadu-Gadu. V rugm ncercai din nou mai trziu."
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "Cutare n director"
 
@@ -367,29 +541,28 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3962 src/protocols/jabber/jabber.c:3975
-#: src/dialogs.c:2150
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Schimb parola"
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "Import lista de contacte de pe server"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "Export lista de contacte ctre server"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "terge lista de contacte de pe server"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 msgid "Unable to access user profile."
 msgstr "Nu pot accesa profilul utilizatorului."
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -397,322 +570,454 @@
 "Gaim nu a putut accesa profilul acestui utilizatori datorit unei erori la "
 "conectarea la serverul directorului. V rugm ncercai din nou mai trziu."
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr "Pseudonim:"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Utilizator Gadu-Gadu"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Eroare la conexiunea la serverul ICQ."
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "Renun"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "Refuz"
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "Trimite mesajele prin server"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1961
-#: src/protocols/jabber/jabber.c:3045 src/protocols/jabber/jabber.c:3078
-#: src/protocols/oscar/oscar.c:3687 src/protocols/oscar/oscar.c:3733
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Detalii"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1893
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Gaim - Utilizator IM"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "Chatul DCC cu %s s-a terminat"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1222
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "Nu este n list"
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s a schimbat topicul n: %s</B>"
 
-#: src/protocols/irc/irc.c:894
-msgid "There is no such nick or channel on this IRC channel."
-msgstr "Nu exist un asemenea pseudonim sau canal pe acest server IRC."
-
-#: src/protocols/irc/irc.c:897
-msgid "There is no such IRC Server"
-msgstr "Nu exist un asemenea server IRC"
-
-#: src/protocols/irc/irc.c:899
-msgid "No IRC nickname given"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "Primesc cheia serverului"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "Eroare IRC"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "Nu exist un asemenea pseudonim/canal"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "Eroare IRC"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "Nu exist un asemenea server"
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
 msgstr "Nu ai precizat un pseudonim pentru IRC"
 
-#: src/protocols/irc/irc.c:1054
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 msgid ""
-"%s has requested a DCC chat.  Would you like to establish the direct "
-"connection?"
-msgstr "%s a cerut un chat DCC. Dorii s stabilii o conexiune direct?"
-
-#: src/protocols/irc/irc.c:1079 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "Conectat"
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Nu pot scrie"
 
-#: src/protocols/irc/irc.c:1149
-#, c-format
-msgid "You have been kicked from %s:"
+#: src/protocols/irc/irc.c:1395
+#, fuzzy, c-format
+msgid "You have been kicked from %s: %s"
 msgstr "Ai fost respins din %s:"
 
-#: src/protocols/irc/irc.c:1154
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "Respins de %s: %s"
 
-#: src/protocols/irc/irc.c:1680
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "Detalii"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Ai ieit din %s"
 
-#: src/protocols/irc/irc.c:1781
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "Iei din canal"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Canal:"
 
-#: src/protocols/irc/irc.c:1785 src/multi.c:545
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Parol:"
 
-#: src/protocols/irc/irc.c:1966
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "Chat DCC"
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 msgid "Unable to change password."
 msgstr "Nu pot trimite parola."
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
-msgstr ""
-"Parola pe care ai introdus-o e incorect. Parola nu a fost schimbat."
-
-#: src/protocols/jabber/jabber.c:956
+msgstr "Parola pe care ai introdus-o e incorect. Parola nu a fost schimbat."
+
+#: src/protocols/jabber/jabber.c:978
 msgid "Unable to change password"
 msgstr "Nu pot schimba parola"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 "Parola nou introduseste identic cu cea veche. Parola rmne neschimbat."
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2873
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Online"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr "Absen prelungit"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr "Nu deranjai"
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Eroare Jabber %s"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr "Eroare %s: %s"
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 msgid "Unknown Error in presence"
 msgstr "O eroare necunoscut la prezen"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Utilizatorul %s dorete s v adauge n lista proprie de contacte."
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 "Utilzatorul Jabber %s nu exist, deci nu a fost adugat n lista de contacte."
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 msgid "No such user."
 msgstr "Nu exist un asemenea utilizator"
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:915
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Contacte"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr "Autentificare"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "Eroare necunoscut la logare"
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 msgid "Password successfully changed."
 msgstr "Parola a fost schimbat cu succes."
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3890
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "Conexiunea a fost pierdut"
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3892 src/protocols/jabber/jabber.c:3938
-#: src/protocols/msn/msn.c:1747 src/protocols/msn/msn.c:1776
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Nu m pot conecta"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "Conectat"
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "Cer metoda de autentificare"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1768
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Conectare"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr "Utilizatorul %s este un are un I.D. Jabber invalid i nu a fost adugat."
-
-#: src/protocols/jabber/jabber.c:2417
+msgstr ""
+"Utilizatorul %s este un are un I.D. Jabber invalid i nu a fost adugat."
+
+#: src/protocols/jabber/jabber.c:2621
 msgid "Jabber Error"
 msgstr "Eroare Jabber"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "Camer:"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "Administrare:"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 msgid "Unable to join chat"
 msgstr "Nu pot intra n chat"
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 msgid "Chats"
 msgstr "Chaturi"
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 msgid "View Error Msg"
 msgstr "Arat mesajele de eroare"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3700
-#: src/buddy_chat.c:902
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Mesajul n absen"
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr "Arat-m din nou lui"
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr "Ascunde-m temporar de"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr "terge din list"
 
-#: src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3284
 msgid "Cancel Presence Notification"
 msgstr "nchide fereastra de notificare"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "Nume complet"
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "Nume de familie"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "Nume mic"
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: src/protocols/jabber/jabber.c:3294 src/dialogs.c:2929
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Adresa"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "Adresa extins"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "Localitatea"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr "Regiunea"
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "Cod potal"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3300 src/dialogs.c:2056 src/dialogs.c:2760
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "ar"
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3302 src/dialogs.c:2834
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3303
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "Nume organizaie"
 
-#: src/protocols/jabber/jabber.c:3304
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "Departament"
 
-#: src/protocols/jabber/jabber.c:3305
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Titlu"
 
-#: src/protocols/jabber/jabber.c:3306
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr "Funcie"
 
-#: src/protocols/jabber/jabber.c:3307
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "Zi de natere"
 
-#: src/protocols/jabber/jabber.c:3308 src/dialogs.c:2937
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Descriere"
 
-#: src/protocols/jabber/jabber.c:3333
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -720,274 +1025,371 @@
 "Toi itemii de mai jos sunt opionali. Introducei doar informaiile pe care "
 "dorii s le facei publice"
 
-#: src/protocols/jabber/jabber.c:3334
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "Identitate utilizator"
 
-#: src/protocols/jabber/jabber.c:3746
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Editare vCard Jabber"
 
-#: src/protocols/jabber/jabber.c:3820
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "nregistrare reuit pe server"
 
-#: src/protocols/jabber/jabber.c:3847
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "Eroare necunoscut la nregistrare"
 
-#: src/protocols/jabber/jabber.c:3956 src/protocols/jabber/jabber.c:3971
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "Detalii utilizator"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Eroare de sintax (probabil o eroare Gaim)"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "Parametru invalid (probabil o eroare Gaim)"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 msgid "Invalid User"
 msgstr "Utilizator invalid"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr "Lipsete numele complet al domeniului (FQDN)"
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr "Suntei deja conectat"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 msgid "Invalid Username"
 msgstr "Nume invalid de utilizator"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Friendly Name"
 msgstr "Nume contactului este invalid"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr "List plin"
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr "Este deja acolo"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 msgid "Not on list"
 msgstr "Nu este n list"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr "Utilizatorul este offline"
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr "Suntei deja n respectiva stare"
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr "Este deja n lista opus"
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr "Comutator euat"
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr "Notifiv transferurile euate"
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr "Lipsesc unele cmpuri cerute"
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 msgid "Not logged in"
 msgstr "Neautentificat"
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 msgid "Internal server error"
 msgstr "Eroare intern de server"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr "Eroare a serverului cu baza de date"
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 msgid "File operation error"
 msgstr "Eroare la manipularea fiierului"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 msgid "Memory allocation error"
 msgstr "Eroare la alocarea memoriei"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 msgid "Server busy"
 msgstr "Server ocupat"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 msgid "Server unavailable"
 msgstr "Server nedisponibil"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr "Notificare de la omolog: server nedisponibil"
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 msgid "Database connect error"
 msgstr "Eroare la conectarea la baza de date"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr "Serverul va fi indisponibil"
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 msgid "Error creating connection"
 msgstr "Eroare la stabilirea conexiunii"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr "Sesiune suprancrcat"
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr "Utilizator mult prea activ"
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr "Prea multe sesiuni"
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr "Neateptat"
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr "Fiierul prieten??? este invalid"
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 msgid "Authentication failed"
 msgstr "Autentificare euat"
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 msgid "Not allowed when offline"
 msgstr "Nepermis n starea offline"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr "Nu accept utilizatori noi"
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr "Utilizator neverificat"
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 msgid "Unknown Error Code"
 msgstr "Cod de eroare necunoscut"
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr "E posibil ca un mesaj MSN s nu fi fost recepionat."
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim nu a putut trimite un mesaj MSN"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
-"Eroare la conexiunea la serverul central MSN. V rugm ncercai "
-"din nou mai trziu."
-
-#: src/protocols/msn/msn.c:921
+"Eroare la conexiunea la serverul central MSN. V rugm ncercai din nou mai "
+"trziu."
+
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "Eroare AOL"
+
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 "Utilizatorul %s (%s) dorete s adauge %s n lista proprie de contacte."
 
-#: src/protocols/msn/msn.c:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+msgid "Unable to write to server"
+msgstr "Nu pot scrie la server"
+
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "Utilizatorul %s (%s) dorete s v adauge n lista proprie de contacte"
 
-#: src/protocols/msn/msn.c:1179
+#: src/protocols/msn/msn.c:1401
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Ai fost deconectat. V-ai autentificat de la o alt locaie."
 
-#: src/protocols/msn/msn.c:1441 src/protocols/msn/msn.c:1685
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 msgid "Error reading from server"
 msgstr "Eroare la citirea de pe server"
 
-#: src/protocols/msn/msn.c:1574
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "Nu m pot conecta la server."
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "Nu pot scrie la server"
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Protocolul nedisponibil."
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "Nu pot deschide o conexiune direct"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "Nu m pot autentifica la AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "Nu pot trimite mesajul"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr "Cerere de trimitere a parolei"
 
-#: src/protocols/msn/msn.c:1624
+#: src/protocols/msn/msn.c:1839
 msgid "Unable to send password"
 msgstr "Nu pot trimite parola"
 
-#: src/protocols/msn/msn.c:1629
+#: src/protocols/msn/msn.c:1844
 msgid "Password sent"
 msgstr "Parola a fost trimis"
 
-#: src/protocols/msn/msn.c:1754
-msgid "Unable to write to server"
-msgstr "Nu pot scrie la server"
-
-#: src/protocols/msn/msn.c:1760
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "Nu pot scrie"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "Nu pot trimite mesajul"
+
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr "Sincronizare cu serverul"
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr "Absent din faa calculatorului"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr "Vin imediat"
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 msgid "Busy"
 msgstr "Ocupat"
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr "La telefon"
 
-#: src/protocols/msn/msn.c:1930
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr "La mas"
 
-#: src/protocols/msn/msn.c:1931
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 msgid "Hidden"
 msgstr "Ascuns"
 
-#: src/protocols/msn/msn.c:2047
+#: src/protocols/msn/msn.c:2428
+#, fuzzy
+msgid "Be right back"
+msgstr "Vin imediat"
+
+#: src/protocols/msn/msn.c:2430
+#, fuzzy
+msgid "Away from the computer"
+msgstr "Absent din faa calculatorului"
+
+#: src/protocols/msn/msn.c:2432
+#, fuzzy
+msgid "On the phone"
+msgstr "La telefon"
+
+#: src/protocols/msn/msn.c:2434
+#, fuzzy
+msgid "Out to lunch"
+msgstr "La mas"
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+msgid "Idle"
+msgstr "Inactiv"
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr "Reiniializeaz pseudonimul"
 
-#: src/protocols/msn/msn.c:2123
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "Trimite fiier"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr "Noul pseudonimul MSN este prea lung"
 
-#: src/protocols/msn/msn.c:2138 src/protocols/msn/msn.c:2159
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 msgid "Set Friendly Name"
 msgstr "Seteaz pseudonimul"
 
-#: src/protocols/msn/msn.c:2139
+#: src/protocols/msn/msn.c:2571
 msgid "Set Friendly Name:"
 msgstr "Setare pseudonim:"
 
-#: src/protocols/msn/msn.c:2140
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr "Reseteaz toate pseudonimele"
 
-#: src/protocols/msn/msn.c:2293
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -996,11 +1398,11 @@
 "Pseudonimul MSN are forma \"utilizator@server.com\". Poate ai vrut s "
 "scriei %s@hotmail.com. Nu s-au operat schimbri n list."
 
-#: src/protocols/msn/msn.c:2296 src/protocols/msn/msn.c:2353
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 msgid "Invalid MSN screenname"
 msgstr "Nume invalid de utilizator MSN"
 
-#: src/protocols/msn/msn.c:2350
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1009,88 +1411,198 @@
 "Pseudonimele MSN au forma \"utilizator@server.com\". Poate ai dorit s "
 "scriei %s@hotmail.com. Nu s-au operat modificri n list."
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3303
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Intr n grupul:"
 
-#: src/protocols/oscar/oscar.c:337
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "Utilizator invalid"
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Nume invalid"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Server nedisponibil"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Serviciul Dir este temporar nedisponibil."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Chatul direct cu %s s-a terminat"
 
-#: src/protocols/oscar/oscar.c:339
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Chatul direct cu %s a euat"
 
-#: src/protocols/oscar/oscar.c:377
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "eroare de conectare (rend)\n"
 
-#: src/protocols/oscar/oscar.c:388
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "eroare fatal de conectare\n"
 
-#: src/protocols/oscar/oscar.c:389 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Deconectat."
 
-#: src/protocols/oscar/oscar.c:401 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ai fost deconectat din camera de chat %s."
 
-#: src/protocols/oscar/oscar.c:414
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Chatul este deocamdat indisponibil"
 
-#: src/protocols/oscar/oscar.c:473 src/protocols/oscar/oscar.c:533
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Nu m-am putut conecta la server"
 
-#: src/protocols/oscar/oscar.c:481
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Am trimis parola, atept rspunsul\n"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "eroare intern de conectare\n"
 
-#: src/protocols/oscar/oscar.c:515
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Nu m pot autentifica la AIM"
 
-#: src/protocols/oscar/oscar.c:520
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Autentificare: %s"
 
-#: src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Deautentificat.\n"
 
-#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:736
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Nu m-am putut conecta"
 
-#: src/protocols/oscar/oscar.c:619
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Conectare iniializat, cookie trimis"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:645 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Pseudonim sau parol incorecte"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:650
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Contul dumneavoastr este momentan suspendat."
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "Serviciul este temporar indisponibil."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:654
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1099,47 +1611,86 @@
 "din nou. Dac continuai s ncercai, va trebui s ateptai mai mult."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:659
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Versiunea clientului folosit este prea veche. V rugm s l actualizai la "
 
-#: src/protocols/oscar/oscar.c:663 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Autentificarea a euat"
 
-#: src/protocols/oscar/oscar.c:685
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Eroare intern"
 
-#: src/protocols/oscar/oscar.c:774 src/protocols/oscar/oscar.c:799
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, fuzzy, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+"S-ar putea s fii repede deconectat. Poate dorii s ncercai TOC pn ce "
+"se rezolv aceast problem. A se vedea "
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim nu a putut obine un login hash AIM valid"
 
-#: src/protocols/oscar/oscar.c:775 src/protocols/oscar/oscar.c:800
-#: src/protocols/oscar/oscar.c:882
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-"S-ar putea s fii repede deconectat. Poate dorii s ncercai TOC pn "
-"ce se rezolv aceast problem. A se vedea "
-
-#: src/protocols/oscar/oscar.c:776 src/protocols/oscar/oscar.c:801
-#: src/protocols/oscar/oscar.c:883
-msgid " for updates."
-msgstr " pentru versiuni mai noi."
-
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:1061
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim nu a putut obine un login hash valid"
 
-#: src/protocols/oscar/oscar.c:1262 src/protocols/oscar/oscar.c:3514
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Convorbirea direct cu %s a fost iniializat"
 
-#: src/protocols/oscar/oscar.c:1547 src/protocols/oscar/oscar.c:2529
+#: src/protocols/oscar/oscar.c:1609
+#, fuzzy
+msgid "Transfer timed out"
+msgstr "Notifiv transferurile euate"
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "Nu am putut deschide fiierul de configurare %s."
+
+#: src/protocols/oscar/oscar.c:1632
+#, fuzzy
+msgid "File transfer aborted"
+msgstr "Notifiv transferurile euate"
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr "Utilizatorul %s dorete s v adauge n lista proprie de contacte."
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+msgid "No reason given."
+msgstr "Fr motiv."
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Autorizarea ICQ a fost refuzat"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1150,225 +1701,257 @@
 "contacte, motivnd astfel:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1547 src/protocols/oscar/oscar.c:2529
-msgid "No reason given."
-msgstr "Fr motiv."
-
-#: src/protocols/oscar/oscar.c:1548
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr "Autorizarea ICQ a fost refuzat."
 
-#: src/protocols/oscar/oscar.c:1554 src/protocols/oscar/oscar.c:2536
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "Utilizatorul %lu v-a acordat dreptul de a-l aduga la propria list de "
 "contacte."
 
-#: src/protocols/oscar/oscar.c:1653
-#, c-format
-msgid "You missed %d message from %s because it was invalid."
-msgstr "Ai pierdut %d mesaj de la %s deoarece era invalid."
-
-#: src/protocols/oscar/oscar.c:1654
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
-msgstr "Ai pierdut %d mesaje de la %s deoarece erau invalide."
-
-#: src/protocols/oscar/oscar.c:1663
+#: src/protocols/oscar/oscar.c:2141
 #, c-format
-msgid "You missed %d message from %s because it was too large."
-msgstr "Ai pierdut %d mesaj de la %s pentru c era prea mare."
-
-#: src/protocols/oscar/oscar.c:1664
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
-msgstr "Ai pierdut %d mesaje de la %s pentru c erau prea mari."
-
-#: src/protocols/oscar/oscar.c:1673
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
-msgstr "Ai pierdut %d mesaj de la %s pentru c a depit limita fixat."
-
-#: src/protocols/oscar/oscar.c:1674
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
 #, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
-msgstr "Ai pierdut %d mesaje de la %s pentru c a depit limita fixat."
-
-#: src/protocols/oscar/oscar.c:1683
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
-msgstr "Ai pierdut %d mesaj de la %s pentru c era prea indecent."
-
-#: src/protocols/oscar/oscar.c:1684
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
-msgid "You missed %d messages from %s because they are too evil."
-msgstr "Ai pierdut %d mesaje de la %s pentru erau prea indecente."
-
-#: src/protocols/oscar/oscar.c:1693
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"Dorii s-l adugai listei de contacte?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "Ai pierdut %d mesaj de la %s deoarece era invalid."
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "Ai pierdut %d mesaje de la %s deoarece erau invalide."
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgstr "Ai pierdut %d mesaj de la %s pentru c era prea mare."
+
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
+msgstr "Ai pierdut %d mesaje de la %s pentru c erau prea mari."
+
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgstr "Ai pierdut %d mesaj de la %s pentru c a depit limita fixat."
+
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
+msgid ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr "Ai pierdut %d mesaje de la %s pentru c a depit limita fixat."
+
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr "Ai pierdut %d mesaj de la %s pentru c era prea indecent."
+
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
+msgstr "Ai pierdut %d mesaj de la %s pentru c era prea indecent."
+
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
 msgstr "Ai pierdut %d mesaj de la %s pentru c ai fost prea indecent."
 
-#: src/protocols/oscar/oscar.c:1694
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr "Ai pierdut %d mesaje de la %s pentru c ai fost prea indecent."
 
-#: src/protocols/oscar/oscar.c:1702
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Ai pierdut %d mesaj de la %s din motive necunoscute."
 
-#: src/protocols/oscar/oscar.c:1703
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Ai pierdut %d mesaje de la %s din motive necunoscute."
 
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:2342
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
+#, fuzzy, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1773
-#, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+#: src/protocols/oscar/oscar.c:2389
+#, fuzzy, c-format
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC a lansat eroarea: %s\n"
 
-#: src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "Eroare necunoscut la logare"
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
+msgid "No reason was given."
+msgstr "Fr motiv."
+
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Mesajul dumneavoastr ctre %s nu a fost trimis:"
 
-#: src/protocols/oscar/oscar.c:1822 src/protocols/oscar/oscar.c:1839
-msgid "No reason was given."
-msgstr "Fr motiv."
-
-#: src/protocols/oscar/oscar.c:1838
+#: src/protocols/oscar/oscar.c:2528
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Detaliile despre utilizatorul %s nu sunt disponibile:"
 
-#: src/protocols/oscar/oscar.c:1868 src/buddy.c:2139
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Iconi"
 
-#: src/protocols/oscar/oscar.c:1871 src/buddy.c:2142
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Voce"
 
-#: src/protocols/oscar/oscar.c:1874 src/buddy.c:2145
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "Poz"
 
-#: src/protocols/oscar/oscar.c:1877 src/buddy.c:488 src/buddy.c:2148
-#: src/buddy.c:2573
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:1880 src/buddy.c:2151
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Primete fiier"
 
-#: src/protocols/oscar/oscar.c:1883 src/buddy.c:2154
-msgid "Send File"
-msgstr "Trimite fiier"
-
-#: src/protocols/oscar/oscar.c:1887 src/buddy.c:2158
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Jocuri"
 
-#: src/protocols/oscar/oscar.c:1890 src/buddy.c:2161
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Aciuni"
 
-#: src/protocols/oscar/oscar.c:1893 src/buddy.c:2164
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Trimite lista de contacte"
 
-#: src/protocols/oscar/oscar.c:1896 src/buddy.c:2167
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "Eroare EveryBuddy"
 
-#: src/protocols/oscar/oscar.c:1899 src/buddy.c:2170
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "Utilizator AP"
 
-#: src/protocols/oscar/oscar.c:1902 src/buddy.c:2173
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:1905 src/buddy.c:2176
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:1908 src/buddy.c:2179
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "Schimb de server ICQ"
 
-#: src/protocols/oscar/oscar.c:1911 src/buddy.c:2182
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ necunoscut"
 
-#: src/protocols/oscar/oscar.c:1914 src/buddy.c:2185
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Criptare Trillian"
 
-#: src/protocols/oscar/oscar.c:1952
+#: src/protocols/oscar/oscar.c:2655
 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>"
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
 msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Utilizator AIM obinuit<br><IMG SRC=\"aol_icon.gif\"> : Utilizator AOL "
-"<br><IMG SRC=\"dt_icon.gif\"> : Utilizator AIM de prob <br><IMG SRC="
-"\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : Agent "
-"interactiv ActiveBuddy<br><IMG SRC=\"wireless_icon.gif\"> : Utilizator de "
-"dispozitiv fr fir<br>"
-
-#: src/protocols/oscar/oscar.c:1980
-#, c-format
+
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "Nume utilizator : <B>%s</B>  %s <BR>\n"
 "Nivel avertizare : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:2012
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>Utilizatorul nu are un mesaj pentru absene</i>"
 
-#: src/protocols/oscar/oscar.c:2024
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Capacitile clientului: "
 
-#: src/protocols/oscar/oscar.c:2032
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Nici o informaie nu a fost furnizat</i>"
 
-#: src/protocols/oscar/oscar.c:2055
+#: src/protocols/oscar/oscar.c:2751
 msgid "Your AIM connection may be lost."
 msgstr "E posibil s fi pierdut conexiunea AIM."
 
-#: src/protocols/oscar/oscar.c:2290
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr "Eroare la rata de limitare."
 
-#: src/protocols/oscar/oscar.c:2291
+#: src/protocols/oscar/oscar.c:3011
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -1376,42 +1959,107 @@
 "Ultimul mesaj nu a fost trimis pentru c ai depit limita fixat. "
 "Ateptai 10 secunde i ncercai din nou."
 
-#: src/protocols/oscar/oscar.c:2530
-msgid "ICQ Authorization denied"
-msgstr "Autorizarea ICQ a fost refuzat"
-
-#: src/protocols/oscar/oscar.c:2537
-msgid "ICQ Authorization Granted"
-msgstr "Autorizarea ICQ v-a fost acordat"
-
-#: src/protocols/oscar/oscar.c:2865
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "Eroare la stabilirea conexiunii"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "Cont"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 msgid "Unable to set AIM profile."
 msgstr "Nu pot seta profilul AIM."
 
-#: src/protocols/oscar/oscar.c:2866
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 "Se pare c ai cerut s setai profilul nainte de a v autentifica. "
-"Profilul v va rmne la fel; ncercai s-l setai din nou cnd vei "
-"fi conectat."
-
-#: src/protocols/oscar/oscar.c:2872
+"Profilul v va rmne la fel; ncercai s-l setai din nou cnd vei fi "
+"conectat."
+
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
-"Ai depit lungimea maxim de %d bytes. Gaim a fcut o trunchiere "
-"i l-a setat."
-
-#: src/protocols/oscar/oscar.c:2895
+"Ai depit lungimea maxim de %d bytes. Gaim a fcut o trunchiere i l-a "
+"setat."
+
+#: src/protocols/oscar/oscar.c:3764
 msgid "Unable to set AIM away message."
 msgstr "Gaim nu a putut seta mesajul n absen pentru AIM"
 
-#: src/protocols/oscar/oscar.c:2896
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -1421,7 +2069,7 @@
 "procedurii de autentificare. Vei rmne n starea \"prezent\". ncercai "
 "din nou cnd vei fi conectat."
 
-#: src/protocols/oscar/oscar.c:2911
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
@@ -1430,7 +2078,7 @@
 "Mesajul n absen depete lungimea maxim de %d bytes. Gaim a trunchiat "
 "mesajul i v-a nregistrat ca absent."
 
-#: src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1440,154 +2088,154 @@
 "avei %d. Pn cnd nu cobori sub aceast limit unele contacte nu vor "
 "aprea online."
 
-#: src/protocols/oscar/oscar.c:3307 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Cheie numeric (exchange):"
 
-#: src/protocols/oscar/oscar.c:3635
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Nu pot deschide o conexiune direct"
 
-#: src/protocols/oscar/oscar.c:3645
+#: src/protocols/oscar/oscar.c:4620
 #, 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?"
+msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
-"Ai ales s deschidei o conexiune direct cu %s. Fcnd asta vei permite "
-"s v fie vzut adresa IP, ceea ce poate fi un risc de securitate. Dorii "
-"s continuai?"
-
-#: src/protocols/oscar/oscar.c:3662
-#, c-format
+
+#: src/protocols/oscar/oscar.c:4621
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
-"support sending status messages.</I><BR>"
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
+#, fuzzy, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Cellalt client nu suport "
 "trimiterea mesajelor de status.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3669
-#, c-format
+#: src/protocols/oscar/oscar.c:4642
+#, fuzzy, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Utilizatorul nu are un "
 "mesaj de status.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3694
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "Arat mesajul de status"
 
-#: src/protocols/oscar/oscar.c:3707
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Chat direct"
 
-#: src/protocols/oscar/oscar.c:3715
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Arat capacitile"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Nu pot scrie fiierul %s."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Nu pot citi fiierul %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mesaj prea lung, ultimii %s octei au fost trunchiai"
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s nu este conectat momentan."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Atenie! %s nu este permis."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Un mesaj s-a pierdut, ai depit limita maxim fixat de server."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chatul nu este posibil n %s."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Trimitei mesajele prea rapid pentru %s."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Ai pierdut un mesaj de la %s pentru c era prea mare."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Ai pierdut un mesaj de la %s pentru c a fost trimis prea repede."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "Eec."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "Prea multe potriviri."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "E nevoie de mai multe atribute."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "Serviciul Dir este temporar nedisponibil."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "Cutare dup email este limitat."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Cuvntul-cheie a fost ignorat."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "Fr cuvinte-cheie."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "Nu exist informaii detaliate n director."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "Nu exist suport de ar."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Eec necunoscut: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "Serviciul este temporar indisponibil."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "Nivelul propriu de avertizare este prea ridicat pentru autentificare."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1596,113 +2244,139 @@
 "ncercai din nou. Dac continuai s ncercai va trebui s ateptai mai "
 "mult."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Eroare necunoscut la autentificare: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Eroare necunoscut: %d. Detalii: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "Conexiune terminat"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "Atept rspunsul..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC a revenit din ateptare. Putei trimite mesaje din nou."
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "Parola a fost schimbat cu succes"
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC a trimis o comand PAUSE."
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid ""
 "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 ""
 "Cnd se ntmpl aa ceva, TOC ignor orice mesaj trimis i chiar v poate "
-"deautentifica cnd trimitei un mesaj. Gaim va preveni trimiterea oricrui " "mesaj. Situaia aceasta este temporar, v rugm s ateptai."
-
-#: src/protocols/toc/toc.c:1225
+"deautentifica cnd trimitei un mesaj. Gaim va preveni trimiterea oricrui "
+"mesaj. Situaia aceasta este temporar, v rugm s ateptai."
+
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "Info Dir"
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "P_ort"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "Nu m-am putut conecta pentru transfer!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 msgid "Could not connect for transfer."
 msgstr "Nu m-am putut conecta pentru transfer."
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "Nu m-am putut conecta pentru transfer!"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Nu am putut scrie antetul fiierului. Fiierul nu va fi transferat."
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - Salveaz ca..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s a cerut lui %s s accepte fiierul %d: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1963
+#: src/protocols/toc/toc.c:1980
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s a cerut lui %s s accepte fiierele %d: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s v cere s-i trimitei un fiier"
 
-#: src/protocols/yahoo/yahoo.c:596
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr "Da"
+
+#: src/protocols/yahoo/yahoo.c:583
 msgid "Your Yahoo! message did not get sent."
 msgstr "Mesajul dumneavoastr  Yahoo! nu a fost trimis."
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZLocalizare"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Clas:"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "Instan:"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "Destinatar:"
 
-#: src/about.c:93
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Despre Gaim v%s"
 
-#: src/about.c:125
+#: src/about.c:112
+#, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim este un client modular de Instant Messaging capabil s utilizeze \n"
 "simultan protocoalele AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, \n"
@@ -1710,101 +2384,62 @@
 "\n"
 "URL: "
 
-#: src/about.c:127
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
+#: src/about.c:122
+#, fuzzy
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "\n"
 "\n"
 "IRC: #gaim pe irc.freenode.net"
 
-#: src/about.c:137
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder) [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author) [ markster@marko.net ]"
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
 msgstr ""
-"Dezvoltatori activi\n"
-"====================\n"
-"Rob Flynn (coordonator) [ rob@marko.net ]\n"
-"Sean Egan (programator) [ bj91704@binghamton.edu ]\n"
-"\n"
-"Contributori\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Dezvoltatori ce s-au retras\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven            [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (primul autor) [ markster@marko.net ]"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:175
-msgid "Web Site"
-msgstr "Adres Web"
-
-#: src/aim.c:140
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "nchide"
+
+#: src/aim.c:165
 msgid "Please enter your login."
 msgstr "V rugm s v autentificai"
 
-#: src/aim.c:251
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Autentificare"
 
-#: src/aim.c:268
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "Nume AIM: "
 
-#: src/aim.c:284
-msgid "Password: "
-msgstr "Parol: "
-
-#: src/aim.c:304 src/buddy.c:2702
-msgid "Quit"
-msgstr "Ieire"
-
-#: src/aim.c:308 src/buddy.c:2724
-msgid "Accounts"
-msgstr "Conturi"
-
-#: src/aim.c:310 src/multi.c:906
-msgid "Signon"
-msgstr "Autentificare"
-
-#: src/aim.c:342
-msgid "Auto-login"
-msgstr "Autentificare automat"
-
-#: src/aim.c:343
-msgid "Options"
-msgstr "Opiuni"
-
-#: src/aim.c:345 src/buddy.c:2744
-msgid "Plugins"
-msgstr "Extensii"
-
 #: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - Absent!"
@@ -1813,86 +2448,86 @@
 msgid "I'm Back!"
 msgstr "M-am ntors!"
 
-#: src/away.c:348
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "Nou mesaj n absen"
 
-#: src/away.c:368
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "terge mesajul n absen"
 
-#: src/away.c:480
-msgid "Back"
-msgstr "Revenire"
-
-#: src/away.c:556
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Trece totul n absen"
 
-#: src/buddy.c:483 src/buddy.c:2814 src/dialogs.c:970 src/dialogs.c:1115
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Grup"
 
-#: src/buddy.c:489 src/buddy.c:631 src/buddy.c:801 src/buddy.c:2571
-#: src/buddy_chat.c:877 src/buddy_chat.c:1307
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:490 src/buddy.c:2572 src/buddy_chat.c:893 src/buddy_chat.c:1315
-#: src/buddy_chat.c:1491 src/conversation.c:2944
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Detalii"
 
-#. Put the buttons in the box
-#: src/buddy.c:636 src/buddy.c:806 src/dialogs.c:1107 src/dialogs.c:3800
-#: src/dialogs.c:3815
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:641 src/buddy.c:825
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr "Adaug ntmpinare"
 
-#: src/buddy.c:648 src/buddy.c:831
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "Arat nregistrrile"
 
-#: src/buddy.c:788 src/buddy.c:819
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "Redenumete"
 
-#: src/buddy.c:813
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "terge aliasul"
 
-#: src/buddy.c:1688
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr "ntmpinare nou"
 
-#: src/buddy.c:1706
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "terge ntmpinarea"
 
-#: src/buddy.c:1734
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 mesaj)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[Click pentru editare]"
 
-#: src/buddy.c:2261
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Autentificat: %s\n"
 
-#: src/buddy.c:2273
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Avertizri: %d%%\n"
 
-#: src/buddy.c:2285
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Capaciti: %s\n"
 
-#: src/buddy.c:2289
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1903,845 +2538,730 @@
 "Nume ales: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2293
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "Inactiv: "
 
-#: src/buddy.c:2362 src/buddy.c:2367
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s s-a conectat."
 
-#: src/buddy.c:2421 src/buddy.c:2426
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s s-a deconectat."
 
-#: src/buddy.c:2606
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Detalii despre contactul selectat"
 
-#: src/buddy.c:2607 src/dialogs.c:726
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "Trimite un mesaj"
 
-#: src/buddy.c:2608
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "Pornete sau intr ntr-un chat"
 
-#: src/buddy.c:2609
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Activeaz mesajul n absen"
 
-#: src/buddy.c:2676
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - List contacte"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Fiier"
 
-#: src/buddy.c:2680
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr "Adaug un contact"
 
-#: src/buddy.c:2682
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr "Intr ntr-un chat"
 
-#: src/buddy.c:2684
-msgid "New Instant Message"
-msgstr "Nou mesaj"
-
-#: src/buddy.c:2686 src/dialogs.c:788
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "Nou mesaj n absen"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr "Detalii"
 
-#: src/buddy.c:2691
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "Import lista de contacte"
 
-#: src/buddy.c:2696
-msgid "Signoff"
-msgstr "Deautentificare"
-
-#: src/buddy.c:2699
+#: src/buddy.c:2650
 msgid "Hide"
 msgstr "Ascunde"
 
-#: src/buddy.c:2707
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "Unelte"
 
-#: src/buddy.c:2717
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr "ntmpinare"
 
-#: src/buddy.c:2730
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "Conturi"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Preferine"
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Aciunile protocolului"
 
-#: src/buddy.c:2734
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "Intimitate"
 
-#: src/buddy.c:2736
-msgid "Preferences"
-msgstr "Preferine"
-
-#: src/buddy.c:2738
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "Arat nregistrrile Gaim"
 
-#: src/buddy.c:2750
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2753
-msgid "Load Script"
-msgstr "ncarc un script"
-
-#: src/buddy.c:2757
-msgid "Unload All Scripts"
-msgstr "Deactiveaz toate scripturile"
-
-#: src/buddy.c:2761
-msgid "List Scripts"
-msgstr "Arat scripturile"
-
-#: src/buddy.c:2769
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Ajutor"
 
-#: src/buddy.c:2773
+#: src/buddy.c:2699
 msgid "Online Help"
 msgstr "Ajutor online"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2700
 msgid "Debug Window"
 msgstr "Fereastr de depanare"
 
-#: src/buddy.c:2775
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "Despre Gaim"
 
-#: src/buddy.c:2793 src/prefs.c:1215
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "List contacte"
 
-#: src/buddy.c:2846
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "Adaug un nou contact"
 
-#: src/buddy.c:2847
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "Adaug un nou grup"
 
-#: src/buddy.c:2848
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "terge grupul/contactul selectat"
 
-#: src/buddy.c:2875
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Editare contacte"
 
-#: src/buddy.c:2914
-msgid "Gaim - Buddy List"
-msgstr "Gaim - List contacte"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Intr n chat"
 
-#: src/buddy_chat.c:282
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Intr n chat ca:"
 
-#: src/buddy_chat.c:303 src/buddy_chat.c:391 src/dialogs.c:445
-#: src/dialogs.c:535 src/dialogs.c:744 src/dialogs.c:845 src/dialogs.c:962
-#: src/dialogs.c:1136 src/dialogs.c:1884 src/dialogs.c:2088 src/dialogs.c:2211
-#: src/dialogs.c:2270 src/dialogs.c:2491 src/dialogs.c:2672 src/dialogs.c:2845
-#: src/dialogs.c:2916 src/dialogs.c:3550 src/dialogs.c:3802 src/dialogs.c:3980
-#: src/dialogs.c:4360 src/dialogs.c:4465 src/dialogs.c:5132 src/multi.c:776
-#: src/multi.c:902 src/prpl.c:161 src/prpl.c:234
-msgid "Cancel"
-msgstr "Renun"
-
-#: src/buddy_chat.c:308
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Intr"
 
-#: src/buddy_chat.c:392 src/buddy_chat.c:395 src/buddy_chat.c:1357
-#: src/buddy_chat.c:1447
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Invit"
 
-#: src/buddy_chat.c:411 src/dialogs.c:1712 src/dialogs.c:3810
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Contact"
 
-#: src/buddy_chat.c:416
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Mesaj"
 
-#: src/buddy_chat.c:453
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invit contactul n camera de chat"
 
-#: src/buddy_chat.c:884
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Nu ignora"
 
-#: src/buddy_chat.c:886 src/buddy_chat.c:1311 src/prefs.c:349
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Ignor"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:964 src/buddy_chat.c:1076 src/buddy_chat.c:1537
-#: src/buddy_chat.c:1570
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s n chat"
 
-#: src/buddy_chat.c:972
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s a intrat n chat."
 
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s a intrat n chat."
+
 #: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s este acum %s"
 
-#: src/buddy_chat.c:1085
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a ieit din chat (%s)"
 
-#: src/buddy_chat.c:1087
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s a ieit din chat."
 
-#: src/buddy_chat.c:1185
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Chaturi de grup"
 
-#: src/buddy_chat.c:1247
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Topic:"
 
-#: src/buddy_chat.c:1288
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0 persoane n chat"
 
-#: src/buddy_chat.c:1362 src/buddy_chat.c:1446
-msgid "Whisper"
-msgstr "optete"
-
-#: src/buddy_chat.c:1367 src/buddy_chat.c:1444 src/buddy_chat.c:1493
-#: src/conversation.c:2955
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Trimite"
 
-#: src/buddy_chat.c:1487 src/conversation.c:2932
-msgid "Block"
-msgstr "Blocheaz"
-
-#: src/buddy_chat.c:1489 src/conversation.c:2938 src/dialogs.c:420
-#: src/dialogs.c:449
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "Avertizeaz"
 
-#: src/conversation.c:440
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Salveaz discuia"
-
-#: src/conversation.c:497
+#: src/buddy_chat.c:1592 src/conversation.c:2925
+msgid "Block"
+msgstr "Blocheaz"
+
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Inserare imagine"
 
-#: src/conversation.c:1331
+#: src/conversation.c:1305
 msgid "Unable to send message.  The message is too large"
 msgstr "Nu pot trimite mesajul, este prea mare"
 
-#: src/conversation.c:1335
+#: src/conversation.c:1309
 msgid "Unable to send message"
 msgstr "Nu pot trimite mesajul"
 
-#: src/conversation.c:1554
-#, c-format
-msgid "Currently at %d, "
-msgstr "Momentan n %d, "
-
-#: src/conversation.c:1562
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "Setez poziia n %d\n"
-
-#: src/conversation.c:2220
-msgid "Bold Text"
-msgstr "Text ngroat"
-
-#: src/conversation.c:2220
-msgid "Bold"
-msgstr "Gras"
-
-#: src/conversation.c:2224
-msgid "Italics Text"
-msgstr "Text nclinat"
-
-#: src/conversation.c:2225
-msgid "Italics"
-msgstr "nclinat"
-
-#: src/conversation.c:2228
-msgid "Underline Text"
-msgstr "Text subliniat"
-
-#: src/conversation.c:2229
-msgid "Underline"
-msgstr "Subliniat"
-
-#: src/conversation.c:2233
-msgid "Strike through Text"
-msgstr "Text cu linie peste"
-
-#: src/conversation.c:2233
-msgid "Strike"
-msgstr "Linie"
-
-#: src/conversation.c:2239
-msgid "Decrease font size"
-msgstr "Micoreaz caracterele"
-
-#: src/conversation.c:2239
-msgid "Small"
-msgstr "Mici"
-
-#: src/conversation.c:2242
-msgid "Normal font size"
-msgstr "Mrimea normal a caracterelor"
-
-#: src/conversation.c:2242
-msgid "Normal"
-msgstr "Normale"
-
-#: src/conversation.c:2245
-msgid "Increase font size"
-msgstr "Mrete mrimea caracterelor"
-
-#: src/conversation.c:2245
-msgid "Big"
-msgstr "Mari"
-
-#: src/conversation.c:2252 src/dialogs.c:3221 src/dialogs.c:3245
-msgid "Select Font"
-msgstr "Alege caracterele"
-
-#: src/conversation.c:2253
-msgid "Font"
-msgstr "Caractere"
-
-#: src/conversation.c:2256
-msgid "Text Color"
-msgstr "Culoarea textului"
-
-#: src/conversation.c:2257 src/conversation.c:2261 src/prefs.c:298
-msgid "Color"
-msgstr "Culoare"
-
-#: src/conversation.c:2261
-msgid "Background Color"
-msgstr "Culoarea fundalului"
-
-#: src/conversation.c:2268 src/dialogs.c:2910
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "Salveaz discuia"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "Introducei o adres"
 
-#: src/conversation.c:2269
-msgid "Link"
-msgstr "Adres"
-
-#: src/conversation.c:2272
-msgid "Insert smiley face"
-msgstr "Introducei o iconi simbolic"
-
-#: src/conversation.c:2272
-msgid "Smiley"
-msgstr "Iconi simbolic"
-
-#: src/conversation.c:2275
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "Introducei imaginea IM"
 
-#: src/conversation.c:2275
-msgid "Image"
-msgstr "Imagine"
-
-#: src/conversation.c:2282
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "nchide"
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "Opiuni"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "Activeaz nregistrarea"
 
-#: src/conversation.c:2283 src/prefs.c:1222
-msgid "Logging"
-msgstr "nregistrare"
-
-#: src/conversation.c:2292
-msgid "Show Log Viewer"
-msgstr "Arat nregistrrile"
-
-#: src/conversation.c:2292
-msgid "Viewer"
-msgstr "Vizualizator"
-
-#: src/conversation.c:2296
-msgid "Save Conversation"
-msgstr "Salveaz discuia"
-
-#: src/conversation.c:2297 src/dialogs.c:2092 src/dialogs.c:2274
-#: src/dialogs.c:3562 src/dialogs.c:4253 src/dialogs.c:5140
-msgid "Save"
-msgstr "Salveaz"
-
-#: src/conversation.c:2301
-msgid "Toggle Sound"
-msgstr "(De)activeaz sunetul"
-
-#: src/conversation.c:2302
-msgid "Sound"
-msgstr "Sunet"
-
-#: src/conversation.c:2784
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "Activeaz nregistrarea"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - Discuii"
 
-#: src/conversation.c:2870
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Trimite mesajul ca:"
 
-#: src/conversation.c:3440
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Salvare iconi"
 
-#: src/conversation.c:3474
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Dezactiveaz animaia"
 
-#: src/conversation.c:3481
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Activeaz animaia"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Ascunde iconia"
 
-#: src/conversation.c:3493
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Salveaz iconia ca..."
 
-#: src/dialogs.c:409
-msgid "Gaim - Warn user?"
-msgstr "Gaim - Avertizai utilizatorul?"
-
-#: src/dialogs.c:428
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "Chiar dorii s-l avertizai pe %s"
-
-#: src/dialogs.c:433
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "Avertizare anonim?"
 
-#: src/dialogs.c:437
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "Avertizrile anonime sunt mai puin suprtoare."
 
-#: src/dialogs.c:465
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "l terg pe '%s' din lista de contacte.\n"
 
-#: src/dialogs.c:490
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - l terg pe %s?"
-
-#: src/dialogs.c:503
-msgid "Remove Buddy"
-msgstr "tergere contact"
-
-#: src/dialogs.c:513
-#, c-format
-msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
-"Suntei pe cale s tergei pe '%s' din\n"
-"lista de contacte. Dorii s continuai?"
-
-#: src/dialogs.c:525 src/prpl.c:165 src/prpl.c:238
-msgid "Accept"
-msgstr "Da"
-
-#. Build OK Button
-#: src/dialogs.c:666 src/dialogs.c:749 src/dialogs.c:850 src/dialogs.c:1888
-#: src/dialogs.c:2215 src/dialogs.c:2364 src/dialogs.c:2671 src/dialogs.c:2849
-#: src/dialogs.c:2915 src/dialogs.c:4365 src/dialogs.c:4470 src/multi.c:781
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:717
-msgid "Gaim - IM user"
-msgstr "Gaim - Utilizator IM"
-
-#: src/dialogs.c:733
-msgid "IM who:"
-msgstr "Mesaj pentru:"
-
-#: src/dialogs.c:797
-msgid "User:"
-msgstr "Utilizator:"
-
-#: src/dialogs.c:806
-msgid "Account:"
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "Nume ales:"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
 msgstr "Cont:"
 
-#. Finish up
-#: src/dialogs.c:855
-msgid "Gaim - Get User Info"
-msgstr "Gaim - Obinere detalii"
-
-#: src/dialogs.c:968
-msgid "Add Group"
-msgstr "Adaug grup"
-
-#: src/dialogs.c:993
+#: src/dialogs.c:804
+msgid ""
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - Adugare grup"
 
-#: src/dialogs.c:1076
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "Grup"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Adugare contact"
 
-#: src/dialogs.c:1087
-msgid "Add Buddy"
-msgstr "Adaug contact"
-
-#: src/dialogs.c:1097
-msgid "Contact"
-msgstr "Contact"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Nume AIM: "
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1123
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Adaug n"
 
-#: src/dialogs.c:1418
+#: src/dialogs.c:1468
 msgid "Gaim - Privacy"
 msgstr "Gaim - Intimitate"
 
-#: src/dialogs.c:1429
-msgid "Privacy settings are affected immediately."
+#: src/dialogs.c:1479
+#, fuzzy
+msgid "Changes to privacy settings take effect immediately."
 msgstr "Setrile de intimitate sunt aplicate instantaneu"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Schimb setrile de intimitate pentru:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Permite tuturor s m contacteze"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "Permite doar celor de mai jos"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "Permite doar celor de mai jos"
 
-#: src/dialogs.c:1459
-msgid "Allow List"
-msgstr "Liste celor permii"
-
-#: src/dialogs.c:1490
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Respinge toi utilizatorii"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Respinge doar pe cei de mai jos"
 
-#: src/dialogs.c:1493
-msgid "Block List"
-msgstr "Lista celor respini"
-
-#: src/dialogs.c:1546
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Introducei un contact pentru ntmpinare."
 
-#: src/dialogs.c:1682
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ntmpinare nou"
 
 #. <pounce type="who">
-#: src/dialogs.c:1692
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Tipul ntmpinrii"
 
-#: src/dialogs.c:1703
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Cont"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1729
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "ntmpinare la"
 
-#: src/dialogs.c:1739
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Autentificare"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "ntoarcerea din absen"
 
-#: src/dialogs.c:1757
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "ntoarcerea din inactivitate"
 
-#: src/dialogs.c:1766
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "La ncercarea de a v contacta"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1776
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Aciune de ntmpinare"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "Deschide fereastra IM"
 
-#: src/dialogs.c:1796
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Fereastr de notificare"
 
-#: src/dialogs.c:1805 src/prefs.c:365
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Trimite mesajul:"
 
-#: src/dialogs.c:1826
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Execut comanda:"
 
-#: src/dialogs.c:1848
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Red sunetul:"
 
 #. </pounce type="action">
-#: src/dialogs.c:1870
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Salveaz aceast ntmpinare dup activare"
 
-#: src/dialogs.c:1956
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr "Salveaz"
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "Renun"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Setarea detaliilor"
 
-#: src/dialogs.c:1964
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Detalii"
 
-#: src/dialogs.c:1986
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Permite gsirea pe net a detaliilor"
 
 #. Line 1
-#: src/dialogs.c:1989 src/dialogs.c:2690
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Prenume"
 
 #. Line 2
-#: src/dialogs.c:2000 src/dialogs.c:2702
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Iniial"
 
 #. Line 3
-#: src/dialogs.c:2012 src/dialogs.c:2714
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Nume de familie"
 
 #. Line 4
-#: src/dialogs.c:2023 src/dialogs.c:2726
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Nume de fat"
 
 #. Line 6
-#: src/dialogs.c:2045 src/dialogs.c:2749
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Stat"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr "Salveaz"
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Parola nou a fost confirmat greit"
 
-#: src/dialogs.c:2115
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Completeaz toate cmpurile"
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Schimbarea parolei"
 
-#: src/dialogs.c:2169
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Parola actual"
 
-#: src/dialogs.c:2183
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Noua parol"
 
-#: src/dialogs.c:2197
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Noua parol (din nou)"
 
-#: src/dialogs.c:2238
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "OK"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Setare info"
 
-#: src/dialogs.c:2348
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Mai jos sunt rezultatele cutrii: "
 
-#: src/dialogs.c:2481 src/dialogs.c:2488
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Permisiune"
 
-#: src/dialogs.c:2483 src/dialogs.c:2490
-msgid "Deny"
-msgstr "Refuz"
-
-#: src/dialogs.c:2527
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Permisiune"
 
-#: src/dialogs.c:2529
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Refuz"
 
-#: src/dialogs.c:2588
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - nregistrare discuii"
 
-#: src/dialogs.c:2666 src/dialogs.c:2827
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Caut un contact"
 
-#: src/dialogs.c:2794
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Cutare contact dup info"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Cutare contact dup email"
 
-#: src/dialogs.c:2961
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "Introducei o adres"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Adaug adres"
 
-#: src/dialogs.c:3074 src/dialogs.c:3094 src/dialogs.c:3146
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Selectai culoarea textului"
 
-#: src/dialogs.c:3126
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Selectai culoarea fundalului"
 
-#: src/dialogs.c:3322
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "Alege caracterele"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Import n:"
 
-#: src/dialogs.c:3346
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importul listei de contacte"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3408
+#: src/dialogs.c:3470
 msgid "You cannot save an away message with a blank title"
 msgstr "Nu putei crea un mesaj n absen cu un titlu nul"
 
-#: src/dialogs.c:3409
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
-"V rugm s dai un titlu mesajului, sau alegei \"Utilizeaz\" pentru "
-"a nu salva."
+"V rugm s dai un titlu mesajului, sau alegei \"Utilizeaz\" pentru a nu "
+"salva."
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3416
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "Nu putei crea un mesaj n absen gol"
 
-#: src/dialogs.c:3484
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Nou mesaj n absen"
 
-#: src/dialogs.c:3493
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Nou mesaj n absen"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Titlul mesajului n absen: "
 
-#: src/dialogs.c:3554
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "Salveaz i utilizeaz"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Utilizeaz"
 
-#: src/dialogs.c:3558
-msgid "Save & Use"
-msgstr "Salveaz i utilizeaz"
-
 #. show everything
-#: src/dialogs.c:3755
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Zmbete!"
 
-#: src/dialogs.c:3808
-msgid "Alias Buddy"
-msgstr "Alias contact"
-
 #: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias contact"
 
-#: src/dialogs.c:3881 src/dialogs.c:3888
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Nu am putut scrie n %s."
 
-#: src/dialogs.c:3912
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Salvare fiier nregistrri"
 
-#: src/dialogs.c:3943
+#: src/dialogs.c:3940
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Nu am putut terge fiierul %s."
 
-#: src/dialogs.c:3970
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Chiar dorii s terg nregistrrile?"
 
-#: src/dialogs.c:3985
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "Da"
 
-#: src/dialogs.c:4162
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Dat"
 
-#: src/dialogs.c:4225
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Discuie"
 
-#: src/dialogs.c:4248
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "terge"
 
@@ -2749,102 +3269,132 @@
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Redenumire grup"
 
-#: src/dialogs.c:4339
-msgid "Rename Group"
-msgstr "Redenumire grup"
-
-#: src/dialogs.c:4346 src/dialogs.c:4451
-msgid "New name:"
-msgstr "Noul nume:"
-
-#: src/dialogs.c:4435
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Redenumire contact"
 
-#: src/dialogs.c:4444
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Redenumire contact"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "Noul nume:"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4528
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Selectare script Perl"
 
-#: src/gaimrc.c:1239
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nu am putut deschide fiierul de configurare %s."
 
-#: src/html.c:183
+#: src/html.c:185
 #, c-format
 msgid "Received: '%s'\n"
 msgstr "Recepionat: '%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Eroare la deschiderea conexiunii.\n"
 
-#: src/module.c:106 src/module.c:112
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim nu a putut deactiva aceast extensie."
-
-#: src/multi.c:450
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "Nume ales:"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "Protocol:"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - ncrcare iconi contact"
 
-#: src/multi.c:493
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "Iconi contact:"
 
-#: src/multi.c:504
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Navigare"
 
-#: src/multi.c:509 src/prefs.c:1042
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "Resetare"
 
-#: src/multi.c:536
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "Opiuni sunet"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "Nume ales:"
 
-#: src/multi.c:555
+#: src/multi.c:653
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/multi.c:565
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/multi.c:570
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "Reine parola"
 
-#: src/multi.c:571
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Autentificare automat"
 
-#: src/multi.c:612
+#: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "Opiuni navigator"
+
+#: src/multi.c:715
 msgid "New Mail Notifications"
 msgstr "Notificare la mesaje noi"
 
-#: src/multi.c:702
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Opiuni"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "nregistrare la server"
 
-#: src/multi.c:759
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Modificare cont"
 
-#: src/multi.c:874
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "Introducei parola"
 
-#: src/multi.c:936
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Parol:"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "Autentificare"
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr "TOC este indisponibil."
 
-#: src/multi.c:937
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
@@ -2855,11 +3405,11 @@
 "extensie. Pentru a v loga, editai contul s utilizeze OSCAR sau ncrcai "
 "extensia TOC."
 
-#: src/multi.c:943
+#: src/multi.c:1084
 msgid "Protocol not found."
 msgstr "Protocolul nedisponibil."
 
-#: src/multi.c:944
+#: src/multi.c:1085
 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."
@@ -2867,40 +3417,44 @@
 "Nu v putei loga pe acest cont. Protocolul necesar nu este ncrcat sau nu "
 "are o procedur de autentificare."
 
-#: src/multi.c:975
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Suntei sigur c dorii s tergei %s?"
 
-#: src/multi.c:1012
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "terge"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editare conturi"
 
-#: src/multi.c:1030
-msgid "Select All"
-msgstr "Selecteaz tot"
-
-#: src/multi.c:1035
-msgid "Select Autos"
-msgstr "Cele automate"
-
-#: src/multi.c:1039
-msgid "Select None"
-msgstr "Deselecteaz"
-
-#: src/multi.c:1053
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "Editare"
 
-#: src/multi.c:1057
-msgid "Sign On/Off"
-msgstr "(De)conectare"
-
-#: src/multi.c:1061
-msgid "Delete"
-msgstr "terge"
-
-#: src/multi.c:1381
+#: src/multi.c:1308
+msgid "Done."
+msgstr ""
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Autentificare: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Editare conturi"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "Renun"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -2909,461 +3463,486 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1400
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nu s-a putut autentifica"
 
-#: src/multi.c:1401
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "Eroare la autentificare"
 
-#: src/multi.c:1411
+#: src/multi.c:1604
 msgid "Notice"
 msgstr "Avertisment"
 
-#: src/multi.c:1421
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s a fost deconectat"
 
-#: src/multi.c:1422
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr "Eroare la conectare"
 
-#: src/plugins.c:116
-msgid "Gaim - Plugin List"
-msgstr "Gaim - Lista extensiilor"
-
-#: src/plugins.c:196
-msgid "Gaim - Plugins"
-msgstr "Gaim - Extensii"
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:209
-msgid "Loaded Plugins"
-msgstr "Extensii ncrcate"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:243
-msgid "Selected Plugin"
-msgstr "Extensia selectat"
-
-#: src/plugins.c:278
-msgid "Filepath:"
-msgstr "Calea fiierului:"
-
-#: src/plugins.c:296
-msgid "Load"
-msgstr "ncarc"
-
-#: src/plugins.c:299
-msgid "Load a plugin from a file"
-msgstr "ncarc o extensie dintr-un fiier"
-
-#: src/plugins.c:301
-msgid "Configure"
-msgstr "Configurare"
-
-#: src/plugins.c:304
-msgid "Configure settings of the selected plugin"
-msgstr "Configurarea setrilor pentru extensia selectat"
-
-#: src/plugins.c:306
-msgid "Reload"
-msgstr "Rencarc"
-
-#: src/plugins.c:310
-msgid "Reload the selected plugin"
-msgstr "Rencarc extensia selectat"
-
-#: src/plugins.c:312
-msgid "Unload"
-msgstr "Deactiveaz"
-
-#: src/plugins.c:315
-msgid "Unload the selected plugin"
-msgstr "Deactiveaz extensia selectat"
-
-#: src/plugins.c:320
-msgid "Close this window"
-msgstr "nchide aceast fereastr"
-
-#: src/prefs.c:248
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 msgid "Interface Options"
 msgstr "Opiuni interfa"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:251
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "Arat fereastra de _depanare"
 
-#: src/prefs.c:254
-msgid "Use _borderless buttons"
-msgstr "Utilizeaz _butoane neevideniate"
-
-#: src/prefs.c:270
+#: src/prefs.c:200
 msgid "Style"
 msgstr "Stil"
 
-#: src/prefs.c:271
+#: src/prefs.c:201
 msgid "_Bold"
 msgstr "_Gras"
 
-#: src/prefs.c:272
+#: src/prefs.c:202
 msgid "_Italics"
 msgstr "ncl_inat"
 
-#: src/prefs.c:273
+#: src/prefs.c:203
 msgid "_Underline"
 msgstr "_Subliniat"
 
-#: src/prefs.c:274
+#: src/prefs.c:204
 msgid "_Strikethough"
 msgstr "Te_xt nepat"
 
-#: src/prefs.c:276
+#: src/prefs.c:206
 msgid "Face"
 msgstr "Tip de caractere"
 
-#: src/prefs.c:279
+#: src/prefs.c:209
 msgid "Use custo_m face"
 msgstr "Utilizeaz caracterele _alese"
 
-#: src/prefs.c:291
+#: src/prefs.c:221
 msgid "Use custom si_ze"
 msgstr "Utilizeaz _mrimea aleas"
 
-#: src/prefs.c:303
+#: src/prefs.c:228
+msgid "Color"
+msgstr "Culoare"
+
+#: src/prefs.c:233
 msgid "_Text color"
 msgstr "Culoare _text"
 
-#: src/prefs.c:319
+#: src/prefs.c:249
 msgid "Bac_kground color"
 msgstr "Culoare _fundal"
 
-#: src/prefs.c:343 src/prefs.c:443 src/prefs.c:483
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 msgid "Display"
 msgstr "Afiare"
 
-#: src/prefs.c:344
+#: src/prefs.c:274
 msgid "Show graphical _smileys"
 msgstr "Arat iconiele _simbolice n chaturi"
 
-#: src/prefs.c:345
+#: src/prefs.c:275
 msgid "Show _timestamp on messages"
 msgstr "_Dateaz toate mesajele"
 
-#: src/prefs.c:346
+#: src/prefs.c:276
 msgid "Show _URLs as links"
 msgstr "Arat _URL-urile ca legturi active"
 
-#: src/prefs.c:347
+#: src/prefs.c:278
 msgid "_Highlight misspelled words"
 msgstr "_Evideniaz cuvintele incorect scrise"
 
-#: src/prefs.c:350
+#: src/prefs.c:281
 msgid "Ignore c_olors"
 msgstr "Ignor _culorile"
 
-#: src/prefs.c:351
+#: src/prefs.c:282
 msgid "Ignore font _faces"
 msgstr "Ignor caracterele _speciale"
 
-#: src/prefs.c:352
+#: src/prefs.c:283
 msgid "Ignore font si_zes"
 msgstr "Ignor _alte mrimi de caractere"
 
-#: src/prefs.c:353
-msgid "Ignore Ti_K Automated Messages"
-msgstr "Ignor mesajele automate Ti_K"
-
-#: src/prefs.c:366
+#: src/prefs.c:297
 msgid "_Enter sends message"
 msgstr "\"_Enter\" expediaz mesajul"
 
-#: src/prefs.c:367
+#: src/prefs.c:298
 msgid "C_ontrol-Enter sends message"
 msgstr "\"C_ontrol-Enter\" expediaz mesajul"
 
-#: src/prefs.c:369
+#: src/prefs.c:300
 msgid "Window Closing"
 msgstr "nchidere ferestre"
 
-#: src/prefs.c:370
+#: src/prefs.c:301
 msgid "E_scape closes window"
 msgstr "\"E_scape\" nchide fereastra"
 
-#: src/prefs.c:371
+#: src/prefs.c:302
 msgid "Control-_W closes window"
 msgstr "\"Control-_W\" nchide fereastra"
 
-#: src/prefs.c:374
+#: src/prefs.c:305
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "\"Control-{B/I/U/S}\" introduce taguri _HTML"
 
-#: src/prefs.c:375
+#: src/prefs.c:306
 msgid "Control-(number) inserts _smileys"
 msgstr "\"Control-(numr)\" introduce _iconie simbolice n chat"
 
-#. fixme: docklet
-#. gaim_button(_("Automatically show buddy list on sign on"), &blist_options_new,
-#. OPT_BLIST_APP_BUDDY_SHOW, vbox);
-#. gaim_button(_("Display Buddy List near applet"), &blist_options_new, OPT_BLIST_NEAR_APPLET, vbox);
-#: src/prefs.c:392
+#: src/prefs.c:318
 msgid "Buttons"
 msgstr "Butoane"
 
-#: src/prefs.c:393
+#: src/prefs.c:319
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "_Ascunde butoanele IM/Detalii/Chat"
 
-#: src/prefs.c:394
+#: src/prefs.c:320
 msgid "Show _pictures on buttons"
 msgstr "Arat _iconiele butoanelor"
 
-#: src/prefs.c:396
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "Fereastra listei de contacte"
 
-#: src/prefs.c:397
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "_Salveaz mrimea i poziia ferestrei"
 
-#: src/prefs.c:398
-msgid "_Raise Window on Events"
-msgstr "_Ridic fereastra deasupra la evenimente noi"
-
-#: src/prefs.c:400
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
+msgstr "_Ridic deasupra fereastra la evenimente noi"
+
+#: src/prefs.c:326
 msgid "Group Display"
 msgstr "Afiare grupuri"
 
-#: src/prefs.c:401
+#: src/prefs.c:327
 msgid "Hide _groups with no online buddies"
 msgstr "Ascunde grupurile _fr contacte online"
 
-#: src/prefs.c:402
+#: src/prefs.c:328
 msgid "Show _numbers in groups"
 msgstr "Arat _numere n grupuri"
 
-#: src/prefs.c:404
+#: src/prefs.c:330
 msgid "Buddy Display"
 msgstr "Afiare contacte"
 
-#: src/prefs.c:405
+#: src/prefs.c:331
 msgid "Show buddy type _icons"
 msgstr "Arat ic_oniele tip ale contactelor"
 
-#: src/prefs.c:406
+#: src/prefs.c:332
 msgid "Show _warning levels"
 msgstr "Arat nivelul de a_vertizare"
 
-#: src/prefs.c:407
+#: src/prefs.c:333
 msgid "Show idle _times"
 msgstr "Arat _timpul de inactivitate"
 
-#: src/prefs.c:408
+#: src/prefs.c:334
 msgid "Grey i_dle buddies"
 msgstr "Contacte inactive n _gri"
 
-#: src/prefs.c:425 src/prefs.c:467
+#: src/prefs.c:351 src/prefs.c:393
 msgid "Window"
 msgstr "Ferestre"
 
-#: src/prefs.c:432 src/prefs.c:474
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "Arat _iconiele butoanelor"
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr ""
+
+#: src/prefs.c:354 src/prefs.c:396
+#, fuzzy
+msgid "Text"
+msgstr "Test"
+
+#: src/prefs.c:355 src/prefs.c:397
+msgid "Pictures and text"
+msgstr ""
+
+#: src/prefs.c:358 src/prefs.c:400
 msgid "New window _width:"
 msgstr "_Limea unei ferestre noi:"
 
-#: src/prefs.c:433 src/prefs.c:475
+#: src/prefs.c:359 src/prefs.c:401
 msgid "New window _height:"
 msgstr "_nlimea unei ferestre noi:"
 
-#: src/prefs.c:434 src/prefs.c:476
+#: src/prefs.c:360 src/prefs.c:402
 msgid "_Entry widget height:"
 msgstr "_Spaiul intrrilor de text:"
 
-#: src/prefs.c:435 src/prefs.c:477
+#: src/prefs.c:361 src/prefs.c:403
 msgid "_Raise windows on events"
 msgstr "_Ridic deasupra fereastra la evenimente noi"
 
-#: src/prefs.c:436
+#: src/prefs.c:362
 msgid "Hide window on _send"
 msgstr "Ascunde fereastra la _trimitere"
 
-#: src/prefs.c:439
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "Iconie contacte"
 
-#: src/prefs.c:440
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "Ascunde _iconiele contactelor"
 
-#: src/prefs.c:441
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "Dezactiveaz _animaiile iconielor contactelor"
 
-#: src/prefs.c:444
+#: src/prefs.c:370
 msgid "Show _logins in window"
 msgstr "Arat autentificrile n _fereastr"
 
-#: src/prefs.c:446
+#: src/prefs.c:372
 msgid "Typing Notification"
 msgstr "Fereastr de notificare"
 
-#: src/prefs.c:447
+#: src/prefs.c:373
 msgid "Notify buddies that you are _typing to them"
 msgstr "Notific _contactele cnd le scriu"
 
-#: src/prefs.c:479
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "Completare automat cu \"Tab\""
 
-#: src/prefs.c:480
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "\"_Tab\" completeaz pseudonimele"
 
-#: src/prefs.c:481
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "Completare automat de stil _vechi"
 
-#: src/prefs.c:484
+#: src/prefs.c:410
 msgid "_Show people joining/leaving in window"
 msgstr "_Arat n fereastr persoanele ce intr sau ies"
 
-#: src/prefs.c:485
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr "_Coloreaz numele alese"
 
-#: src/prefs.c:501
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr "Taburi de chat"
 
-#: src/prefs.c:508
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+msgid "Tab _placement:"
+msgstr ""
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+#, fuzzy
+msgid "Top"
+msgstr "Topic:"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "Butoane"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:434
+#, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "Arat toate _mesajele n taburi separate"
 
-#: src/prefs.c:509
+#: src/prefs.c:435
 msgid "Show a_liases in tabs/titles"
 msgstr "Arat aliasurile n _taburi sau titluri"
 
-#: src/prefs.c:511
+#: src/prefs.c:437
 msgid "Chat Tabs"
 msgstr "Taburi de chat"
 
-#: src/prefs.c:518
+#: src/prefs.c:444
 msgid "Show all c_hats in one tabbed window"
 msgstr "Arat _chaturile ntr-o fereastr unic"
 
-#: src/prefs.c:521
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr "Taburi combinate"
 
-#: src/prefs.c:522
+#: src/prefs.c:448
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Arat totul n _aceeai fereastr n taburi."
 
-#: src/prefs.c:524
+#: src/prefs.c:450
 msgid "Buddy List Tabs"
 msgstr "Taburile listei de contacte"
 
-#: src/prefs.c:545
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "Tip Proxy"
 
-#: src/prefs.c:557
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Tip Proxy"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Proxy"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Server Proxy"
 
-#: src/prefs.c:570
+#: src/prefs.c:496
 msgid "_Host"
 msgstr "_Gazd"
 
-#: src/prefs.c:584
+#: src/prefs.c:510
 msgid "Port"
 msgstr "P_ort"
 
-#: src/prefs.c:600
+#: src/prefs.c:526
 msgid "_User"
 msgstr "_Utilizator"
 
-#: src/prefs.c:614
+#: src/prefs.c:540
 msgid "Pa_ssword"
 msgstr "_Parol"
 
-#: src/prefs.c:645
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr "Selecie navigator"
 
-#: src/prefs.c:674
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "Navigator"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr ""
+
+#: src/prefs.c:606
 msgid "Browser Options"
 msgstr "Opiuni navigator"
 
-#: src/prefs.c:675
+#: src/prefs.c:607
 msgid "Open new _window by default"
 msgstr "Deschide implicit o nou _fereastr"
 
-#: src/prefs.c:687
+#: src/prefs.c:622
 msgid "Message Logs"
 msgstr "nregistrri mesaje"
 
-#: src/prefs.c:688
-msgid "_Log all Instant Messages"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
 msgstr "nregistreaz toate _mesajele"
 
-#: src/prefs.c:689
+#: src/prefs.c:624
 msgid "Log all c_hats"
 msgstr "nregistreaz toate _chaturile"
 
-#: src/prefs.c:690
+#: src/prefs.c:625
 msgid "Strip _HTML from logs"
 msgstr "Nu include codul _HTML n nregistrri"
 
-#: src/prefs.c:692
+#: src/prefs.c:627
 msgid "System Logs"
 msgstr "Arat nregistrrile Gaim"
 
-#: src/prefs.c:693
+#: src/prefs.c:628
 msgid "Log when buddies _sign on/sign off"
 msgstr "nregistreaz (de)conectrile _contactelor"
 
-#: src/prefs.c:695
+#: src/prefs.c:630
 msgid "Log when buddies become _idle/un-idle"
 msgstr "nregistreaz schimbrile strii de _activitate"
 
-#: src/prefs.c:697
+#: src/prefs.c:632
 msgid "Log when buddies go away/come _back"
 msgstr "nregistreaz absenele i _revenirile contactelor"
 
-#: src/prefs.c:698
+#: src/prefs.c:633
 msgid "Log your _own signons/idleness/awayness"
 msgstr "nregistreaz _propriile evenimente de acest gen"
 
-#: src/prefs.c:700
+#: src/prefs.c:635
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Fiiere de nregistrare _individuale pentru autentificri"
 
-#: src/prefs.c:727
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "Opiuni sunet"
 
-#: src/prefs.c:728
+#: src/prefs.c:668
 msgid "_No sounds when you log in"
 msgstr "_Fr sunete la propria autentificare"
 
-#: src/prefs.c:729
+#: src/prefs.c:669
 msgid "_Sounds while away"
 msgstr "Utilizeaz sunete n _absen"
 
-#: src/prefs.c:731
+#: src/prefs.c:672
 msgid "Sound Method"
 msgstr "Sistemul de sunet"
 
-#: src/prefs.c:755
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "Sistemul de sunet"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "Eroare intern"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3372,181 +3951,245 @@
 "_Comand de sunet\n"
 "(%s pentru numele fiierului)"
 
-#: src/prefs.c:791
+#: src/prefs.c:732
 msgid "_Sending messages removes away status"
 msgstr "Iei din _absen la trimiterea unui mesaj"
 
-#: src/prefs.c:792
+#: src/prefs.c:733
 msgid "_Queue new messages when away"
 msgstr "n_coloneaz mesajele noi n absen"
 
-#: src/prefs.c:793
+#: src/prefs.c:734
 msgid "_Ignore new conversations when away"
 msgstr "_Ignor discuiile noi n absen"
 
-#: src/prefs.c:795
+#: src/prefs.c:736
 msgid "Auto-response"
 msgstr "Rspunsuri automate"
 
-#: src/prefs.c:798
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr "Secunde nainte de _retrimitere:"
 
-#: src/prefs.c:800
+#: src/prefs.c:741
 msgid "_Don't send auto-response"
 msgstr "_Nu trimite rspuns automat"
 
-#: src/prefs.c:801
+#: src/prefs.c:742
 msgid "_Only send auto-response when idle"
 msgstr "Trimite rspuns automat _doar cnd sunt inactiv"
 
-#: src/prefs.c:806
-msgid "Idle"
-msgstr "Inactiv"
-
-#: src/prefs.c:817
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "_Nu trimite rspuns automat"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "None"
+msgstr "Nu"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Gaim - Utilizator IM"
+
+#: src/prefs.c:754
+msgid "X usage"
+msgstr ""
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "nchidere ferestre"
+
+#: src/prefs.c:763
 msgid "Auto-away"
 msgstr "Absene automate"
 
+#: src/prefs.c:764
+msgid "Set away _when idle"
+msgstr "Treci n absen cnd sunt inacti_v"
+
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "Mesaje n absen"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
 #: src/prefs.c:818
-msgid "Set away _when idle"
-msgstr "Treci n absen cnd sunt inacti_v"
-
-#: src/prefs.c:932
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Configurare sunet"
 
-#: src/prefs.c:1038
+#: src/prefs.c:1217
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1046
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "Alegei..."
 
-#: src/prefs.c:1177
+#: src/prefs.c:1353
 msgid "_Edit"
 msgstr "_Editare"
 
-#: src/prefs.c:1211
+#: src/prefs.c:1391
 msgid "Interface"
 msgstr "Interfa"
 
-#: src/prefs.c:1212
+#: src/prefs.c:1392
 msgid "Fonts"
 msgstr "Caractere"
 
-#: src/prefs.c:1213
+#: src/prefs.c:1393
 msgid "Message Text"
 msgstr "Text mesaj"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr "Scurtturi"
 
-#: src/prefs.c:1216
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "Fereastr mesaje"
 
-#: src/prefs.c:1217
+#: src/prefs.c:1397
 msgid "Chat Window"
 msgstr "Fereastr chat"
 
-#: src/prefs.c:1218
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr "Taburi"
 
-#: src/prefs.c:1219
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1220
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "Navigator"
 
-#: src/prefs.c:1223
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "nregistrare"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr "Sunete"
 
-#: src/prefs.c:1224
+#: src/prefs.c:1404
 msgid "Sound Events"
 msgstr "Evenimente sonore"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1405
 msgid "Away / Idle"
 msgstr "Absen / Inactivitate"
 
-#: src/prefs.c:1226
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "Mesaje n absen"
 
-#: src/prefs.c:1282
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr "Extensii"
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferine"
 
-#: src/prefs.c:1406
-msgid "Gaim debug output window"
-msgstr "Fereastra de depanare Gaim"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "Fereastr de depanare"
+
+#: src/prpl.c:100
+#, fuzzy
+msgid "ICQ Protocol detected."
 msgstr "S-a detectat un protocol incompatibil"
 
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"not the same version I cannot safely tell you which one it was. Needless to "
-"say, it was not successfully loaded."
-msgstr ""
-"Ai ncercat s ncrcai o extensie care nu a fost compilat din aceeai "
-"versiune a surselor Gaim ca i restul aplicaiei. Din pcate nu pot nici s "
-"v spun care era acea versiune pentru c este diferit. Protocolul nu a "
-"iniializat cu succes."
-
-#: src/prpl.c:85
-msgid "Libicq.so detected."
-msgstr "Am detectat libicq.so."
-
-#: src/prpl.c:86
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
 "application was, and cannot be guaranteed to work.  It is recommended that "
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
-"Gaim a ncrcat extensia ICQ. Aceast extensie nu mai este de mult actualizat. "
-"Ca atare a fost probabil compilat cu o alt versiune a surselor i nu este "
-"garantat funcionarea ei. V recomandm utilizarea protocolului AIM/ICQ "
-"pentru a v conecta la ICQ."
-
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s a folosit %s, care a fost ters. %s este acum offline."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "Acceptai?"
-
-#: src/prpl.c:210
+"Gaim a ncrcat extensia ICQ. Aceast extensie nu mai este de mult "
+"actualizat. Ca atare a fost probabil compilat cu o alt versiune a "
+"surselor i nu este garantat funcionarea ei. V recomandm utilizarea "
+"protocolului AIM/ICQ pentru a v conecta la ICQ."
+
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "Gaim - ntrebare"
 
-#: src/prpl.c:429
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - Mail nou"
 
-#: src/prpl.c:454
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "Arat mailul"
 
-#: src/prpl.c:579
+#: src/prpl.c:626
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s l-a fcut pe %s contactul su%s%s%s"
 
-#: src/prpl.c:587
+#: src/prpl.c:634
 msgid ""
 "\n"
 "\n"
@@ -3556,90 +4199,416 @@
 "\n"
 "Dorii s-l adugai listei de contacte?"
 
-#: src/prpl.c:630
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 "Nu avei nici un protocol disponibil pentru a putea nregistra noi conturi."
 
-#: src/prpl.c:667
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr "Gaim - nregistrare"
 
-#: src/prpl.c:681
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr "Informaii de nregistrare"
 
-#: src/prpl.c:698
+#: src/prpl.c:745
 msgid "Register"
 msgstr "nregistrare"
 
-#: src/server.c:52
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Introducei v rog parola"
 
-#: src/server.c:604
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d mesaje)"
 
-#: src/server.c:610
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 mesaj)"
 
-#: src/server.c:894
+#: src/server.c:966
 msgid "Yes"
 msgstr "Da"
 
-#: src/server.c:895
+#: src/server.c:967
 msgid "No"
 msgstr "Nu"
 
-#: src/server.c:1093
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Mai multe detalii"
 
-#: src/sound.c:63
+#: src/sound.c:68
 msgid "Buddy logs in"
 msgstr "Un contact se conecteaz"
 
-#: src/sound.c:64
+#: src/sound.c:69
 msgid "Buddy logs out"
 msgstr "Un contact de deconecteaz"
 
-#: src/sound.c:65
+#: src/sound.c:70
 msgid "Message received"
 msgstr "Mesaj primit"
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr "Mesajul primit ncepe o discuie"
 
-#: src/sound.c:67
+#: src/sound.c:72
 msgid "Message sent"
 msgstr "Mesaj trimis"
 
-#: src/sound.c:68
+#: src/sound.c:73
 msgid "Person enters chat"
 msgstr "Cineva intr n chat"
 
-#: src/sound.c:69
+#: src/sound.c:74
 msgid "Person leaves chat"
 msgstr "Cineva iese din chat"
 
-#: src/sound.c:70
+#: src/sound.c:75
 msgid "You talk in chat"
 msgstr "Spunei ceva ntr-un chat"
 
-#: src/sound.c:71
+#: src/sound.c:76
 msgid "Others talk in chat"
 msgstr "Alii spun ceva ntr-un chat"
 
-#: src/sound.c:74
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr "Cineva v spune numele ntr-un chat"
 
+#~ msgid "There is no such nick or channel on this IRC channel."
+#~ msgstr "Nu exist un asemenea pseudonim sau canal pe acest server IRC."
+
+#~ msgid "There is no such IRC Server"
+#~ msgstr "Nu exist un asemenea server IRC"
+
+#~ msgid ""
+#~ "%s has requested a DCC chat.  Would you like to establish the direct "
+#~ "connection?"
+#~ msgstr "%s a cerut un chat DCC. Dorii s stabilii o conexiune direct?"
+
+#~ msgid " for updates."
+#~ msgstr " pentru versiuni mai noi."
+
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "Ai pierdut %d mesaje de la %s pentru erau prea indecente."
+
+#~ 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 ""
+#~ "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon."
+#~ "gif\"> : Utilizator AIM obinuit<br><IMG SRC=\"aol_icon.gif\"> : "
+#~ "Utilizator AOL <br><IMG SRC=\"dt_icon.gif\"> : Utilizator AIM de prob "
+#~ "<br><IMG SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon."
+#~ "gif\"> : Agent interactiv ActiveBuddy<br><IMG SRC=\"wireless_icon.gif"
+#~ "\"> : Utilizator de dispozitiv fr fir<br>"
+
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Autorizarea ICQ v-a fost acordat"
+
+#~ 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 ""
+#~ "Ai ales s deschidei o conexiune direct cu %s. Fcnd asta vei "
+#~ "permite s v fie vzut adresa IP, ceea ce poate fi un risc de "
+#~ "securitate. Dorii s continuai?"
+
+#~ msgid ""
+#~ "Active Developers\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder) [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Crazy Patch Writers\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Retired Developers\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author) [ markster@marko.net ]"
+#~ msgstr ""
+#~ "Dezvoltatori activi\n"
+#~ "====================\n"
+#~ "Rob Flynn (coordonator) [ rob@marko.net ]\n"
+#~ "Sean Egan (programator) [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Contributori\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Dezvoltatori ce s-au retras\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven            [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (primul autor) [ markster@marko.net ]"
+
+#~ msgid "Web Site"
+#~ msgstr "Adres Web"
+
+#~ msgid "Password: "
+#~ msgstr "Parol: "
+
+#~ msgid "New Instant Message"
+#~ msgstr "Nou mesaj"
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr "ncarc un script"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "Deactiveaz toate scripturile"
+
+#~ msgid "List Scripts"
+#~ msgstr "Arat scripturile"
+
+#~ msgid "Whisper"
+#~ msgstr "optete"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Salveaz discuia"
+
+#~ msgid "Currently at %d, "
+#~ msgstr "Momentan n %d, "
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "Setez poziia n %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr "Text ngroat"
+
+#~ msgid "Bold"
+#~ msgstr "Gras"
+
+#~ msgid "Italics Text"
+#~ msgstr "Text nclinat"
+
+#~ msgid "Italics"
+#~ msgstr "nclinat"
+
+#~ msgid "Underline Text"
+#~ msgstr "Text subliniat"
+
+#~ msgid "Underline"
+#~ msgstr "Subliniat"
+
+#~ msgid "Strike through Text"
+#~ msgstr "Text cu linie peste"
+
+#~ msgid "Strike"
+#~ msgstr "Linie"
+
+#~ msgid "Decrease font size"
+#~ msgstr "Micoreaz caracterele"
+
+#~ msgid "Small"
+#~ msgstr "Mici"
+
+#~ msgid "Normal font size"
+#~ msgstr "Mrimea normal a caracterelor"
+
+#~ msgid "Normal"
+#~ msgstr "Normale"
+
+#~ msgid "Increase font size"
+#~ msgstr "Mrete mrimea caracterelor"
+
+#~ msgid "Big"
+#~ msgstr "Mari"
+
+#~ msgid "Font"
+#~ msgstr "Caractere"
+
+#~ msgid "Text Color"
+#~ msgstr "Culoarea textului"
+
+#~ msgid "Background Color"
+#~ msgstr "Culoarea fundalului"
+
+#~ msgid "Link"
+#~ msgstr "Adres"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "Introducei o iconi simbolic"
+
+#~ msgid "Smiley"
+#~ msgstr "Iconi simbolic"
+
+#~ msgid "Image"
+#~ msgstr "Imagine"
+
+#~ msgid "Show Log Viewer"
+#~ msgstr "Arat nregistrrile"
+
+#~ msgid "Viewer"
+#~ msgstr "Vizualizator"
+
+#~ msgid "Toggle Sound"
+#~ msgstr "(De)activeaz sunetul"
+
+#~ msgid "Sound"
+#~ msgstr "Sunet"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - Avertizai utilizatorul?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "Chiar dorii s-l avertizai pe %s"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - l terg pe %s?"
+
+#~ msgid "Remove Buddy"
+#~ msgstr "tergere contact"
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "Suntei pe cale s tergei pe '%s' din\n"
+#~ "lista de contacte. Dorii s continuai?"
+
+#~ msgid "IM who:"
+#~ msgstr "Mesaj pentru:"
+
+#~ msgid "User:"
+#~ msgstr "Utilizator:"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim - Obinere detalii"
+
+#~ msgid "Add Group"
+#~ msgstr "Adaug grup"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Adaug contact"
+
+#~ msgid "Contact"
+#~ msgstr "Contact"
+
+#~ msgid "Allow List"
+#~ msgstr "Liste celor permii"
+
+#~ msgid "Block List"
+#~ msgstr "Lista celor respini"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "Alias contact"
+
+#~ msgid "Rename Group"
+#~ msgstr "Redenumire grup"
+
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim nu a putut deactiva aceast extensie."
+
+#~ msgid "Select All"
+#~ msgstr "Selecteaz tot"
+
+#~ msgid "Select Autos"
+#~ msgstr "Cele automate"
+
+#~ msgid "Select None"
+#~ msgstr "Deselecteaz"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "(De)conectare"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim - Lista extensiilor"
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - Extensii"
+
+#~ msgid "Loaded Plugins"
+#~ msgstr "Extensii ncrcate"
+
+#~ msgid "Selected Plugin"
+#~ msgstr "Extensia selectat"
+
+#~ msgid "Filepath:"
+#~ msgstr "Calea fiierului:"
+
+#~ msgid "Load"
+#~ msgstr "ncarc"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "ncarc o extensie dintr-un fiier"
+
+#~ msgid "Configure"
+#~ msgstr "Configurare"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "Configurarea setrilor pentru extensia selectat"
+
+#~ msgid "Reload"
+#~ msgstr "Rencarc"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "Rencarc extensia selectat"
+
+#~ msgid "Unload"
+#~ msgstr "Deactiveaz"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "Deactiveaz extensia selectat"
+
+#~ msgid "Close this window"
+#~ msgstr "nchide aceast fereastr"
+
+#~ msgid "Use _borderless buttons"
+#~ msgstr "Utilizeaz _butoane neevideniate"
+
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "Ignor mesajele automate Ti_K"
+
+#~ msgid "_Raise Window on Events"
+#~ msgstr "_Ridic fereastra deasupra la evenimente noi"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Fereastra de depanare Gaim"
+
+#~ 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 ""
+#~ "Ai ncercat s ncrcai o extensie care nu a fost compilat din aceeai "
+#~ "versiune a surselor Gaim ca i restul aplicaiei. Din pcate nu pot nici "
+#~ "s v spun care era acea versiune pentru c este diferit. Protocolul nu "
+#~ "a iniializat cu succes."
+
+#~ msgid "Libicq.so detected."
+#~ msgstr "Am detectat libicq.so."
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s a folosit %s, care a fost ters. %s este acum offline."
+
+#~ msgid "Accept?"
+#~ msgstr "Acceptai?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Eroare Gadu-Gadu"
 
@@ -3664,18 +4633,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "Schimbarea parolei a euat (%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "Nu exist un asemenea pseudonim/canal"
-
-#~ msgid "IRC Error"
-#~ msgstr "Eroare IRC"
-
-#~ msgid "No such server"
-#~ msgstr "Nu exist un asemenea server"
-
-#~ msgid "IRC Part"
-#~ msgstr "Iei din canal"
-
 #~ msgid "Incorrect current password! Password NOT Changed!"
 #~ msgstr "Parol curent incorect! Parola NU a fost schimbat"
 
@@ -3694,9 +4651,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "Eroare MSN"
 
-#~ msgid "Invalid name"
-#~ msgstr "Nume invalid"
-
 #~ msgid "Chat Error!"
 #~ msgstr "Eroare de chat!"
 
@@ -3712,9 +4666,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "Motiv necunoscut"
 
-#~ msgid "AOL error"
-#~ msgstr "Eroare AOL"
-
 #~ msgid "Error"
 #~ msgstr "Eroare"
 
@@ -3793,9 +4744,6 @@
 #~ msgid "Edit"
 #~ msgstr "Editare"
 
-#~ msgid "Apply"
-#~ msgstr "Aplic"
-
 #~ msgid "Protocol Error"
 #~ msgstr "Eroare de protocol"
 
--- a/po/ru.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/ru.po	Sun Jan 05 23:21:50 2003 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\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,361 +13,534 @@
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr ""
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr ""
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+#, fuzzy
+msgid "Auto-login"
+msgstr " "
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr " "
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr ""
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr " "
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr " "
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr ""
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim -  "
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr " "
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr ""
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 #, fuzzy
 msgid "Gaim Chat"
 msgstr "Gaim - "
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr ""
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 #, fuzzy
 msgid "Chat Rooms"
 msgstr " "
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr ""
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr ""
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr ""
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr ""
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr ""
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr ""
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr ""
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr ""
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 #, fuzzy
 msgid "(No"
 msgstr ""
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 #, fuzzy
 msgid "Change"
 msgstr ":"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "   %s"
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "%s  "
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr " "
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr " "
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr " "
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr " "
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "   "
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr ""
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "      c "
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr ""
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr ""
-
-#: 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 "Away for friends only"
+msgstr "   "
+
+#: src/protocols/gg/gg.c:77
+msgid "Invisible"
+msgstr ""
+
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr ""
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "    ."
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "    ."
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "  "
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "    ."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 #, fuzzy
 msgid "Error while writing to socket."
 msgstr "    "
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 #, fuzzy
 msgid "Authentication failed."
 msgstr " "
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "  "
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr ":"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Gadu - Gadu"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "   "
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr " "
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr " "
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "    GG\n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "    ."
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "  "
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr " GG "
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "  Gadu-Gadu UIN"
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "  %s "
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "    ."
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "  "
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr " GG "
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "  Gadu-Gadu UIN"
+
+#: src/protocols/gg/gg.c:604
 #, fuzzy
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "     Gadu-Gadu UIN!"
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "  Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr ""
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr ""
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr ""
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr ""
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr " "
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr ""
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr ""
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "     ."
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "     "
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "    ."
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "     "
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "     "
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "     "
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr " "
 
@@ -375,166 +548,301 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr " "
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "    %s"
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr ":"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Gadu - Gadu"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "   "
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr " "
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr " Gaim"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "   %s "
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr " "
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s   : %s</B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "  "
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr " IRC"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "  /"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr " IRC"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "  "
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
 msgstr "  "
 
-#: src/protocols/irc/irc.c:976
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 msgid ""
-"%s has requested a DCC chat.  Would you like to establish the direct "
-"connection?"
-msgstr "%s    DCC chat.    ?"
-
-#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "."
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr " "
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "    %s: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "  %s: %s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "  "
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "  %s"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "IRC"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr ":"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC "
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr ":"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 #, fuzzy
 msgid "Unknown"
 msgstr " ICQ"
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr " \"\""
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -542,591 +850,791 @@
 "\n"
 "   ?"
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "."
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "  "
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 #, fuzzy
 msgid "Jabber Error"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr ":"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 #, fuzzy
 msgid "Chats"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 #, fuzzy
 msgid "View Error Msg"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr " "
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "e-mail"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "   .   ."
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim -  Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr " !"
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "   "
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 #, fuzzy
 msgid "Invalid User"
 msgstr " "
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr ""
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 #, fuzzy
 msgid "Invalid Username"
 msgstr " "
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 #, fuzzy
 msgid "Invalid Friendly Name"
 msgstr " "
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 #, fuzzy
 msgid "Not on list"
 msgstr " "
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 #, fuzzy
 msgid "Not logged in"
 msgstr "%s  "
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 #, fuzzy
 msgid "Internal server error"
 msgstr " "
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 #, fuzzy
 msgid "File operation error"
 msgstr "  \n"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "  \n"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 #, fuzzy
 msgid "Server busy"
 msgstr ":"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 #, fuzzy
 msgid "Server unavailable"
 msgstr ""
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 #, fuzzy
 msgid "Database connect error"
 msgstr "  \n"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 #, fuzzy
 msgid "Error creating connection"
 msgstr "g003:   .\n"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 #, fuzzy
 msgid "Too many sessions"
 msgstr "  ."
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 #, fuzzy
 msgid "Authentication failed"
 msgstr " "
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 #, fuzzy
 msgid "Not allowed when offline"
 msgstr "   "
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 #, fuzzy
 msgid "Unknown Error Code"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim   "
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr " AOL"
+
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "    ."
+
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1179
+#: src/protocols/msn/msn.c:1401
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "      ."
 
-#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 #, fuzzy
 msgid "Error reading from server"
 msgstr "    ."
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "    ."
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "    ."
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "   "
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "   AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "  :   "
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 #, fuzzy
 msgid "Unable to send password"
 msgstr "   "
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 #, fuzzy
 msgid "Password sent"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1752
-#, fuzzy
-msgid "Unable to write to server"
-msgstr "    ."
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr " "
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "  :   "
+
+#: src/protocols/msn/msn.c:1974
 #, fuzzy
 msgid "Synching with server"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 #, fuzzy
 msgid "Busy"
 msgstr "(UIN)"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 #, fuzzy
 msgid "Hidden"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+msgid "Be right back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2430
+msgid "Away from the computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2432
+msgid "On the phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2434
+msgid "Out to lunch"
+msgstr ""
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr " "
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr " "
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "UIN"
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr " "
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr " "
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "  ."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "  (rend)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "  \n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr " ."
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "    %s."
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "    "
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr " ,  \n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "  \n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "   AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr ": %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr ".\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr " ,  "
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "    ."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "   ."
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "   ."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1136,46 +1644,87 @@
 "."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "     ."
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim   "
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim   "
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+msgid "Transfer timed out"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "     %s."
+
+#: src/protocols/oscar/oscar.c:1632
+msgid "File transfer aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr ""
+"\n"
+"\n"
+"   ?"
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+#, fuzzy
+msgid "No reason given."
+msgstr "  "
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr " "
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1183,228 +1732,259 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-#, fuzzy
-msgid "No reason given."
-msgstr "  "
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1587
-#, c-format
-msgid "You missed %d message from %s because it was invalid."
-msgstr "   %d   %s,  ."
-
-#: src/protocols/oscar/oscar.c:1588
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
-msgstr "   %d  %s,  ."
-
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:2141
 #, c-format
-msgid "You missed %d message from %s because it was too large."
-msgstr "   %d   %s,  ."
-
-#: src/protocols/oscar/oscar.c:1598
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
-msgstr "   %d   %s,    ."
-
-#: src/protocols/oscar/oscar.c:1607
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
-msgstr ""
-"   %d   %s,    ."
-
-#: src/protocols/oscar/oscar.c:1608
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
 #, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
+#, c-format
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"   ?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "   %d   %s,  ."
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "   %d  %s,  ."
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgstr "   %d   %s,  ."
+
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
+msgstr "   %d   %s,    ."
+
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
 msgstr ""
 "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1617
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
-msgstr "   %d   %s,    ."
-
-#: src/protocols/oscar/oscar.c:1618
-#, c-format
-msgid "You missed %d messages from %s because they are too evil."
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
+msgid ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr ""
+"   %d   %s,    ."
+
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
 msgstr "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1627
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
+msgstr "   %d   %s,    ."
+
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
 msgstr "   %d   %s,   ."
 
-#: src/protocols/oscar/oscar.c:1628
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr "   %d   %s,   ."
 
-#: src/protocols/oscar/oscar.c:1636
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "   %d   %s   ."
 
-#: src/protocols/oscar/oscar.c:1637
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "   %d   %s   ."
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2342
+#, c-format
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1707
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1736
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC  : %s\n"
 
-#: src/protocols/oscar/oscar.c:1755
-#, c-format
-msgid "Your message to %s did not get sent: %s"
-msgstr "   %s  : %s"
-
-#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "  "
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "   %s  : %s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "   %s : %s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "IM "
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr " "
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "EvryBuddy Bug"
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr " ICQ Server'"
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr " ICQ"
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr " Trillian"
 
-#: src/protocols/oscar/oscar.c:1886
+#: src/protocols/oscar/oscar.c:2655
 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 ""
-"<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
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "UIN:<B>%s</B. %s <BR>\n"
 " :<B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>     </i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr " :"
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>  </i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "   ."
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
@@ -1413,205 +1993,269 @@
 "   ,  .  10   "
 "  ."
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr " "
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr " "
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "g003:   .\n"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "a "
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "    %s"
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim   "
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, 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:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "   "
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4621
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
 #, 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:3586
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4642
 #, 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:3593
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3618
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4667
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "   "
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr " "
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "   %s"
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "    %s"
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr " ,  %s  "
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s  "
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr " %s ."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "  ,      ."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "  %s "
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "    %s  ."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "     %s,   ."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "     %s,   ."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr " ."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "  ."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "  ."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr " email ."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "  ."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "  ."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "   ."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "    ."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr " : %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "   ."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "     ."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1620,38 +2264,38 @@
 "  .         "
 "."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "   : %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, fuzzy, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr " , %d.  : %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr " "
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr " ..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC  .     "
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "  "
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -1663,283 +2307,254 @@
 ". Gaim     .    - "
 " ."
 
-#: src/protocols/toc/toc.c:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr " "
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "    !"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "    !"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "    !"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim -  ..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, 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:1963
+#: src/protocols/toc/toc.c:1980
 #, 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:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s   "
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "     "
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr ":"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr " Gaim %s "
 
-#: src/about.c:135
+#: src/about.c:112
 #, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim     AOL Instant Messenger. \n"
 "  c   GTK+  \n"
 "   GPL.\n"
 "URL: "
 
-#: src/about.c:137
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
+#: src/about.c:122
+#, fuzzy
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "\n"
 "\n"
 "IRC: #gaim on irc.openprojects.net"
 
-#: src/about.c:147
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-msgstr ""
-" \n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"  \n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"  \n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr " "
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr " "
-
-#: src/aim.c:162
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr ""
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr ",   "
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - "
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "UIN"
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr ""
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr ""
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr " "
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr ""
-
-#: src/aim.c:354
-msgid "About"
-msgstr " ..."
-
-#: src/aim.c:355
-msgid "Options"
-msgstr ""
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr ""
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr ""
-
-#: src/aim.c:841 src/multi.c:1481
-#, fuzzy
-msgid "Auto-login"
-msgstr " "
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - !"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "!"
 
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr ""
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "   "
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "   "
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "  \"\""
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr ""
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr " "
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr ""
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr " "
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr ""
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 )"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[]"
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr ": %d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1950,947 +2565,880 @@
 " : %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr " "
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s  "
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s "
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "  "
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr " "
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr ""
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "!"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - C "
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr ""
 
-#: src/buddy.c:2667
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr " "
 
-#: src/buddy.c:2669
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr "  "
 
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr " "
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "   "
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr "  "
 
-#: src/buddy.c:2678
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "  "
 
-#: src/buddy.c:2696
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr " "
+
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2706
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr " "
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr ""
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr ""
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr ""
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "  "
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr " "
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "  "
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr " "
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 #, fuzzy
 msgid "Online Help"
 msgstr " "
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 #, fuzzy
 msgid "Debug Window"
 msgstr "  "
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr " "
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr " "
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "  "
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "  "
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "  /"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr " "
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - C "
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "  "
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "   :"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr ""
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "(UIN)"
 
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr ""
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim -    "
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr ""
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s   "
 
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s    "
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s    "
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s  %s"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s    (%s)"
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s   "
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - "
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr ""
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0    "
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr ""
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
-msgid "Block"
-msgstr ""
-
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr ""
 
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim -  "
-
-#: src/conversation.c:492
+#: src/buddy_chat.c:1592 src/conversation.c:2925
+msgid "Block"
+msgstr ""
+
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim -  "
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "  :   "
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "  :   "
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr "   %d,"
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "   %d\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr ""
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr ""
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr ""
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr ""
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr ""
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr ""
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr " "
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr ""
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr " "
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr ""
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "   "
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr ""
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr " "
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr ""
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr " "
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr ""
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr " "
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr ""
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr " "
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr " "
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr " "
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr ""
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr " "
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr ""
-
-#: src/conversation.c:2272
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr " IM "
 
-#: src/conversation.c:2272
-msgid "Image"
-msgstr ""
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr ""
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr ""
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr " "
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr ""
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr " "
-
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr ""
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
-msgstr ""
-
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr ""
-
-#: src/conversation.c:2782
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr " "
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "  :"
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim -  "
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr " "
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr " "
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr " "
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "  ..."
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "  ?"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "    %s?"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr " ?"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "   ."
 
-#: src/dialogs.c:471
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr " '%s'   .\n"
 
-#: src/dialogs.c:496
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim -  %s?"
-
-#: src/dialogs.c:509
-msgid "Remove Buddy"
-msgstr " "
-
-#: src/dialogs.c:519
-#, c-format
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr " (UIN)"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
+msgstr "a "
+
+#: src/dialogs.c:804
 msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
-msgstr ""
-"  '%s' \n"
-"  ?"
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr ""
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - "
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr " (UIN):"
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "(UIN):"
-
-#: src/dialogs.c:816
-#, fuzzy
-msgid "Account:"
-msgstr "a "
-
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "  "
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr " "
-
-#: src/dialogs.c:1004
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr ""
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr " "
-
-#: src/dialogs.c:1110
-msgid "Contact"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
 msgstr "UIN"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr " "
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - !"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
-msgstr ""
-
-#: src/dialogs.c:1451
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "  :"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "   "
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "   "
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "   "
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr " "
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "   "
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "    ' '"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "' '"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr " "
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim -  "
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "a "
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr " "
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "  "
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "  "
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "  "
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "   "
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "  "
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "  "
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr " "
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr " "
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "   "
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "   "
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "  "
 
-#: src/dialogs.c:1971
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr ""
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr ""
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr " "
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "   web    ."
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr ""
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr ""
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr ""
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr " "
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "/"
 
-#: src/dialogs.c:2126
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr ""
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr " "
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "  "
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr " "
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr " "
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "  ( )"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "OK"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr " "
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr ""
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr " "
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim -   Email"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr " "
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "  "
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr " "
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr ":"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim -   "
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "      "
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "     "
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "  "
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "  "
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr " "
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "    "
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - "
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "     %s."
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "  ?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr ""
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr " "
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
-msgid "New name:"
-msgstr " (UIN):"
-
-#: src/dialogs.c:4484
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:4494
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr " "
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr " (UIN):"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim -   Perl"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "     %s."
 
-#: src/html.c:183
+#: src/html.c:185
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
 msgstr ": '%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003:   .\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim   "
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr " (UIN)"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr ""
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim -   "
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "  :"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr ""
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr ""
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr " (UIN)"
 
-#: src/multi.c:559
+#: src/multi.c:653
 #, fuzzy
 msgid "Alias:"
 msgstr ""
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr ""
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr " "
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr " "
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "   "
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr " Proxy"
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "   "
+
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr ""
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "  "
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - "
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr " "
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr ""
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr ""
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr ""
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2899,40 +3447,45 @@
 "    ,\n"
 "     ."
 
-#: src/multi.c:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "   %s?"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr ""
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim -  "
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr " "
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr ""
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr ""
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr ""
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "/"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr ""
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr ""
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr ": %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim -  "
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr ""
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -2941,533 +3494,555 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s  "
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr " "
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s "
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr " "
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim -  "
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - "
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-msgid "Loaded Plugins"
-msgstr " "
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr " "
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr ""
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr ""
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "   "
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr ""
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "  "
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr ""
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "  "
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr ""
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "  "
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr " "
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr " "
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "  "
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr " "
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "/"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr ""
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr ""
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr ""
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr " "
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr ""
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr " "
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr " "
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr ""
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr " "
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr " "
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr ""
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "  "
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "  "
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr " URL  "
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr " "
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr " "
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "  "
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "  "
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "  "
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "Enter  "
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl-Enter  "
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr " "
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "Esc  "
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "Esc  "
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Ctrl-{B/I/U/S}   HTML "
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "Ctrl-()  "
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr ""
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr " "
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "   "
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "  "
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr " / "
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "-   "
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr ""
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "   (  Ofline)"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "  "
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr ""
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 #, fuzzy
 msgid "Show buddy type _icons"
 msgstr "  "
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "  "
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "  "
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 #, fuzzy
 msgid "Grey i_dle buddies"
 msgstr " "
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr " "
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "  :"
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr ""
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr ""
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "  "
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "  "
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "  "
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "  "
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "-   "
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "   "
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr " "
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "  "
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr " "
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr " "
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr " "
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "     "
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr " "
 
-#: src/prefs.c:505
-#, fuzzy
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "Tab -  "
 
-#: src/prefs.c:506
-#, fuzzy
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "  "
 
-#: src/prefs.c:509
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr " /   "
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr " :"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr ""
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr ""
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "       "
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 #, fuzzy
 msgid "Show a_liases in tabs/titles"
 msgstr "   "
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr ""
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "       "
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "     "
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr " "
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr " Proxy"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr " Proxy"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr " "
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Proxy "
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr ""
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr ""
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr ""
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr ""
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr ""
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr ""
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr " Proxy"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "    "
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr ""
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr " "
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "  "
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr " HTML     "
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "  "
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr " / "
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "  /"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr " -  /"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "    //"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "  "
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr " "
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "   "
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "   "
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr " "
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr " "
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr " "
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3476,161 +4051,229 @@
 "  \n"
 "(%s    )"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "      "
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr ""
 "   \n"
 " "
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr ""
 "     \n"
 ""
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "  "
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "  "
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "  "
 
-#: src/prefs.c:828
-#, fuzzy
-msgid "Idle"
-msgstr " "
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "  "
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr ""
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr " Gaim"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr " X"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr " "
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr ""
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "  (Away)"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim -  "
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 msgid "Test"
 msgstr ""
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr ""
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr ""
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 #, fuzzy
 msgid "Interface"
 msgstr ":"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr ""
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr " "
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr " "
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr ""
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr ""
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr ""
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "  (Away)"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr ""
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "  Gaim"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
-msgstr ""
-
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"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:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "  "
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3638,33 +4281,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s  %s,  . %s ."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "Gaim - "
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim -  "
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr " "
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, 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:590
+#: src/prpl.c:634
 #, fuzzy
 msgid ""
 "\n"
@@ -3675,93 +4313,405 @@
 "\n"
 "   ?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "      ."
 
-#: src/prpl.c:670
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr "Gaim - "
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 msgid "Register"
 msgstr ""
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr ",  "
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d )"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 )"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr ""
 
-#: src/server.c:1101
+#: src/server.c:1163
 msgid "More Info"
 msgstr " "
 
-#: src/sound.c:63
+#: src/sound.c:68
 #, fuzzy
 msgid "Buddy logs in"
 msgstr " "
 
-#: src/sound.c:64
+#: src/sound.c:69
 #, fuzzy
 msgid "Buddy logs out"
 msgstr " "
 
-#: src/sound.c:65
+#: src/sound.c:70
 #, fuzzy
 msgid "Message received"
 msgstr " "
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr ""
 
-#: src/sound.c:67
+#: src/sound.c:72
 #, fuzzy
 msgid "Message sent"
 msgstr ""
 
-#: src/sound.c:68
+#: src/sound.c:73
 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 "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:75
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:76
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid ""
+#~ "%s has requested a DCC chat.  Would you like to establish the direct "
+#~ "connection?"
+#~ msgstr "%s    DCC chat.    ?"
+
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "   %d   %s,    ."
+
+#~ 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 ""
+#~ "<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>\""
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr " "
+
+#~ 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 ,      .   ?"
+
+#~ msgid ""
+#~ "Active Developers\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Crazy Patch Writers\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Retired Developers\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+#~ msgstr ""
+#~ " \n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "  \n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "  \n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+
+#~ msgid "Web Site"
+#~ msgstr " "
+
+#~ msgid "Password: "
+#~ msgstr ""
+
+#~ msgid "About"
+#~ msgstr " ..."
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr " "
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "  "
+
+#~ msgid "List Scripts"
+#~ msgstr " "
+
+#~ msgid "Whisper"
+#~ msgstr ""
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim -  "
+
+#~ msgid "Currently at %d, "
+#~ msgstr "   %d,"
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "   %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr ""
+
+#~ msgid "Bold"
+#~ msgstr ""
+
+#~ msgid "Italics Text"
+#~ msgstr ""
+
+#~ msgid "Italics"
+#~ msgstr ""
+
+#~ msgid "Underline Text"
+#~ msgstr ""
+
+#~ msgid "Underline"
+#~ msgstr ""
+
+#~ msgid "Strike through Text"
+#~ msgstr " "
+
+#~ msgid "Strike"
+#~ msgstr ""
+
+#~ msgid "Decrease font size"
+#~ msgstr " "
+
+#~ msgid "Small"
+#~ msgstr ""
+
+#~ msgid "Normal font size"
+#~ msgstr "   "
+
+#~ msgid "Normal"
+#~ msgstr ""
+
+#~ msgid "Increase font size"
+#~ msgstr " "
+
+#~ msgid "Big"
+#~ msgstr ""
+
+#~ msgid "Font"
+#~ msgstr ""
+
+#~ msgid "Text Color"
+#~ msgstr " "
+
+#~ msgid "Background Color"
+#~ msgstr " "
+
+#~ msgid "Link"
+#~ msgstr ""
+
+#~ msgid "Insert smiley face"
+#~ msgstr " "
+
+#~ msgid "Smiley"
+#~ msgstr ""
+
+#~ msgid "Image"
+#~ msgstr ""
+
+#~ msgid "Sound"
+#~ msgstr ""
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "  ?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "    %s?"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim -  %s?"
+
+#~ msgid "Remove Buddy"
+#~ msgstr " "
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "  '%s' \n"
+#~ "  ?"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - "
+
+#~ msgid "IM who:"
+#~ msgstr " (UIN):"
+
+#~ msgid "User:"
+#~ msgstr "(UIN):"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "  "
+
+#~ msgid "Add Group"
+#~ msgstr " "
+
+#~ msgid "Add Buddy"
+#~ msgstr " "
+
+#~ msgid "Contact"
+#~ msgstr "UIN"
+
+#~ msgid "Allow List"
+#~ msgstr " "
+
+#~ msgid "Block List"
+#~ msgstr "' '"
+
+#~ msgid "Alias Buddy"
+#~ msgstr " "
+
+#~ msgid "Rename Group"
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim   "
+
+#~ msgid "Select All"
+#~ msgstr " "
+
+#~ msgid "Select Autos"
+#~ msgstr ""
+
+#~ msgid "Select None"
+#~ msgstr ""
+
+#~ msgid "Sign On/Off"
+#~ msgstr "/"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim -  "
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - "
+
+#~ msgid "Loaded Plugins"
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr " "
+
+#~ msgid "Filepath:"
+#~ msgstr ""
+
+#~ msgid "Load"
+#~ msgstr ""
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "   "
+
+#~ msgid "Configure"
+#~ msgstr ""
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "  "
+
+#~ msgid "Reload"
+#~ msgstr ""
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "  "
+
+#~ msgid "Unload"
+#~ msgstr ""
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "  "
+
+#~ msgid "Close this window"
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "  "
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "-   "
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "  Gaim"
+
+#~ 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 ""
+#~ "    ,      "
+#~ "  .  , -      "
+#~ " ."
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s  %s,  . %s ."
+
+#~ msgid "Accept?"
+#~ msgstr "?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Gaim -  Gadu"
 
@@ -3786,18 +4736,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "   (%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "  /"
-
-#~ msgid "IRC Error"
-#~ msgstr " IRC"
-
-#~ msgid "No such server"
-#~ msgstr "  "
-
-#~ msgid "IRC Part"
-#~ msgstr "IRC"
-
 #, fuzzy
 #~ msgid "Password Change Error!"
 #~ msgstr "Gaim -  "
@@ -3813,9 +4751,6 @@
 #~ msgid "MSN Error"
 #~ msgstr " MSN"
 
-#~ msgid "Invalid name"
-#~ msgstr " "
-
 #~ msgid "Chat Error!"
 #~ msgstr " !"
 
@@ -3831,9 +4766,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr " "
 
-#~ msgid "AOL error"
-#~ msgstr " AOL"
-
 #~ msgid "Error"
 #~ msgstr ""
 
@@ -3936,15 +4868,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "   "
 
-#~ msgid "None"
-#~ msgstr ""
-
-#~ msgid "Gaim Use"
-#~ msgstr " Gaim"
-
-#~ msgid "X Use"
-#~ msgstr " X"
-
 #~ msgid "Opera"
 #~ msgstr "Opera"
 
@@ -3964,9 +4887,6 @@
 #~ "       .\n"
 #~ "  README     ."
 
-#~ msgid "No Proxy"
-#~ msgstr " "
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -3979,12 +4899,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "  "
 
-#~ msgid "Tab Placement:"
-#~ msgstr " :"
-
-#~ msgid "Top"
-#~ msgstr ""
-
 #~ msgid "Conversation Options"
 #~ msgstr " "
 
@@ -4000,42 +4914,18 @@
 #~ msgid "IM Options"
 #~ msgstr " "
 
-#~ msgid "Show buttons as: "
-#~ msgstr "  :"
-
-#~ msgid "Pictures And Text"
-#~ msgstr "  "
-
-#~ msgid "Pictures"
-#~ msgstr ""
-
-#~ msgid "Text"
-#~ msgstr ""
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "      c "
-
 #~ msgid "Window Sizes"
 #~ msgstr " "
 
 #~ msgid "Tab Placement"
 #~ msgstr "  "
 
-#~ msgid "Left"
-#~ msgstr ""
-
-#~ msgid "Right"
-#~ msgstr ""
-
 #~ msgid "Chat Options"
 #~ msgstr " "
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "     "
 
-#~ msgid "Font Options"
-#~ msgstr ""
-
 #~ msgid "Italic Text"
 #~ msgstr " "
 
@@ -4069,11 +4959,5 @@
 #~ msgid "Conversations"
 #~ msgstr ""
 
-#~ msgid "Enable sounds"
-#~ msgstr " "
-
 #~ msgid "KFM"
 #~ msgstr "KFM"
-
-#~ msgid "Manual"
-#~ msgstr ""
--- a/po/sk.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/sk.po	Sun Jan 05 23:21:50 2003 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\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,362 +13,535 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "Pre"
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "Sp"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+#, fuzzy
+msgid "Auto-login"
+msgstr "Aotomatick prihlasovanie sa"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "Odhlsi"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Zvuky"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "Kont"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "Chyba ???"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "O aplikcii Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Odchod"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - Nastavenie zvukov"
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "Kamartova ikona"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Chat s kamartom"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 #, fuzzy
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr "Zatvori"
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 #, fuzzy
 msgid "Chat Rooms"
 msgstr "Voby chatu"
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Prida"
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Zrui"
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr ""
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr ""
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr ""
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr ""
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr ""
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr ""
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 #, fuzzy
 msgid "(No"
 msgstr "Nie"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 #, fuzzy
 msgid "Change"
 msgstr "Kanl:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "Nemem vytvori sbor %s."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "%s prihlsen."
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "IM okno"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "Okno skupinovho chatu"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "Zobrazi notifikciu"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "Zobrazi notifikciu"
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "Nemem sa pripoji."
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "Text"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "Zobraz vetky konverzcie v jednom okne so zlokami"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Prtomn"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr "Prtomn iba pre priateov"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr "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 "Away for friends only"
+msgstr "Pre iba pre priateov"
+
+#: src/protocols/gg/gg.c:77
+msgid "Invisible"
+msgstr "Neviditen"
+
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "Neviditen iba pre priateov"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "Nedostupn"
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "Nemem rozpozna meno hostitea."
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "Nemem sa pripoji na server."
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "Neznma odpove zo servra."
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "Chyba pri tan zo socketu."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 #, fuzzy
 msgid "Error while writing to socket."
 msgstr "Chyba pri zpise do socket."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autentifikcia neuspen"
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr "Prezvka:"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu Pouvate"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 #, fuzzy
 msgid "Could not connect"
 msgstr "Nemem sa pripoji"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 #, fuzzy
 msgid "Unable to read socket"
 msgstr "Nemem ta sbor %s."
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "Nemem sa pripoji."
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr ""
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr ""
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 #, fuzzy
 msgid "Reading server key"
 msgstr "akm na k zo servra"
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr ""
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr ""
 
-#: src/protocols/gg/gg.c:521
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
+#, c-format
+msgid "Connect to %s failed"
+msgstr "Spojenie na %s preruen"
+
+#: src/protocols/gg/gg.c:531
 #, fuzzy
 msgid "Unable to ping server"
 msgstr "Nemem sa pripoji na server."
 
-#: src/protocols/gg/gg.c:533
+#: src/protocols/gg/gg.c:543
 msgid "Send as message"
 msgstr "Poli ako sprvu"
 
-#: src/protocols/gg/gg.c:541
+#: src/protocols/gg/gg.c:551
 msgid "Looking up GG server"
 msgstr "Hadm GG server"
 
-#: src/protocols/gg/gg.c:544
+#: src/protocols/gg/gg.c:554
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Napsali ste nesprvne Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:570
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Spojenie na %s preruen"
-
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:604
 #, fuzzy
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Pokate sa posla sprvu na nesprvne Gadu-Gadu UIN!"
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "Nemem zska vsledky vyhladvania"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Vyhadvac Stroj"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Aktvny"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "no"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "Nie"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "Meno"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "Druh meno"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "Prezvka"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "Rok narodenia"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "Pohlavie"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Mesto"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Importuj zoznam kamartov"
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Importuj zoznam kamartov"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "Heslo bolo spene zmenen"
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "Importuj zoznam kamartov"
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "Nemem otvori Priame IM spojenie"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Nemem ta sbor %s."
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "Vyhladvanie v prieinku"
 
@@ -376,168 +549,303 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Zmeni heslo"
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 #, fuzzy
 msgid "Import Buddy List from Server"
 msgstr "Importuj zoznam kamartov"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 #, fuzzy
 msgid "Export Buddy List to Server"
 msgstr "Importuj zoznam kamartov"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "Nemem ta sbor %s."
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr "Prezvka:"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu Pouvate"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "Zrui"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "Zamietnu"
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "Poli sprvu cez server"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Zskaj Info"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Gaim Poui"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, fuzzy, c-format
 msgid "DCC Chat with %s closed"
 msgstr "Priame IM s %s zruen"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "Spojenie ukonen"
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s zmenil tmu na: %s</B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "akm na k zo servra"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "Chyba IRC"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "iadna prezvka/kanl"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "Chyba IRC"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "iaden server"
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
 msgstr "Nenapsali ste prezvku"
 
-#: src/protocols/irc/irc.c:976
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 msgid ""
-"%s has requested a DCC chat.  Would you like to establish the direct "
-"connection?"
-msgstr ""
-
-#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "Odpojen."
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Nemem zapisova"
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "Boli ste vykopnut z %s: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "Zska informcie o uvateovi"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Opustili ste %s"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "as IRC"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Kanl:"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 #, fuzzy
 msgid "DCC Chat"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "Nemem ta sbor %s."
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "Nemem ta sbor %s."
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Pripojen"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Chyba sprvy"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -545,607 +853,806 @@
 "\n"
 "elte si prida ich do Vho zoznamu kamartov?"
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "iaden server"
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Kamarti"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autentifikcia preruen"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 #, fuzzy
 msgid "Unknown login error"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Heslo bolo spene zmenen"
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 #, fuzzy
 msgid "Connection lost"
 msgstr "Spojenie ukonen"
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 #, fuzzy
 msgid "Unable to connect"
 msgstr "Nemem sa pripoji."
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 #, fuzzy
 msgid "Connected"
 msgstr "Odpojen."
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "Autentifikcia preruen"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 #, fuzzy
 msgid "Connecting"
 msgstr "Spojenie ukonen"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 #, fuzzy
 msgid "Jabber Error"
 msgstr "Chyba sprvy"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "Miestnos:"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "Nemem sa pripoji."
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Pozrie zznam"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Zobrazi notifikciu"
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 #, fuzzy
 msgid "Full Name"
 msgstr "Prv meno"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 #, fuzzy
 msgid "Family Name"
 msgstr "Prv meno"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 #, fuzzy
 msgid "Given Name"
 msgstr "Druh meno"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 #, fuzzy
 msgid "Nickname"
 msgstr "Prezvka"
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 #, fuzzy
 msgid "Locality"
 msgstr "ZLocate"
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr ""
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Krajina"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 #, fuzzy
 msgid "Telephone"
 msgstr "Vybrat iaden"
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Nzov"
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 #, fuzzy
 msgid "Role"
 msgstr "Zrui"
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 #, fuzzy
 msgid "Birthday"
 msgstr "Rok narodenia"
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Popis"
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 #, fuzzy
 msgid "Set User Info"
 msgstr "Zska informcie o uvateovi"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 #, fuzzy
 msgid "Invalid User"
 msgstr "Nesprvne meno"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr ""
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 #, fuzzy
 msgid "Invalid Username"
 msgstr "Nesprvne meno"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 #, fuzzy
 msgid "Invalid Friendly Name"
 msgstr "Nesprvne meno"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 #, fuzzy
 msgid "Not on list"
 msgstr "Spojenie ukonen"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 #, fuzzy
 msgid "Not logged in"
 msgstr "%s prihlsen."
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 #, fuzzy
 msgid "Internal server error"
 msgstr "Vntorn chyba"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 #, fuzzy
 msgid "File operation error"
 msgstr "vntorn chyba spojenia\n"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "vntorn chyba spojenia\n"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 #, fuzzy
 msgid "Server busy"
 msgstr "Server:"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 #, fuzzy
 msgid "Server unavailable"
 msgstr "Nedostupn"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 #, fuzzy
 msgid "Database connect error"
 msgstr "vntorn chyba spojenia\n"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 #, fuzzy
 msgid "Error creating connection"
 msgstr "g003: Chyba pri otvran spojenia.\n"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr ""
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autentifikcia neuspen"
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 #, fuzzy
 msgid "Not allowed when offline"
 msgstr "Ziadne zvuky ke sa prihlsite"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 #, fuzzy
 msgid "Unknown Error Code"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim neme posla sprvu"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "Chyba AOL"
+
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Nemem sa pripoji na server."
+
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1179
+#: src/protocols/msn/msn.c:1401
 #, 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:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Chyba pri tan zo socketu."
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "Nemem sa pripoji na server."
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "Nemem sa pripoji na server."
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Akcie protokolu"
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "Nemem otvori Priame IM spojenie"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "Nemem sa prihlsi do AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "Nemem posla sprvu: vemi vek"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Nemem ta sbor %s."
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 #, fuzzy
 msgid "Password sent"
 msgstr "Heslo: "
 
-#: src/protocols/msn/msn.c:1752
-#, fuzzy
-msgid "Unable to write to server"
-msgstr "Nemem sa pripoji na server."
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "Nemem zapisova"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "Nemem posla sprvu: vemi vek"
+
+#: src/protocols/msn/msn.c:1974
 #, fuzzy
 msgid "Synching with server"
 msgstr "Pripjam sa na GG server"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 #, fuzzy
 msgid "Busy"
 msgstr "Kamart"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 #, fuzzy
 msgid "Hidden"
 msgstr "Skry ikonu"
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+msgid "Be right back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2430
+msgid "Away from the computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2432
+msgid "On the phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2434
+msgid "Out to lunch"
+msgstr ""
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+msgid "Idle"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "Posla sbor"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Druh meno"
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Meno obrazovky: "
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr "Nesprvne meno"
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Ktor skupinu pripoji:"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "Nesprvne meno"
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Nesprvne meno"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Nedostupn"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Sluba je doasne neprstupn."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Priame IM s %s zruen"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, fuzzy, c-format
 msgid "Direct IM with %s failed"
 msgstr "Priame IM s %s zruen"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "chyba spojenia (rend)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Odpojen."
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Boli ste odpojen z chatovacej miestnosti %s."
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Chat je teraz nedostupn"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Nemem sa spoji s hostiteom"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Poslan heslo, akm na odpove\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "vntorn chyba spojenia\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Nemem sa prihlsi do AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Prihlsi: %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Odhlsen.\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Nemem sa pripoji"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Spojenie vytvoren, poslan cookie"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Nesprvne heslo alebo prezvka."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr ""
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "Sluba je doasne neprstupn."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1154,46 +1661,87 @@
 "znova. Ak budete pokraova v pripjan, budete aka dlhie."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Verzia klienta ktor pouvate je velmi star. Naintalujte si nov na"
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Autentifikcia preruen"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Vntorn chyba"
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim neme posla sprvu"
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim neme posla sprvu"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Priame IM spojenie s %s vytvoren"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+msgid "Transfer timed out"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "Nemem otvori konfiguran sbor %s."
+
+#: src/protocols/oscar/oscar.c:1632
+msgid "File transfer aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr ""
+"\n"
+"\n"
+"elte si prida ich do Vho zoznamu kamartov?"
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+#, fuzzy
+msgid "No reason given."
+msgstr "Nenapsali ste prezvku"
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Autentifikcia neuspen"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1201,199 +1749,231 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-#, fuzzy
-msgid "No reason given."
-msgstr "Nenapsali ste prezvku"
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1587
-#, 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:1588
-#, 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:1597
+#: src/protocols/oscar/oscar.c:2141
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
+#, c-format
+msgid ""
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
+#, c-format
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"elte si prida ich do Vho zoznamu kamartov?"
+
+#: src/protocols/oscar/oscar.c:2254
 #, fuzzy, c-format
-msgid "You missed %d message from %s because it was too large."
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "Stratili ste %d sprv%s z %s pretoe %s je neplatn."
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "Stratili ste %d sprv%s z %s pretoe %s je neplatn."
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu 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:1598
+#: src/protocols/oscar/oscar.c:2265
 #, fuzzy, c-format
-msgid "You missed %d messages from %s because they were too large."
+msgid "You missed %hu 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:1607
-#, 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:1608
+#: src/protocols/oscar/oscar.c:2274
 #, fuzzy, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu 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:1617
+#: src/protocols/oscar/oscar.c:2275
 #, 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:1618
+msgid ""
+"You missed %hu 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:2284
 #, fuzzy, c-format
-msgid "You missed %d messages from %s because they are too evil."
+msgid "You missed %hu message from %s because he/she was too evil."
 msgstr "Stratili ste %d sprv%s z %s pretoe s velmi zl."
 
-#: src/protocols/oscar/oscar.c:1627
+#: src/protocols/oscar/oscar.c:2285
 #, fuzzy, c-format
-msgid "You missed %d message from %s because you are too evil."
+msgid "You missed %hu messages from %s because he/she was too evil."
+msgstr "Stratili ste %d sprv%s z %s pretoe s velmi zl."
+
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu 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:1628
+#: src/protocols/oscar/oscar.c:2295
 #, fuzzy, c-format
-msgid "You missed %d messages from %s because you are too evil."
+msgid "You missed %hu 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:1636
+#: src/protocols/oscar/oscar.c:2303
 #, fuzzy, c-format
-msgid "You missed %d message from %s for unknown reasons."
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Stratili ste %d sprv%s z %s z neznmych dvodov."
 
-#: src/protocols/oscar/oscar.c:1637
+#: src/protocols/oscar/oscar.c:2304
 #, fuzzy, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Stratili ste %d sprv%s z %s z neznmych dvodov."
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2342
+#, c-format
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1707
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1736
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1755
-#, c-format
-msgid "Your message to %s did not get sent: %s"
-msgstr "Vaa sprva %s nebola poslan: %s"
-
-#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "Neznmy chybov kd."
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "Nenapsali ste prezvku"
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "Vaa sprva %s nebola poslan: %s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "Informcie o pouvateovi %s su neprstupn: %s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Kamartova ikona"
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Hlas"
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Zska sbor"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr "Posla sbor"
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Hry"
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "Zoznam kamartov"
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 #, fuzzy
 msgid "AP User"
 msgstr "Pouvate"
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1886
-#, fuzzy
+#: src/protocols/oscar/oscar.c:2655
 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 ""
-"<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
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2677
 #, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "Pouvatesk meno: <B>%s</B>  %s <BR>\n"
 "%srove vstrahy : <B>%d %%</B><BR>\n"
@@ -1402,233 +1982,296 @@
 "<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>Pouvate nem iadnu 'Pre' sprvu</i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Neposkytnut iane informcie</i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "Vae spojenie moe by preruen."
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "Autentifikcia neuspen"
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "Autentifikcia neuspen"
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "g003: Chyba pri otvran spojenia.\n"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "Konto"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "Nemem ta sbor %s."
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim neme posla sprvu"
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, 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:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Vmena:"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Nemem otvori Priame IM spojenie"
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4621
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
 #, 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 otvorenie Priameho IM spojenia s %s. Toto dovol inm "
-"pouvateom vidie Vau IP adresu, moe to by bezpenostn riziko. elte "
-"si pokraova"
-
-#: src/protocols/oscar/oscar.c:3586
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4642
 #, 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:3593
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3618
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4667
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Stav: %s"
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Priame IM"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr ""
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Nemem vytvori sbor %s."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Nemem ta sbor %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Sprva je vemi dlh, poslednch %s bitov bude vymazanch."
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s nie je v sastnosti prihlsen."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Vstraha %s nie je povolen."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Sprva bola zahoden, prekroili ste obmedzenia rchlosti servra."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat %s nie je prstupn."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Posielate sprvy prli rchlo do %s."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr ""
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr ""
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "Potrebujem viac kvalifiktorov."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr ""
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "Vyhladvanie podla emailu je obmedzen."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Ignorovan kov slovo."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "iadne kov slovo."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr ""
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "Krajina nie je podporovan."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Neznma chyba: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "Sluba je doasne neprstupn."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1636,303 +2279,290 @@
 "Pripjali a odpjali ste sa prli asto. Pokajte desa mint a skste "
 "znova. Ak sa stle pokate pripja, budete musie aka dlhie."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Objavila sa neznma chyba pri prihlasovan: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, fuzzy, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Objavila sa, %d, neznma chyba. Informcie: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "Spojenie ukonen"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "akajte na odozvu..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Heslo bolo spene zmenen"
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid ""
 "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 ""
 
-#: src/protocols/toc/toc.c:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "Port"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "Nemem sa spoji pre prenos!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "Nemem sa spoji pre prenos!"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "Nemem sa spoji pre prenos!"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - Uloi ako..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1963
+#: src/protocols/toc/toc.c:1980
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr "Akceptova"
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaa sprva nebola poslan."
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Trieda:"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "Prijmate:"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "O aplikcii Gaim v%s"
 
-#: src/about.c:135
+#: src/about.c:112
 #, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim je klient podporujci protokol AOL Instant Messenger. Bol napsan \n"
 "pouitm Gtk+ a je licencovan pod GPL.\n"
 "\n"
 "URL: "
 
-#: src/about.c:137
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
+#: src/about.c:122
+#, fuzzy
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "\n"
 "\n"
 "IRC: #gaim na irc.openprojects.net"
 
-#: src/about.c:147
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-msgstr ""
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "Internetov strnka"
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr "Odhlsi"
-
-#: src/aim.c:162
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "Zatvori"
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "Zadajte, prosm, Vae heslo"
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Prihlsenie"
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "Meno obrazovky: "
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr "Heslo: "
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "Odchod"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr "Kont"
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr "Prihlsi"
-
-#: src/aim.c:354
-#, fuzzy
-msgid "About"
-msgstr "O aplikcii Gaim"
-
-#: src/aim.c:355
-msgid "Options"
-msgstr "Voby"
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr ""
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr ""
-
-#: src/aim.c:841 src/multi.c:1481
-#, fuzzy
-msgid "Auto-login"
-msgstr "Aotomatick prihlasovanie sa"
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr ""
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "Som sp!"
 
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr "Sp"
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "Nov 'Pre' sprva"
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "Odstr 'Pre' sprvu"
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Nastav vetko na 'Pre'"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Skupina"
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Info"
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "Pozrie zznam"
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "Premenova"
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "Zrui alias"
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 sprva)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr ""
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Pihlsen v: %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Vstrahy: %d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1943,949 +2573,880 @@
 "Meno obrazovky: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr ""
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s prihlsen."
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s odhlsen."
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Informcie o vybratom kamartovi"
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr ""
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "Zaa/Pripoji sa k chatu s kamartom"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Aktivuj 'Pre' sprvu"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - Zoznam kamartov"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Sbor"
 
-#: src/buddy.c:2667
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr "Prida kamarta"
 
-#: src/buddy.c:2669
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr "Pripoji sa k chatu"
 
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr ""
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "Nov 'Pre' sprva"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr "Zska informcie o uvateovi"
 
-#: src/buddy.c:2678
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "Importuj zoznam kamartov"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "Skry ikonu"
+
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "Nstroje"
 
-#: src/buddy.c:2706
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "Kont"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Chyba ???"
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Akcie protokolu"
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "Skromie"
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "Pozrie systmov zznam"
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr "Nahra skript"
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "Zrui vetky skripty"
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr "Zoznam scriptov"
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 #, fuzzy
 msgid "Online Help"
 msgstr "Pripojen"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 #, fuzzy
 msgid "Debug Window"
 msgstr "Zobraz ladiace okno"
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "O aplikcii Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "Zoznam kamartov"
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "Prida novho kamarta"
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "Prida nov skupinu"
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "Vymaza vybratho kamarta/skupinu"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Editova kamartov"
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - Zoznam kamartov"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "Pripoji sa k chatu"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "Pripoji sa k chatu ako:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr "Zrui"
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Pripoji"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Pozva"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Kamart"
 
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Sprva"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Pozva kamarta do chatovacej miestnosti"
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Od-ignorova"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Ignorova"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s v miestnosti"
 
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s vstpil do miestnosti."
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s vstpil do miestnosti."
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je teraz znmy ako %s"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, fuzzy, c-format
 msgid "%s left the room (%s)."
 msgstr "%s opustil miestnos."
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s opustil miestnos."
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Skupinov chaty"
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "Tma:"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0 ud v miestnosti"
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr ""
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Posla"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
+#: src/buddy_chat.c:1586 src/conversation.c:2906
+msgid "Warn"
+msgstr "Varova"
+
+#: src/buddy_chat.c:1592 src/conversation.c:2925
 msgid "Block"
 msgstr "Blokova"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
-msgid "Warn"
-msgstr "Varova"
-
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Ulo konverzciu"
-
-#: src/conversation.c:492
+#: src/conversation.c:443
 #, fuzzy
 msgid "Gaim - Insert Image"
 msgstr "Gaim - IM pouvate"
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "Nemem posla sprvu: vemi vek"
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "Nemem posla sprvu: vemi vek"
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr ""
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "Nastavi pozciu na %d\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr "Tun text"
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr "Tun"
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr ""
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr "Kurzva"
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr "Podiarknut text"
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr "Podiarknut"
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr "Preiarknut text"
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr "Preiarknut"
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "Zmeni vekos fontu"
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr "Mal"
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "Normlna vekos fontu"
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr "Normlny"
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr "Zvi vekost fontu"
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr "Vek"
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "Vybra font"
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr "Font"
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "Farba textu"
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr "Farba"
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr "Farba pozadia"
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "Uloi konverzciu"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "Vloi odkaz"
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr "Odkaz"
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "Vloi smajlka"
 
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "Smajlk"
-
-#: src/conversation.c:2272
-#, fuzzy
-msgid "Insert IM Image"
-msgstr "Vloi smajlka"
-
-#: src/conversation.c:2272
-msgid "Image"
-msgstr ""
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "Zatvori"
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "Voby"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "Povoli zaznamenvanie"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr "Zanamenvanie"
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr "Uloi konverzciu"
-
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr "Uloi"
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
-msgstr ""
-
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr "Zvuk"
-
-#: src/conversation.c:2782
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "Povoli zvuky"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konverzcie"
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Posla sprvu ako: "
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Uloi ikonu"
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Nepovoli animcie"
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Povoli animcie"
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Skry ikonu"
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Uloi ikonu ako..."
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr ""
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr ""
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
-msgstr ""
-
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
-msgstr ""
-
-#: src/dialogs.c:471
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+msgid "Warn _anonymously?"
+msgstr ""
+
+#: src/dialogs.c:438
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr ""
+
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Maem '%s' zo zoznamu kamaratov.\n"
 
-#: src/dialogs.c:496
-#, fuzzy, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - Premenova skupinu"
-
-#: src/dialogs.c:509
-#, fuzzy
-msgid "Remove Buddy"
-msgstr "Premenova kamarta"
-
-#: src/dialogs.c:519
-#, c-format
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "???meno:"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
+msgstr "Konto"
+
+#: src/dialogs.c:804
 msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
-msgstr ""
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr "Akceptova"
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - IM pouvate"
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr ""
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "Pouvate:"
-
-#: src/dialogs.c:816
-#, fuzzy
-msgid "Account:"
-msgstr "Konto"
-
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "Gaim - Zska informcie o pouvatelovi"
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr "Prida skupinu"
-
-#: src/dialogs.c:1004
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - Prida skupinu"
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "Skupina"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Prida kamarta"
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr "Prida kamarta"
-
-#: src/dialogs.c:1110
-msgid "Contact"
-msgstr "Kontakt"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Meno obrazovky: "
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Prida k"
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Skromie"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
-msgstr ""
-
-#: src/dialogs.c:1451
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Nastav bezpenos pre:"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Povo vetkm povateom kontaktova ma"
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "Povo iba niie uvedench pouvateov"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "Povo iba niie uvedench pouvateov"
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr "Zoznam povolench"
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Odmietnu vetkch pouvateov"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Blokova niie uvedench pouvateov"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "Zoznam blokovanch"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr ""
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Konto"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Zvuk ke sa kamart prihlsi"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "Otvori IM okno"
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Zobrazi notifikciu"
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Posla sprvu"
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr ""
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1971
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr "Uloi"
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "Zrui"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr ""
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Povoli Internetovm vyhladvaom njs informcie o Vs"
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Prv meno"
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Druh meno"
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Priezvisko"
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr ""
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "tt"
 
-#: src/dialogs.c:2126
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr "Uloi"
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr ""
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Vyplte vetky polka"
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Zmena hesla"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Star heslo"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Nov heslo"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Nov heslo (znova)"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "OK"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Nastavi informcie o pouvateovi"
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Niie s vsledky vyhadvania: "
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Povoli"
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr "Zamietnu"
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Prida povolenie"
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Prida zkaz"
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Zaznamenaj konverzciu"
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Njs kamarta"
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Njs kamarta poda informcie"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Njs kamarta poda emailu"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "Vloi odkaz"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Prida URL"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Veberte farbu textu"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Vyberte farbu pozadia"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "Vybra font"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importuj zoznam kamartov"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "Nemete vytvori 'Pre' sprvu s przdnym nzvom"
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "Nemete vytvori przdnu 'Pre' sprvu"
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Nov 'Pre' sprva"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Nov 'Pre' sprva"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Nzov 'Pre': "
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "Uloi a Poui"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Poui"
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "Uloi a Poui"
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "???"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr "Alias kamarta"
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias kamarta"
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "Nemem sa spoji s hostiteom"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Uloit zznamov sbor"
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "Nemem otvori konfiguran sbor %s."
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Skutone vymaza zznamy?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Dtum"
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Konverzcia"
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Vyisti"
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Premenova skupinu"
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr "Premenova Skupinu"
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
-msgid "New name:"
-msgstr "Nov meno"
-
-#: src/dialogs.c:4484
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Premenova kamarta"
 
-#: src/dialogs.c:4494
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Premenova kamarta"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "Nov meno"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vyberte si Perlov skript"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nemem otvori konfiguran sbor %s."
 
-#: src/html.c:183
+#: src/html.c:185
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
 msgstr "Obdran: '%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Chyba pri otvran spojenia.\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim neme posla sprvu"
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "???meno:"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "Protokol:"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Nahra ikonu kamarta"
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "Sbor s ikonami kamartov:"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Prehliada"
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "Zrui"
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "Voby fontov"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "???meno:"
 
-#: src/multi.c:559
+#: src/multi.c:653
 #, fuzzy
 msgid "Alias:"
 msgstr "Alias"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "Zapamta heslo"
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Aotomatick prihlasovanie sa"
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "Upozorovanie na nov sprvy"
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "Voby proxy"
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "Upozorovanie na nov sprvy"
+
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Voby"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr ""
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Zmeni konto"
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "Vlote heslo"
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Heslo:"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "Prihlsi"
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "Akcie protokolu"
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2893,573 +3454,599 @@
 "Nemoete sa prihlsi na toto konto, nemte nahran protokol, alebo protokol "
 "nem funkciu prihlsenia"
 
-#: src/multi.c:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste si, e chcete vymazat %s"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "Zmaza"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor knt"
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr "Vybra Vetky"
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr ""
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "Vybrat iaden"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "Zmeni"
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "Prihlsi/Odhlsi"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr "Zmaza"
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "iadne"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Prihlsi: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Editor knt"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "Zrui"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s nebol schopn prihlsi sa do: %s"
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "Chyba pri prihlasovan"
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 #, fuzzy
 msgid "Notice"
 msgstr "Hlas"
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr ""
 "%s\n"
 "%s nebol schopn prihlsi sa do: %s"
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 #, fuzzy
 msgid "Connection Error"
 msgstr "Spojenie ukonen"
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim - Zoznam pluginov"
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - Pluginy"
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-#, fuzzy
-msgid "Loaded Plugins"
-msgstr "Gaim - Pluginy"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr "Vybra Vetky"
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr "Cesta k sboru:"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr "Nahra"
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "Nahraj plugin zo sboru"
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr "Konfigurova"
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "Konfigurovat nastavenia zvolenho pluginu"
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr "Znovu nahra"
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "Znovu nahra zvolen plugin"
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr "Zrui"
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "Zrui zvolen plugin"
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "Zatvor toto okno"
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr "Veobecn voby"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "Zobraz ladiace okno"
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "Poui tlatka bez okrajov"
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "tt"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr "Tun"
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr "Kurzva"
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr "Podiarknut"
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr "Preiarknut text"
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr "Zrui"
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "Vloi smajlka"
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "Vloi smajlka"
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr "Farba"
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "Farba textu"
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "Farba pozadia"
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr "Zobrazenia skupiny"
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "Zobraz smajlkov graficky"
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "Zobraz asov znaku pri sprvach"
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "Zobraz URL ako linky"
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "Zvrazni nesprvne psan slov"
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "Ignoruj farby"
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "Ignoruj vzhady fontu"
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "Ignoruj vekosti fontu"
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "Ignoruj TiK automatick sprvy"
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "Enter pole sprvu"
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "Control-Enter pole sprvu"
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "IM okno"
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "Tlaidlo Escape zatvor okno"
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "Tlaidlo Escape zatvor okno"
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Control-{B/I/U/S} vlo HTML znaky"
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "Control-(slo) vlo smajlka"
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr "Dole"
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "Skry tlatka IM/Informcie/Chat"
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "Zobraz obrzky na tlatkach"
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "Okno zo zoznamom kamartov"
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "Ulo vekost/pozciu okna"
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "Zvi okno pri udalostiach"
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr "Zobrazenia skupiny"
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "Skry skupiny so iadnymi propojenmi kamartmi"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "Zobraz sla v skupinch"
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr "Zoznam kamartov"
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 msgid "Show buddy type _icons"
 msgstr ""
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 msgid "Show _warning levels"
 msgstr ""
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "Reportuj poet neinnost"
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 msgid "Grey i_dle buddies"
 msgstr ""
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "IM okno"
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "Zobraz tlatka ako:"
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "Obrzky"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "Text"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "Obrzky a text"
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "Vka novho okna:"
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "rka novho okna:"
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "Vka vstupnho okienka:"
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "Zvi okno pri udalostiach"
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "Zvi okno pri udalostiach"
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "Kamartova ikona"
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "Skry ikony kamartov"
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "Nepovoli animcie"
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "Zobraz prihlasovacie men v okne"
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr "Zobrazi notifikciu"
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 msgid "Notify buddies that you are _typing to them"
 msgstr ""
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr ""
 
-#: src/prefs.c:505
-msgid "_Tab-Complete Nicks"
-msgstr ""
-
-#: src/prefs.c:506
-msgid "_Old-Style Tab Completion"
-msgstr ""
-
-#: src/prefs.c:509
+#: src/prefs.c:406
+msgid "_Tab-complete nicks"
+msgstr ""
+
+#: src/prefs.c:407
+msgid "_Old-style tab completion"
+msgstr ""
+
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr "Zobraz ud pripjajcich/odchdzajcich v okne"
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Poloha zloky"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr "Hore"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "Dole"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr "Vavo"
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "Vpravo"
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "Zobraz vetky chaty v jednom okne so zlokami"
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 msgid "Show a_liases in tabs/titles"
 msgstr ""
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr "Chat"
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "Zobraz vetky chaty v jednom okne so zlokami"
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Zobraz vetky chaty v jednom okne so zlokami"
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr "Zoznam kamartov"
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "Typ proxy"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Typ proxy"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Bez proxy"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr "Hostite"
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr "Pouvate"
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr "Heslo"
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "Prehliada"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr "Nvod"
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr "Voby proxy"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "tandadne otvor nov okno"
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr "Sprvy"
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr "Zobraz asov znaku pri sprvach"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "Zaznamena vsetky rozhovory"
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr "Zru HTML zo zznamov"
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "Pozrie systmov zznam"
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "Zaznamena ke sa kamarti prihlsia/odhlsia"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Zaznamena ke sa kamarti stan neinnmi/innmi"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "Zaznamena ke kamarti oddu pre/vrtia sa"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Zaznamena vlastn prihlsenia/neinnosti/odchody pre"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Samostatn zznamov sbor pre kadho pripojenho kamarta"
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "Zvuky Voby"
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "Ziadne zvuky ke sa prihlsite"
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "Zvuky pokia ste 'Pre'"
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr "Zvuky Voby"
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "Zvuky Voby"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "Vntorn chyba"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3468,156 +4055,224 @@
 "Prkaz na prehrvanie zvukovch sborov\n"
 "(%s pre meno sboru; vntorn ak je przdny)"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "Posielanie sprv zru stav 'Pre'"
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "Ke som 'Pre' nov sprvy zara do rady"
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "Ignoruj nov konverzciu ke ste 'Pre'"
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "Neposla aotumatick odpove"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "Neposla aotumatick odpove"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "Neposla aotumatick odpove"
 
-#: src/prefs.c:828
-msgid "Idle"
-msgstr ""
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "Neposla aotumatick odpove"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr "iadne"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Gaim Poui"
+
+#: src/prefs.c:754
+msgid "X usage"
+msgstr ""
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "IM okno"
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr "Pre"
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "'Pre' sprvy"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Nastavenie zvukov"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Test"
 msgstr "Text"
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "Vyberte..."
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr "Edituj"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 msgid "Interface"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr "Font"
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr "Sprvy"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "IM okno"
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "Okno skupinovho chatu"
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "Prehliada"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "Zanamenvanie"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr "Udalosti"
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Nzov 'Pre': "
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "'Pre' sprvy"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr ""
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - Nastavenia"
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Gaim vonkajie ladiace okno"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
-msgstr ""
-
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"not the same version I cannot safely tell you which one it was. Needless to "
-"say, it was not successfully loaded."
-msgstr ""
-"Poksili ste sa nahra protokol, ktor nebol zkompilovan z tej istej verzie "
-"zdrojovho kdu ako aplikcia. ia, pretoe to nie je rovnak verzia "
-"nemem Vm poveda ktor to je. Samozrejme, protokol nebol uspene nahran."
-
-#: src/prpl.c:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "Zobraz ladiace okno"
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3625,33 +4280,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s pouval %s, ktor bol zmazan. %s je teraz nepripojen."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "Akceptova?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr ""
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nov Pota"
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "Otvori potu"
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, 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:590
+#: src/prpl.c:634
 #, fuzzy
 msgid ""
 "\n"
@@ -3662,97 +4312,342 @@
 "\n"
 "elte si prida ich do Vho zoznamu kamartov?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 
-#: src/prpl.c:670
+#: src/prpl.c:714
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - Konverzcie"
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 #, fuzzy
 msgid "Register"
 msgstr "Zrui"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Zadajte, prosm, Vae heslo"
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d sprv)"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 sprva)"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr "no"
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr "Nie"
 
-#: src/server.c:1101
+#: src/server.c:1163
 #, fuzzy
 msgid "More Info"
 msgstr "Zskaj Info"
 
-#: src/sound.c:63
+#: src/sound.c:68
 #, fuzzy
 msgid "Buddy logs in"
 msgstr "Kamartova ikona"
 
-#: src/sound.c:64
+#: src/sound.c:69
 #, fuzzy
 msgid "Buddy logs out"
 msgstr "Zvuk ke sa kamart odhlsi"
 
-#: src/sound.c:65
+#: src/sound.c:70
 #, fuzzy
 msgid "Message received"
 msgstr "Zvuk ke dostanete sprvu"
 
-#: src/sound.c:66
+#: src/sound.c:71
 #, fuzzy
 msgid "Message received begins conversation"
 msgstr "Zvuk ke dostanete sprvu o zaiatku konverzcie"
 
-#: src/sound.c:67
+#: src/sound.c:72
 #, fuzzy
 msgid "Message sent"
 msgstr "Sprvy"
 
-#: src/sound.c:68
+#: src/sound.c:73
 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 "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:75
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:76
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr ""
 
+#, fuzzy
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "Stratili ste %d sprv%s z %s pretoe s velmi zl."
+
+#, 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>"
+#~ 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"
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Autentifikcia neuspen"
+
+#~ 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 otvorenie Priameho IM spojenia s %s. Toto dovol inm "
+#~ "pouvateom vidie Vau IP adresu, moe to by bezpenostn riziko. "
+#~ "elte si pokraova"
+
+#~ msgid "Web Site"
+#~ msgstr "Internetov strnka"
+
+#~ msgid "Password: "
+#~ msgstr "Heslo: "
+
+#, fuzzy
+#~ msgid "About"
+#~ msgstr "O aplikcii Gaim"
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr "Nahra skript"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "Zrui vetky skripty"
+
+#~ msgid "List Scripts"
+#~ msgstr "Zoznam scriptov"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Ulo konverzciu"
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "Nastavi pozciu na %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr "Tun text"
+
+#~ msgid "Bold"
+#~ msgstr "Tun"
+
+#~ msgid "Italics"
+#~ msgstr "Kurzva"
+
+#~ msgid "Underline Text"
+#~ msgstr "Podiarknut text"
+
+#~ msgid "Underline"
+#~ msgstr "Podiarknut"
+
+#~ msgid "Strike through Text"
+#~ msgstr "Preiarknut text"
+
+#~ msgid "Strike"
+#~ msgstr "Preiarknut"
+
+#~ msgid "Decrease font size"
+#~ msgstr "Zmeni vekos fontu"
+
+#~ msgid "Small"
+#~ msgstr "Mal"
+
+#~ msgid "Normal font size"
+#~ msgstr "Normlna vekos fontu"
+
+#~ msgid "Normal"
+#~ msgstr "Normlny"
+
+#~ msgid "Increase font size"
+#~ msgstr "Zvi vekost fontu"
+
+#~ msgid "Big"
+#~ msgstr "Vek"
+
+#~ msgid "Font"
+#~ msgstr "Font"
+
+#~ msgid "Text Color"
+#~ msgstr "Farba textu"
+
+#~ msgid "Background Color"
+#~ msgstr "Farba pozadia"
+
+#~ msgid "Link"
+#~ msgstr "Odkaz"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "Vloi smajlka"
+
+#~ msgid "Smiley"
+#~ msgstr "Smajlk"
+
+#~ msgid "Sound"
+#~ msgstr "Zvuk"
+
+#, fuzzy
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - Premenova skupinu"
+
+#, fuzzy
+#~ msgid "Remove Buddy"
+#~ msgstr "Premenova kamarta"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - IM pouvate"
+
+#~ msgid "User:"
+#~ msgstr "Pouvate:"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim - Zska informcie o pouvatelovi"
+
+#~ msgid "Add Group"
+#~ msgstr "Prida skupinu"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Prida kamarta"
+
+#~ msgid "Contact"
+#~ msgstr "Kontakt"
+
+#~ msgid "Allow List"
+#~ msgstr "Zoznam povolench"
+
+#~ msgid "Block List"
+#~ msgstr "Zoznam blokovanch"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "Alias kamarta"
+
+#~ msgid "Rename Group"
+#~ msgstr "Premenova Skupinu"
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim neme posla sprvu"
+
+#~ msgid "Select All"
+#~ msgstr "Vybra Vetky"
+
+#~ msgid "Select None"
+#~ msgstr "Vybrat iaden"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "Prihlsi/Odhlsi"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim - Zoznam pluginov"
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - Pluginy"
+
+#, fuzzy
+#~ msgid "Loaded Plugins"
+#~ msgstr "Gaim - Pluginy"
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr "Vybra Vetky"
+
+#~ msgid "Filepath:"
+#~ msgstr "Cesta k sboru:"
+
+#~ msgid "Load"
+#~ msgstr "Nahra"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "Nahraj plugin zo sboru"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurova"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "Konfigurovat nastavenia zvolenho pluginu"
+
+#~ msgid "Reload"
+#~ msgstr "Znovu nahra"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "Znovu nahra zvolen plugin"
+
+#~ msgid "Unload"
+#~ msgstr "Zrui"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "Zrui zvolen plugin"
+
+#~ msgid "Close this window"
+#~ msgstr "Zatvor toto okno"
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "Poui tlatka bez okrajov"
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "Ignoruj TiK automatick sprvy"
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "Zvi okno pri udalostiach"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Gaim vonkajie ladiace okno"
+
+#~ 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 ""
+#~ "Poksili ste sa nahra protokol, ktor nebol zkompilovan z tej istej "
+#~ "verzie zdrojovho kdu ako aplikcia. ia, pretoe to nie je rovnak "
+#~ "verzia nemem Vm poveda ktor to je. Samozrejme, protokol nebol "
+#~ "uspene nahran."
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s pouval %s, ktor bol zmazan. %s je teraz nepripojen."
+
+#~ msgid "Accept?"
+#~ msgstr "Akceptova?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Chyba Gadu-Gadu"
 
@@ -3771,18 +4666,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "Zmeni heslo"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "iadna prezvka/kanl"
-
-#~ msgid "IRC Error"
-#~ msgstr "Chyba IRC"
-
-#~ msgid "No such server"
-#~ msgstr "iaden server"
-
-#~ msgid "IRC Part"
-#~ msgstr "as IRC"
-
 #, fuzzy
 #~ msgid "Password Change Error!"
 #~ msgstr "Gaim - Zmena hesla"
@@ -3798,9 +4681,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "Chyba MSN"
 
-#~ msgid "Invalid name"
-#~ msgstr "Nesprvne meno"
-
 #~ msgid "Chat Error!"
 #~ msgstr "Chyba Chatu!"
 
@@ -3817,9 +4697,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "Dvod neznmy"
 
-#~ msgid "AOL error"
-#~ msgstr "Chyba AOL"
-
 #~ msgid "Error"
 #~ msgstr "Chyba"
 
@@ -3857,9 +4734,6 @@
 #~ msgid "Unable to remove file %s - %s"
 #~ msgstr "Nemem vymaza sbor %s - %s"
 
-#~ msgid "Preferences Error"
-#~ msgstr "Chyba ???"
-
 #, fuzzy
 #~ msgid "Plugin Error"
 #~ msgstr "Chyba pri Prihlasovan"
@@ -3895,12 +4769,6 @@
 #~ msgid "Miscellaneous"
 #~ msgstr "Rzne"
 
-#~ msgid "None"
-#~ msgstr "iadne"
-
-#~ msgid "Gaim Use"
-#~ msgstr "Gaim Poui"
-
 #~ msgid "Opera"
 #~ msgstr "Opera"
 
@@ -3914,9 +4782,6 @@
 #~ "Nie vetky protokoly mou poui tieto voby proxy. Pozrite si,\n"
 #~ "prosm, README sbor pre detaily."
 
-#~ msgid "No Proxy"
-#~ msgstr "Bez proxy"
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -3929,13 +4794,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Voby zoznamu kamratov"
 
-#, fuzzy
-#~ msgid "Tab Placement:"
-#~ msgstr "Poloha zloky"
-
-#~ msgid "Top"
-#~ msgstr "Hore"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Voby konverzcie"
 
@@ -3948,33 +4806,12 @@
 #~ msgid "IM Options"
 #~ msgstr "Voby IM"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "Zobraz tlatka ako:"
-
-#~ msgid "Pictures And Text"
-#~ msgstr "Obrzky a text"
-
-#~ msgid "Pictures"
-#~ msgstr "Obrzky"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "Zobraz vetky konverzcie v jednom okne so zlokami"
-
 #~ msgid "Window Sizes"
 #~ msgstr "Vekosti okna"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Poloha zloky"
 
-#~ msgid "Left"
-#~ msgstr "Vavo"
-
-#~ msgid "Right"
-#~ msgstr "Vpravo"
-
 #~ msgid "Chat Options"
 #~ msgstr "Voby chatu"
 
@@ -3982,9 +4819,6 @@
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Zobraz vetky konverzcie v jednom okne so zlokami"
 
-#~ msgid "Font Options"
-#~ msgstr "Voby fontov"
-
 #~ msgid "Italic Text"
 #~ msgstr "Kurzva"
 
@@ -4016,15 +4850,9 @@
 #~ msgid "Conversations"
 #~ msgstr "Konverzcie"
 
-#~ msgid "Enable sounds"
-#~ msgstr "Povoli zvuky"
-
 #~ msgid "KFM"
 #~ msgstr "KFM"
 
-#~ msgid "Manual"
-#~ msgstr "Nvod"
-
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "Zvuk ke sa kamart prihlsi"
 
--- a/po/sv.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/sv.po	Sun Jan 05 23:21:50 2003 +0000
@@ -2,12 +2,12 @@
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001.
 #
-# $Id: sv.po 4269 2002-12-11 02:09:43Z lschiere $
+# $Id: sv.po 4445 2003-01-05 23:21:50Z lschiere $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\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,354 +15,528 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "Frnvarande"
+
+# src/menus.c:327
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "Bakt"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+#, fuzzy
+msgid "Auto-login"
+msgstr "Logga in automatiskt"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "Logga ut"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "Ljud"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "Konton"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "Instllningar"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "Om Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "Avsluta"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - Ljudkonfiguration"
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "Kompisikon"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "Kompischatt"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Gaim-chatt"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr "Stng"
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "Chattrum"
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "Lgg till"
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "Ta bort"
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "Lista med tillgngliga chattar"
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "Lista med prenumererade chattar"
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr "Egenskaper fr Gnome Stick Ticker"
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr "Uppdateringsfrekvens i minuter"
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 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
+#: plugins/gtik.c:757
 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
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr "Kryssa i denna ruta fr att rulla vnster till hger:"
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 msgid "(No"
 msgstr "(Nej"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 msgid "Change"
 msgstr "ndra"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "Kan inte skriva filen %s."
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "%s loggade in."
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "Snabbmeddelandefnster"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "Gruppchatfnster"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "Visa notifiering"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "Visa notifiering"
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "Kan inte ansluta"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "Test"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "Visa alla konversationer i ett fnster med flikar"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr "Tillgnglig"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr "Tillgnglig endast fr vnner"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr "Frnvarande"
-
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr "Frnvarande endast fr vnner"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "Osynlig endast fr vnner"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr "Otillgnglig"
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "Kan inte sl upp vrdnamnet."
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "Kan inte ansluta till servern."
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "Ogiltigt svar frn servern."
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "Fel vid lsning frn uttag (socket)."
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 msgid "Error while writing to socket."
 msgstr "Fel vid skrivande till uttag (socket)."
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "Oknd felkod."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr "Smeknamn:"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu-anvndare"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "Kunde inte ansluta"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "Kan inte lsa frn uttag"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "Kan inte ansluta."
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "Lser data"
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr "Balanserarhandskakning"
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr "Lser servernyckel"
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "Byter ut nyckelhash"
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "Kritiskt fel i GG-bibliotek\n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "Kan inte pinga server"
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "Skicka som meddelande"
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr "Slr upp GG-server"
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "Ogiltigt Gadu-Gadu-UIN angivet"
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "Kan inte pinga server"
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "Skicka som meddelande"
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr "Slr upp GG-server"
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "Ogiltigt Gadu-Gadu-UIN angivet"
+
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Du frsker skicka ett meddelande till ett ogiltigt Gadu-Gadu-UIN."
 
 # src/message.c:76
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "Kunde inte f tag i skresultat"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu-skmotor"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "ja"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "nej"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "Frnamn"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr "Efternamn"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "Fdelser"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "Kn"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "Ort"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Det finns ingen kompislista lagrad p servern. Ledsen!"
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Kunde inte importera kompislista frn servern"
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Kompislistan skickades utan problem till servern"
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Kunde inte verfra kompislista till servern"
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Kompislistan togs utan problem bort frn servern"
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kunde inte ta bort kompislistan frn servern"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "Lsenordet ndrades utan problem"
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Lsenordet kunde inte ndras"
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "Kunde inte importera kompislista frn servern"
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "Kan inte ppna direktmeddelande"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Kan inte lsa frn uttag"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "Katalogskning"
 
@@ -370,355 +544,486 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "Byt lsenord"
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "Importera kompislista frn servern"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "Exportera kompislista till servern"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "Ta bort kompislista frn server"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "Kan inte lsa filen %s."
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr "Smeknamn:"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu-anvndare"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "Neka"
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "Skicka meddelande genom servern"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "Hmta information"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Gaim-anvndning"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCC-chatt med %s stngd"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "Anslutningen tappades"
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s har bytt mne till: %s</B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "Lser servernyckel"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "IRC-fel"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "Inget sdant smeknamn/kanal"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "IRC-fel"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "Ingen sdan server"
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
 msgstr "Inget smeknamn r angivet"
 
-#: src/protocols/irc/irc.c:976
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 msgid ""
-"%s has requested a DCC chat.  Would you like to establish the direct "
-"connection?"
-msgstr "%s har begrt en DCC-chatt. Vill du etablera direktanslutningen?"
-
-#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "Ansluten"
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "Kan inte skriva"
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "Du har sparkats ut frn %s: %s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "Utsparkad av %s: %s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "Hmta anvndarinformation"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "Du har lmnat %s"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr "IRC-lmnande"
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "Lsenord:"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC-chatt"
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "Kan inte lsa frn uttag"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "Kan inte lsa frn uttag"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr "Oknd"
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "Ansluten"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr "Utkad frnvaro"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr "Str inte"
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber-fel"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr "Fel %s: %s"
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 msgid "Unknown Error in presence"
 msgstr "Oknt fel i nrvaro"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, 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:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "Ingen sdan anvndare"
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Kompisar"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "Oknt inloggningsfel"
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 msgid "Password successfully changed."
 msgstr "ndring av lsenord lyckades."
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "Anslutningen tappades"
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "Kan inte ansluta"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "Ansluten"
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "Begr autentiseringsmetod"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 msgid "Jabber Error"
 msgstr "Jabber-fel"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "Rum:"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr "Handtag:"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "Kan inte ansluta"
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 #, fuzzy
 msgid "Chats"
 msgstr "Chatt"
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Visa logg"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "Frnvaromeddelande"
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Visa notifiering"
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "Fullstndigt namn"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "Efternamn"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "Frnamn"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "Gatuadress"
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "Utkad adress"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "Postnummer"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "E-post"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "Organisationsnamn"
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "Organisationsenhet"
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr "Roll"
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "Fdelsedag"
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -726,397 +1031,601 @@
 "Alla poster nedan r valfria. Ange endast den information som du trivs med "
 "att lmna ut"
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "Anvndaridentitet"
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Redigera Jabber-vCard"
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "Serverregistrering lyckades!"
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "Oknt registreringsfel"
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "Stll in anvndarinformation"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 #, fuzzy
 msgid "Invalid User"
 msgstr "Ogiltigt namn"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr ""
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 #, fuzzy
 msgid "Invalid Username"
 msgstr "Ogiltigt namn"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 #, fuzzy
 msgid "Invalid Friendly Name"
 msgstr "Ogiltigt namn"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 #, fuzzy
 msgid "Not on list"
 msgstr "Anslutningen tappades"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 #, fuzzy
 msgid "Not logged in"
 msgstr "%s loggade in."
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 #, fuzzy
 msgid "Internal server error"
 msgstr "Internt fel"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 #, fuzzy
 msgid "File operation error"
 msgstr "internt anslutningsfel\n"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "stort anslutningsfel\n"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 #, fuzzy
 msgid "Server busy"
 msgstr "Server:"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 #, fuzzy
 msgid "Server unavailable"
 msgstr "Otillgnglig"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 #, fuzzy
 msgid "Database connect error"
 msgstr "internt anslutningsfel\n"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 #, fuzzy
 msgid "Error creating connection"
 msgstr "g003: Fel vid ppnande av anslutning.\n"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 #, fuzzy
 msgid "Too many sessions"
 msgstr "Fr mnga trffar."
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades."
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 #, fuzzy
 msgid "Not allowed when offline"
 msgstr "Inga ljud nr du loggar in"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 #, fuzzy
 msgid "Unknown Error Code"
 msgstr "Oknd felkod."
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim kunde inte skicka ett meddelande"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "AOL-fel"
+
+#: src/protocols/msn/msn.c:1143
 #, 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:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Kan inte ansluta till servern."
+
+#: src/protocols/msn/msn.c:1300
 #, 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:1179
+#: src/protocols/msn/msn.c:1401
 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:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Fel vid lsning frn uttag (socket)."
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "Kan inte ansluta till servern."
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "Kan inte ansluta till servern."
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Protokolltgrder"
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "Kan inte ppna direktmeddelande"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "Kan inte logga in till AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "Kan inte skicka meddelande: fr stort"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Kan inte lsa frn uttag"
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 #, fuzzy
 msgid "Password sent"
 msgstr "Lsenord: "
 
-#: src/protocols/msn/msn.c:1752
-#, fuzzy
-msgid "Unable to write to server"
-msgstr "Kan inte ansluta till servern."
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "Kan inte skriva"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "Kan inte skicka meddelande: fr stort"
+
+#: src/protocols/msn/msn.c:1974
 #, fuzzy
 msgid "Synching with server"
 msgstr "Ansluter till GG-servern"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 #, fuzzy
 msgid "Busy"
 msgstr "Kompis"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 #, fuzzy
 msgid "Hidden"
 msgstr "Dlj ikon"
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+msgid "Be right back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2430
+msgid "Away from the computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2432
+msgid "On the phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2434
+msgid "Out to lunch"
+msgstr ""
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr "Inaktivitet: "
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "Skicka fil"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Efternamn"
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Skrmnamn: "
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr "Ogiltigt namn"
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "G in i vilken grupp:"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "Ogiltigt namn"
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Ogiltigt namn"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Otillgnglig"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Katalogtjnsten r tillflligt onbar."
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direktmeddelande med %s stngd"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direktmeddelande med %s misslyckades"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "anslutningssfel (rend)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "stort anslutningsfel\n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "Frnkopplad."
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blivit frnkopplad frn chattrummet %s."
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "Chatt r inte tillgngligt fr tillfllet"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "Kunde inte ansluta till vrden"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "Lsenord skickat, vntar p svar\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "internt anslutningsfel\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "Kan inte logga in till AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "Inloggning: %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "Loggade ut.\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "Kunde inte ansluta"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "Anslutning etablerad, kaka skickad"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "Felaktigt smeknamn eller lsenord."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "Ditt konto r avstngt fr tillfllet."
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "Tjnsten r tillflligt onbar."
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1125,46 +1634,83 @@
 "prova igen. Om du fortstter att frska kommer du att f vnta nnu lngre."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versionen av klienten du anvnder r fr gammal. Uppgradera p "
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "Autentisering misslyckades"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "Internt fel"
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim kunde inte skicka ett meddelande"
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim kunde inte skicka ett meddelande"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direktmeddelande med %s etablerat"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+msgid "Transfer timed out"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "Kunde inte ppna konfigurationsfilen %s."
+
+#: src/protocols/oscar/oscar.c:1632
+msgid "File transfer aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr "Anvndaren %s vill lgga till dig i dennes kompislista."
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+msgid "No reason given."
+msgstr "Ingen motivering angiven."
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Gaim - ICQ-auktorisering nekades"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1175,230 +1721,262 @@
 "kontaktlista med fljande motivering:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-msgid "No reason given."
-msgstr "Ingen motivering angiven."
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 #, fuzzy
 msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ-auktorisering nekades"
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, 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:1587
+#: src/protocols/oscar/oscar.c:2141
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
 #, 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:1588
-#, 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:1597
+msgid ""
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
-msgid "You missed %d message from %s because it was too large."
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"Vill du lgga till honom eller henne till din kompislista?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "Du missade %d meddelande frn %s eftersom det var ogiltigt."
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "Du missade %d meddelanden frn %s eftersom de var ogiltiga."
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu 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:1598
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu 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:1607
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu 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:1608
-#, c-format
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu 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:1617
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgstr "Du missade %d meddelande frn %s eftersom det var fr hemskt."
+
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
 msgstr "Du missade %d meddelande frn %s eftersom det var fr hemskt."
 
-#: src/protocols/oscar/oscar.c:1618
-#, 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:1627
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu 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:1628
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu 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:1636
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Du missade %d meddelande frn %s p grund av oknda orsaker."
 
-#: src/protocols/oscar/oscar.c:1637
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Du missade %d meddelanden frn %s p grund av oknda orsaker."
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2342
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
+#, fuzzy, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1707
-#, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+#: src/protocols/oscar/oscar.c:2389
+#, fuzzy, c-format
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1736
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fel: %s\n"
 
-#: src/protocols/oscar/oscar.c:1755
-#, 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:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "Oknt inloggningsfel"
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "Ingen motivering angiven."
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "Ditt meddelande till %s skickades inte: %s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "Anvndarinformation fr %s r inte tillgnglig: %s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "Kompisikon"
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "Rst"
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "Snabbmeddelandebild"
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "Hmta fil"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr "Skicka fil"
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Spel"
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Aktier"
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "Skicka kompislista"
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy-fel"
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr "AP-anvndare"
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr "ICQ-RTF"
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "ICQ-serverrelay"
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ-oknd"
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr "Trillansk kryptering"
 
-#: src/protocols/oscar/oscar.c:1886
+#: src/protocols/oscar/oscar.c:2655
 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 ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Frklaring:</I><br><br><IMG SRC=\"free_icon."
-"gif\"> : Vanlig AIM-anvndare<br><IMG SRC=\"aol_icon.gif\"> : AOL-anvndare "
-"<br><IMG SRC=\"dt_icon.gif\"> : AIM-frsksanvndare <br><IMG SRC="
-"\"admin_icon.gif\"> : Administratr <br><IMG SRC=\"ab_icon.gif\"> : "
-"Interaktiv ActiveBuddy-agent<br><IMG SRC=\"wireless_icon.gif\"> : Anvndare "
-"av trdls enhet<br>"
-
-#: src/protocols/oscar/oscar.c:1914
-#, c-format
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "Anvndarnamn: <B>%s</B>  %s <BR>\n"
 "Varningsniv: <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>Anvndaren har inget frnvaromeddelande</i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Klientkapabiliteter: "
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Ingen information tillhandahllen</i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
@@ -1407,55 +1985,118 @@
 "Det senaste meddelandet skickades inte eftersom du r ver frekvensgrnsen. "
 "Vnta 10 sekunder och frsk igen."
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "Gaim - ICQ-auktorisering nekades"
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "Gaim - ICQ-auktorisering beviljades"
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "g003: Fel vid ppnande av anslutning.\n"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "Konto"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "Kan inte lsa filen %s."
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim kunde inte skicka ett meddelande"
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1465,155 +2106,155 @@
 "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:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "Vxel:"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "Kan inte ppna direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
 #, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4621
 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 ""
-"Du har valt att ppna en direktmeddelandeanslutning med %s. Att gra detta "
-"kommer att lta dem se din IP-adress, och kan vara en skerhetsrisk. Vill du "
-"fortstta?"
-
-#: src/protocols/oscar/oscar.c:3586
-#, c-format
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
+#, fuzzy, 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>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
 msgstr ""
 "<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:3593
-#, c-format
+#: src/protocols/oscar/oscar.c:4642
+#, fuzzy, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Anvndaren har inga "
 "statusmeddelanden.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "Hmta statusmeddelande"
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "Direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "Hmta kapabiliteter"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kan inte skriva filen %s."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kan inte lsa filen %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Meddelandet r fr lngt, de sista %s byten klipptes bort."
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s r inte inloggad fr tillfllet."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Varning fr %s r inte tillten."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Ett meddelande har kastats, du verskrider serverns hastighetsgrns."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chatt i %s r inte tillgnglig."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Du skickar meddelanden fr snabbt till %s."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Du missade ett snabbmeddelande frn %s eftersom det var fr stort."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Du missade ett snabbmeddelande frn %s eftersom det skickades fr snabbt."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "Misslyckande."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "Fr mnga trffar."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "Behver fler kvalificerare."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtjnsten r tillflligt onbar."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "E-postuppslagning r begrnsad."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "Nyckelordet ignorerades."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "Inga nyckelord."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "Anvndaren har ingen kataloginformation."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "Landet stds inte."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Oknt misslyckande: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "Tjnsten r tillflligt onbar."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "Din varningsniv r fr tillfllet fr hg fr att logga in."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1621,38 +2262,38 @@
 "Du har anslutit och kopplat ifrn fr mnga gnger. Vnta tio minuter och "
 "prova igen. Om du fortstter att frska kommer du att f vnta nnu lngre."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ett oknt inloggningsfel har intrffat: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Ett oknt fel, %d, har intrffat. Information: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "Anslutningen stngd"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "Vntar p svar..."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC har kommit tillbaka frn dess paus. Du kan nu skicka meddelanden igen."
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "Lsenordsndring lyckades"
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -1664,283 +2305,252 @@
 "meddelande. Gaim kommer att frhindra att ngot gr igenom. Detta r endast "
 "tillflligt, hll ut."
 
-#: src/protocols/toc/toc.c:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "Hmta kataloginformation"
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "Port"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "Kunde inte ansluta fr verfring!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "Kunde inte ansluta fr verfring!"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "Kunde inte ansluta fr verfring!"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - Spara som..."
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s ber %s att acceptera %d fil: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1963
+#: src/protocols/toc/toc.c:1980
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s ber %s att acceptera %d filer: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ber att du ska skicka denne en fil"
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr "Acceptera"
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ditt meddelande skickades inte."
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "Klass:"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr "Mottagare:"
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Om Gaim v%s"
 
-#: src/about.c:135
+#: src/about.c:112
 #, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim r en klient som stder AOL:s snabbmeddelandeprotokoll. Det\n"
 "anvnder Gtk+ och r licensierat under GPL.\n"
 "\n"
 "URL: "
 
-#: src/about.c:137
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
+#: src/about.c:122
+#, fuzzy
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "\n"
 "\n"
 "IRC: #gaim p irc.openprojects.net"
 
-#: src/about.c:147
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-msgstr ""
-"Aktiva utvecklare\n"
-"=======================\n"
-"Rob Flynn (ansvarig) [ rob@marko.net ]\n"
-"Sean Egan (kodare)   [ bj91704@binghamton.edu ]\n"
-"\n"
-"Galna frbttrare\n"
-"=======================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Pensionerade utvecklare\n"
-"=======================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                      [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (ursprunglig frfattare) [ markster@marko.net ]"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "Webbplats"
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr "Logga ut"
-
-#: src/aim.c:162
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "Stng"
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "Ange ditt inloggningsnamn"
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - Inloggning"
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "Skrmnamn: "
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr "Lsenord: "
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "Avsluta"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr "Konton"
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr "Logga in"
-
-#: src/aim.c:354
-msgid "About"
-msgstr "Om"
-
-# src/menus.c:311
-#: src/aim.c:355
-msgid "Options"
-msgstr "Alternativ"
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr "Insticksmoduler"
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr "Instllningar"
-
-#: src/aim.c:841 src/multi.c:1481
-#, fuzzy
-msgid "Auto-login"
-msgstr "Logga in automatiskt"
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - Frnvarande!"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "Jag r tillbaka!"
 
-# src/menus.c:327
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr "Bakt"
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "Nytt frnvaromeddelande:"
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "Ta bort frnvaromeddelande"
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "Stll in alla frnvarande"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Grupp"
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "Snabbmeddelande"
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "Information"
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr "Lgg till kompisanfall"
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "Visa logg"
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "Byt namn"
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "Avaliasera"
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr "Nytt kompisanfall"
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "Ta bort kompisanfall"
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 meddelande)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[Klicka fr att redigera]"
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Inloggad: %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Varningar: %d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Kapabiliteter: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1951,945 +2561,882 @@
 "Skrmnamn: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "Inaktivitet: "
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggade in."
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggade ut."
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "Information om vald kompis"
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "Skicka snabbmeddelande"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "Starta/g in i en kompischatt"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Aktivera frnvaromeddelande"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - Kompislista"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "Arkiv"
 
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
+msgstr "Lgg till en kompis"
+
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
+msgstr "G in i en chatt"
+
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "Nytt frnvaromeddelande:"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
+msgstr "Hmta anvndarinformation"
+
+#: src/buddy.c:2643
+msgid "Import Buddy List"
+msgstr "Importera kompislista"
+
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "Dlj ikon"
+
+#: src/buddy.c:2657
+msgid "Tools"
+msgstr "Verktyg"
+
 #: src/buddy.c:2667
-msgid "Add A Buddy"
-msgstr "Lgg till en kompis"
-
-#: src/buddy.c:2669
-msgid "Join A Chat"
-msgstr "G in i en chatt"
-
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr "Nytt snabbmeddelande"
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
-msgstr "Hmta anvndarinformation"
-
-#: src/buddy.c:2678
-msgid "Import Buddy List"
-msgstr "Importera kompislista"
-
-#: src/buddy.c:2696
-msgid "Tools"
-msgstr "Verktyg"
-
-#: src/buddy.c:2706
 msgid "Buddy Pounce"
 msgstr "Kompisanfall"
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "Konton"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Instllningar"
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Protokolltgrder"
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "Persondataskydd"
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "Visa systemlogg"
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr "Ls in skript"
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "Glm alla skript"
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr "Lista skript"
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "Hjlp"
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 msgid "Online Help"
 msgstr "Onlinehjlp"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 msgid "Debug Window"
 msgstr "Felskningsfnster"
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "Kompislista"
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "Lgg till en ny kompis"
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "Lgg till en ny grupp"
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "Ta bort vald kompis/grupp"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "Redigera kompisar"
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - Kompislista"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "G in i chatt"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "G in i chatt som:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "Anslut"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "Bjud in"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "Kompis"
 
 # src/sidebar.c:103
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Meddelande"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Bjud in kompis till chattrum"
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "Avignorera"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s i rummet"
 
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s kom in i rummet."
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s kom in i rummet."
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s r nu knd som %s"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s lmnade rummet (%s)."
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s lmnade rummet."
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Gruppchatter"
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "mne:"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "0 personer i rummet"
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr "Viska"
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "Skicka"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
-msgid "Block"
-msgstr "Blockera"
-
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "Varna"
 
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Spara konversation"
-
-#: src/conversation.c:492
+#: src/buddy_chat.c:1592 src/conversation.c:2925
+msgid "Block"
+msgstr "Blockera"
+
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Infoga bild"
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "Kan inte skicka meddelande: fr stort"
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "Kan inte skicka meddelande: fr stort"
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr "Fr nrvarande %d, "
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "Stller in positionen till %d\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr "Gr texten fet"
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr "Fet"
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr "Gr texten kursiv"
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr "Kursiv"
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr "Understryk text"
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr "Understrykning"
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr "Genomstryk text"
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr "Genomstrykning"
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "Minska typsnittsstorleken"
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr "Liten"
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "Normal typsnittsstorlek"
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr "Normal"
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr "ka typsnittsstorleken"
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr "Stor"
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "Vlj typsnitt"
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr "Typsnitt"
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "Textfrg"
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr "Frg"
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr "Bakgrundsfrg"
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "Spara konversation"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "Infoga lnk"
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr "Lnk"
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr "Infoga smiley"
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "Smiley"
-
-#: src/conversation.c:2272
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "Infoga snabbmeddelandebild"
 
-#: src/conversation.c:2272
-msgid "Image"
-msgstr "Bild"
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "Stng"
+
+# src/menus.c:311
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "Alternativ"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "Anvnd loggning"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr "Loggning"
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr "Spara konversation"
-
-# src/menus.c:280
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr "Spara"
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
-msgstr ""
-
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr "Ljud"
-
-#: src/conversation.c:2782
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "Anvnd ljud"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konversationer"
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Skicka meddelande som: "
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Spara ikon"
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "Anvnd inte animering"
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "Anvnd animation"
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "Dlj ikon"
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "Spara ikon som..."
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "Gaim - Varna anvndare?"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "Vill du verkligen varna %s?"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "Varna anonymt?"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "Anonyma varningar r mindre barska."
 
-#: src/dialogs.c:471
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Ta bort \"%s\" frn kompislistan.\n"
 
-#: src/dialogs.c:496
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - Ta bort %s?"
-
-#: src/dialogs.c:509
-msgid "Remove Buddy"
-msgstr "Ta bort kompis"
-
-#: src/dialogs.c:519
-#, c-format
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "Skrmnamn:"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
+msgstr "Konto:"
+
+#: src/dialogs.c:804
 msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
-msgstr ""
-"Du hller p att ta bort \"%s\" frn\n"
-"din kompislista. Vill du fortstta?"
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr "Acceptera"
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - Snabbmeddelandeanvndare"
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr "Snabbmeddelande till vem:"
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "Anvndare:"
-
-#: src/dialogs.c:816
-msgid "Account:"
-msgstr "Konto:"
-
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "Gaim - Hmta anvndarinformation"
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr "Lgg till grupp"
-
-#: src/dialogs.c:1004
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - Lgg till grupp"
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupp"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Lgg till kompis"
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr "Lgg till kompis"
-
-#: src/dialogs.c:1110
-msgid "Contact"
-msgstr "Kontakt"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "Skrmnamn: "
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "Lgg till i"
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Frnvarande!"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
-msgstr ""
-
-#: src/dialogs.c:1451
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "Stll in ostrdhet fr:"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "Tillt alla anvndare att kontakta mig"
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "Tillt endast anvndarna nedan"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "Tillt endast anvndarna nedan"
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr "Tilltelselista"
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "Neka alla anvndare"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "Blockera anvndarna nedan"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "Blockera lista"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "Ange en kompis att anfalla."
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nytt kompisanfall"
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "Anfall vem"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "Konto"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "Anfall nr"
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Anfall vid inloggning"
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Anfall vid terkomst frn frnvaro"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Anfall vid terkomst frn inaktivitet"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "Anfall d kompis skriver till dig"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "Anfallstgrd"
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "ppna snabbmeddelandefnster"
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "Visa notifiering"
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "Skicka meddelande"
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "Kr kommando vid anfall"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "Spela ljud vid anfall"
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "Spara detta anfall efter aktivering"
 
-#: src/dialogs.c:1971
+# src/menus.c:280
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr "Spara"
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "Avbryt"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Stll in kataloginformation"
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "Kataloginformation"
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Tillt webbtjnster att hitta din information"
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "Frnamn"
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr "Andranamn"
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "Efternamn"
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr "Flicknamn"
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "Delstat"
 
-#: src/dialogs.c:2126
+# src/menus.c:280
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr "Spara"
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "Nya lsenorden stmmer inte verens"
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "Fyll i alla flt helt"
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - Lsenordsndring"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "Gammalt lsenord"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "Nytt lsenord"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "Nytt lsenord (igen)"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "OK"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Stll in anvndarinformation"
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Nedan r resultaten frn din skning: "
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "Tillt"
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr "Neka"
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Lgg till tilltelse"
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Lgg till nekan"
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Logga konversation"
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Sk efter kompis"
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Sk kompis efter information"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Sk kompis efter e-post"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "Infoga lnk"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - Lgg till URL"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "Vlj textfrg"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "Vlj bakgrundsfrg"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "Vlj typsnitt"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "Importera till:"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importera kompislista"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan inte skapa ett frnvaromeddelande med en tom titel"
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "Kunde inte skapa ett tomt frnvaromeddelande"
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - Nytt frnvaromeddelande"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "Nytt frnvaromeddelande"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "Frnvarotitel: "
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "Spara och anvnd"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "Anvnd"
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "Spara och anvnd"
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Le!"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr "Aliaskompis"
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Aliaskompis"
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "Kunde inte ansluta till vrden"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Spara loggfil"
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "Kunde inte ppna konfigurationsfilen %s."
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Vill du verkligen tmma loggen?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "Okej"
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "Konversation"
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "Tm"
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Byt namn p gruppen"
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr "Byt namn p gruppen"
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
-msgid "New name:"
-msgstr "Nytt namn:"
-
-#: src/dialogs.c:4484
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Byt namn p kompis"
 
-#: src/dialogs.c:4494
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "Byt namn p kompis"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "Nytt namn:"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vlj Perlskript"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunde inte ppna konfigurationsfilen %s."
 
-#: src/html.c:183
+#: src/html.c:185
 #, c-format
 msgid "Received: '%s'\n"
 msgstr "Mottog: \"%s\"\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fel vid ppnande av anslutning.\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim kunde inte skicka ett meddelande"
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "Skrmnamn:"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "Protokoll:"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Ls in kompisikon"
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "Fil med kompisikon:"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr "Blddra"
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "terstll"
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "Typsnittsalternativ"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "Skrmnamn:"
 
-#: src/multi.c:559
+#: src/multi.c:653
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "Kom ihg lsenord"
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Logga in automatiskt"
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "Notifieringar vid ny e-post"
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "Proxyalternativ"
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "Notifieringar vid ny e-post"
+
+# src/menus.c:311
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "Alternativ"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "Registrera med server"
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - ndra konto"
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "Ange lsenord"
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "Lsenord:"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "Logga in"
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "Protokolltgrder"
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2897,40 +3444,45 @@
 "Du kan inte logga in detta konto. Du har inte det protokoll som det anvnder "
 "inlst, eller protokollet har inte inloggningsfunktionen."
 
-#: src/multi.c:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "r du sker p att du vill ta bort %s?"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "Ta bort"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Kontoredigerare"
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr "Markera alla"
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr "Markera automatiskt"
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "Markera inga"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "Modifera"
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "Logga in/ut"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr "Ta bort"
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "Ingen"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "Inloggning: %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - Kontoredigerare"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "Avbryt"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -2939,533 +3491,555 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s kunde inte logga in"
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "Inloggningsfel"
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 msgid "Notice"
 msgstr "Meddelande"
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s har kopplats frn"
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr "Anslutningsfel"
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim - Lista ver insticksmoduler"
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - Insticksmoduler"
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-msgid "Loaded Plugins"
-msgstr "Inlsta insticksmoduler"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr "Markera alla"
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr "Filskvg:"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr "Ls in"
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "Ls in en insticksmodul frn en fil"
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr "Konfigurera"
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "Konfigurera instllningar fr den valda insticksmodulen"
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr "Ls om"
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "Ls om den markerade insticksmodulen"
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr "Glm"
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "Glm den valda insticksmodulen"
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "Stng detta fnster"
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr "Allmnna instllningar"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "Visa felskningsfnster"
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "Anvnd ramlsa knappar"
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "Delstat"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr "Fet"
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr "Kursiv"
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr "Understrykning"
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr "Genomstryk text"
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr "Avbryt"
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "Infoga smiley"
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "Infoga smiley"
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr "Frg"
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "Textfrg"
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "Bakgrundsfrg"
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr "Kompisvisningar"
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "Visa grafiska smileys"
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "Visa tidsstmpel p meddelanden"
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "Visa URL:er som lnkar"
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "Markera felstavade ord"
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "Ignorera frger"
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "Ignorera typsnittsvarianter"
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "Ignorera typsnittsstorlekar"
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "Ignorera automatiserade TiK-meddelanden"
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "Retur skickar meddelande"
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "Control-Retur skickar meddelande"
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "Snabbmeddelandefnster"
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "Escape stnger fnster"
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "Control-W stnger fnster"
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Control-{B/I/U/S} infogar HTML-taggar"
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "Control-(nummer) infogar smileys"
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr "Nederst"
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "Dlj snabbmeddelande-/info-/chattknappar"
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "Visa bilder p knappar"
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "Kompislistefnster"
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "Spara fnsterstorlek/position"
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "Hj fnster vid hndelser"
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr "Gruppvisningar"
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "Dlj grupper med inga anslutna kompisar"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "Visa nummer i grupper"
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr "Kompisvisningar"
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 #, fuzzy
 msgid "Show buddy type _icons"
 msgstr "Visa kompistypikoner"
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "Visa varningsniver"
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "Visa inaktivitetstider"
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 #, fuzzy
 msgid "Grey i_dle buddies"
 msgstr "Frga inaktiva kompisar gra"
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "Snabbmeddelandefnster"
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "Visa knappar som: "
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "Bilder"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "Text"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "Bilder och text"
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "Ny fnsterbredd:"
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "Ny fnsterhjd:"
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "Hjd p postwidget:"
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "Hj fnster vid hndelser"
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "Dlj fnster vid skickande"
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "Kompisikoner"
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "Dlj kompisikoner"
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "Inaktivera kompisikonanimering"
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "Visa inloggningar i fnster"
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr "Visa notifiering"
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "Meddela kompisar att du skriver till dem"
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "Tabbkomplettering"
 
-#: src/prefs.c:505
-#, fuzzy
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "Tabbkomplettera smeknamn"
 
-#: src/prefs.c:506
-#, fuzzy
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "Gammaldags tabbkomplettering"
 
-#: src/prefs.c:509
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr "Visa personer som gr in/lmnar i fnstret"
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Flikplacering:"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr "verst"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "Nederst"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr "Vnster"
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "Hger"
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "Visa alla chattar i ett fnster med flikar"
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 #, fuzzy
 msgid "Show a_liases in tabs/titles"
 msgstr "Visa alias i flikar/titlar"
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr "Chatt"
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "Visa alla chattar i ett fnster med flikar"
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Visa chattar i samma flikfnster"
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr "Kompislista"
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "Proxytyp"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "Proxytyp"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "Ingen proxy"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "Proxyserver"
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr "Vrd"
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr "Anvndare"
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr "Lsenord"
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "Webblsare"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr "Manuell"
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr "Proxyalternativ"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "Visa nytt fnster som standard"
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr "Meddelanden"
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr "Nytt snabbmeddelande"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "Logga alla konversationer"
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr "Ta bort HTML frn loggar"
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "Visa systemlogg"
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "Logga d kompisar loggar in/ut"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Logga d kompisar blir inaktiva/kommer tillbaka frn inaktivitet"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "Logga d kompisar blir frnvarande/kommer tillbaka"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Logga dina egna inloggningar/inaktivitet/frnvarande"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Individuell loggfil fr varje kompis inloggning"
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "Ljudalternativ"
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "Inga ljud nr du loggar in"
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "Ljud d du r frnvarande"
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr "Ljudmetod"
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "Ljudmetod"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "Internt fel"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3474,158 +4048,225 @@
 "Ljudkommando\n"
 "(%s fr filnamn)"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "Att skicka meddelanden tar bort frnvarostatus"
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "Klgg nya meddelanden vid frnvaro"
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "Ignorera nya konversationer vid frnvaro"
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "Skicka inte automatiskt svar"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "Skicka inte automatiskt svar"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "Skicka endast automatiskt svar vid inaktivitet"
 
-#: src/prefs.c:828
-#, fuzzy
-msgid "Idle"
-msgstr "Inaktivitet: "
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "Skicka inte automatiskt svar"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr "Ingen"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Gaim-anvndning"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "X-anvndning"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "Snabbmeddelandefnster"
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr "Frnvarande"
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "Frnvaromeddelanden"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Ljudkonfiguration"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "Vlj..."
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr "Redigera"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 #, fuzzy
 msgid "Interface"
 msgstr "Instans:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr "Meddelande skickat"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "Snabbmeddelandefnster"
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "Gruppchatfnster"
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "Proxyserver"
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "Webblsare"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "Loggning"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr "Ljud"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr "Hndelser"
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Frnvarotitel: "
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "Frnvaromeddelanden"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr "Insticksmoduler"
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - Egenskaper"
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Gaim-felskningsutdatafnster"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
-msgstr ""
-
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"not the same version I cannot safely tell you which one it was. Needless to "
-"say, it was not successfully loaded."
-msgstr ""
-"Du har frskt att lsa in ett protokoll som inte kompilerades frn samma "
-"version av kllkoden som detta program var. Tyvrr betyder detta att jag "
-"inte kan sga vilken version det var eftersom det inte r samma version. Det "
-"behvs kanske inte sgas, men det lstes inte in."
-
-#: src/prpl.c:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "Felskningsfnster"
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3633,33 +4274,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s anvnde %s, som togs bort. %s r nu frnkopplad."
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "Acceptera?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nytt brev"
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "ppna brev"
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, 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:590
+#: src/prpl.c:634
 msgid ""
 "\n"
 "\n"
@@ -3669,7 +4305,7 @@
 "\n"
 "Vill du lgga till honom eller henne till din kompislista?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3677,83 +4313,397 @@
 "Du har fr tillfllet inga tillgngliga protokoll som klarar av att "
 "registrera nya konton."
 
-#: src/prpl.c:670
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrering"
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr "Registreringsinformation"
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 msgid "Register"
 msgstr "Registrera"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Ange ditt lsenord"
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d meddelanden)"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 meddelande)"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr "Nej"
 
-#: src/server.c:1101
+#: src/server.c:1163
 msgid "More Info"
 msgstr "Mer information"
 
-#: src/sound.c:63
+#: src/sound.c:68
 msgid "Buddy logs in"
 msgstr "Kompis loggar in"
 
-#: src/sound.c:64
+#: src/sound.c:69
 msgid "Buddy logs out"
 msgstr "Kompis loggar ut"
 
-#: src/sound.c:65
+#: src/sound.c:70
 msgid "Message received"
 msgstr "Meddelande mottas"
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr "Mottaget meddelande inleder konversationen"
 
-#: src/sound.c:67
+#: src/sound.c:72
 msgid "Message sent"
 msgstr "Meddelande skickat"
 
-#: src/sound.c:68
+#: src/sound.c:73
 msgid "Person enters chat"
 msgstr "Person gr in i chatt"
 
-#: src/sound.c:69
+#: src/sound.c:74
 msgid "Person leaves chat"
 msgstr "Person lmnar chatt"
 
-#: src/sound.c:70
+#: src/sound.c:75
 msgid "You talk in chat"
 msgstr "Du pratar i chatt"
 
-#: src/sound.c:71
+#: src/sound.c:76
 msgid "Others talk in chat"
 msgstr "Andra pratar i chatt"
 
-#: src/sound.c:74
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr "Ngon sger ditt namn i chatt"
 
+#~ msgid ""
+#~ "%s has requested a DCC chat.  Would you like to establish the direct "
+#~ "connection?"
+#~ msgstr "%s har begrt en DCC-chatt. Vill du etablera direktanslutningen?"
+
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "Du missade %d meddelanden frn %s eftersom de r fr hemska."
+
+#~ 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 ""
+#~ "<br><BODY BGCOLOR=WHITE><hr><I>Frklaring:</I><br><br><IMG SRC="
+#~ "\"free_icon.gif\"> : Vanlig AIM-anvndare<br><IMG SRC=\"aol_icon.gif\"> : "
+#~ "AOL-anvndare <br><IMG SRC=\"dt_icon.gif\"> : AIM-frsksanvndare "
+#~ "<br><IMG SRC=\"admin_icon.gif\"> : Administratr <br><IMG SRC=\"ab_icon."
+#~ "gif\"> : Interaktiv ActiveBuddy-agent<br><IMG SRC=\"wireless_icon.gif"
+#~ "\"> : Anvndare av trdls enhet<br>"
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Gaim - ICQ-auktorisering beviljades"
+
+#~ 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 ""
+#~ "Du har valt att ppna en direktmeddelandeanslutning med %s. Att gra "
+#~ "detta kommer att lta dem se din IP-adress, och kan vara en "
+#~ "skerhetsrisk. Vill du fortstta?"
+
+#~ msgid ""
+#~ "Active Developers\n"
+#~ "====================\n"
+#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
+#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Crazy Patch Writers\n"
+#~ "===================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Retired Developers\n"
+#~ "===================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (original author)   [ markster@marko.net ]"
+#~ msgstr ""
+#~ "Aktiva utvecklare\n"
+#~ "=======================\n"
+#~ "Rob Flynn (ansvarig) [ rob@marko.net ]\n"
+#~ "Sean Egan (kodare)   [ bj91704@binghamton.edu ]\n"
+#~ "\n"
+#~ "Galna frbttrare\n"
+#~ "=======================\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Nathan Walp\n"
+#~ "Mark Doliner\n"
+#~ "\n"
+#~ "Pensionerade utvecklare\n"
+#~ "=======================\n"
+#~ "Jim Duchek\n"
+#~ "Eric Warmenhoven                      [ warmenhoven@yahoo.com ]\n"
+#~ "Mark Spencer (ursprunglig frfattare) [ markster@marko.net ]"
+
+#~ msgid "Web Site"
+#~ msgstr "Webbplats"
+
+#~ msgid "Password: "
+#~ msgstr "Lsenord: "
+
+#~ msgid "About"
+#~ msgstr "Om"
+
+#~ msgid "Perl"
+#~ msgstr "Perl"
+
+#~ msgid "Load Script"
+#~ msgstr "Ls in skript"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "Glm alla skript"
+
+#~ msgid "List Scripts"
+#~ msgstr "Lista skript"
+
+#~ msgid "Whisper"
+#~ msgstr "Viska"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Spara konversation"
+
+#~ msgid "Currently at %d, "
+#~ msgstr "Fr nrvarande %d, "
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "Stller in positionen till %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr "Gr texten fet"
+
+#~ msgid "Bold"
+#~ msgstr "Fet"
+
+#~ msgid "Italics Text"
+#~ msgstr "Gr texten kursiv"
+
+#~ msgid "Italics"
+#~ msgstr "Kursiv"
+
+#~ msgid "Underline Text"
+#~ msgstr "Understryk text"
+
+#~ msgid "Underline"
+#~ msgstr "Understrykning"
+
+#~ msgid "Strike through Text"
+#~ msgstr "Genomstryk text"
+
+#~ msgid "Strike"
+#~ msgstr "Genomstrykning"
+
+#~ msgid "Decrease font size"
+#~ msgstr "Minska typsnittsstorleken"
+
+#~ msgid "Small"
+#~ msgstr "Liten"
+
+#~ msgid "Normal font size"
+#~ msgstr "Normal typsnittsstorlek"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Increase font size"
+#~ msgstr "ka typsnittsstorleken"
+
+#~ msgid "Big"
+#~ msgstr "Stor"
+
+#~ msgid "Font"
+#~ msgstr "Typsnitt"
+
+#~ msgid "Text Color"
+#~ msgstr "Textfrg"
+
+#~ msgid "Background Color"
+#~ msgstr "Bakgrundsfrg"
+
+#~ msgid "Link"
+#~ msgstr "Lnk"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "Infoga smiley"
+
+#~ msgid "Smiley"
+#~ msgstr "Smiley"
+
+#~ msgid "Image"
+#~ msgstr "Bild"
+
+#~ msgid "Sound"
+#~ msgstr "Ljud"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - Varna anvndare?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "Vill du verkligen varna %s?"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - Ta bort %s?"
+
+#~ msgid "Remove Buddy"
+#~ msgstr "Ta bort kompis"
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "Du hller p att ta bort \"%s\" frn\n"
+#~ "din kompislista. Vill du fortstta?"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - Snabbmeddelandeanvndare"
+
+#~ msgid "IM who:"
+#~ msgstr "Snabbmeddelande till vem:"
+
+#~ msgid "User:"
+#~ msgstr "Anvndare:"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim - Hmta anvndarinformation"
+
+#~ msgid "Add Group"
+#~ msgstr "Lgg till grupp"
+
+#~ msgid "Add Buddy"
+#~ msgstr "Lgg till kompis"
+
+#~ msgid "Contact"
+#~ msgstr "Kontakt"
+
+#~ msgid "Allow List"
+#~ msgstr "Tilltelselista"
+
+#~ msgid "Block List"
+#~ msgstr "Blockera lista"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "Aliaskompis"
+
+#~ msgid "Rename Group"
+#~ msgstr "Byt namn p gruppen"
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim kunde inte skicka ett meddelande"
+
+#~ msgid "Select All"
+#~ msgstr "Markera alla"
+
+#~ msgid "Select Autos"
+#~ msgstr "Markera automatiskt"
+
+#~ msgid "Select None"
+#~ msgstr "Markera inga"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "Logga in/ut"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim - Lista ver insticksmoduler"
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - Insticksmoduler"
+
+#~ msgid "Loaded Plugins"
+#~ msgstr "Inlsta insticksmoduler"
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr "Markera alla"
+
+#~ msgid "Filepath:"
+#~ msgstr "Filskvg:"
+
+#~ msgid "Load"
+#~ msgstr "Ls in"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "Ls in en insticksmodul frn en fil"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurera"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "Konfigurera instllningar fr den valda insticksmodulen"
+
+#~ msgid "Reload"
+#~ msgstr "Ls om"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "Ls om den markerade insticksmodulen"
+
+#~ msgid "Unload"
+#~ msgstr "Glm"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "Glm den valda insticksmodulen"
+
+#~ msgid "Close this window"
+#~ msgstr "Stng detta fnster"
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "Anvnd ramlsa knappar"
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "Ignorera automatiserade TiK-meddelanden"
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "Hj fnster vid hndelser"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Gaim-felskningsutdatafnster"
+
+#~ 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 ""
+#~ "Du har frskt att lsa in ett protokoll som inte kompilerades frn samma "
+#~ "version av kllkoden som detta program var. Tyvrr betyder detta att jag "
+#~ "inte kan sga vilken version det var eftersom det inte r samma version. "
+#~ "Det behvs kanske inte sgas, men det lstes inte in."
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s anvnde %s, som togs bort. %s r nu frnkopplad."
+
+#~ msgid "Accept?"
+#~ msgstr "Acceptera?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Gadu-Gadu-fel"
 
@@ -3778,18 +4728,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "Byte av lsenord misslyckades (%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "Inget sdant smeknamn/kanal"
-
-#~ msgid "IRC Error"
-#~ msgstr "IRC-fel"
-
-#~ msgid "No such server"
-#~ msgstr "Ingen sdan server"
-
-#~ msgid "IRC Part"
-#~ msgstr "IRC-lmnande"
-
 #~ msgid "Incorrect current password! Password NOT Changed!"
 #~ msgstr "Ogiltigt aktuellt lsenord! Lsenordet ndrades INTE!"
 
@@ -3808,9 +4746,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "MSN-fel"
 
-#~ msgid "Invalid name"
-#~ msgstr "Ogiltigt namn"
-
 #~ msgid "Chat Error!"
 #~ msgstr "Chattfel!"
 
@@ -3826,9 +4761,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "Oknd orsak"
 
-#~ msgid "AOL error"
-#~ msgstr "AOL-fel"
-
 #~ msgid "Error"
 #~ msgstr "Fel"
 
@@ -3930,15 +4862,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "Rapportera inaktivitetstider"
 
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#~ msgid "Gaim Use"
-#~ msgstr "Gaim-anvndning"
-
-#~ msgid "X Use"
-#~ msgstr "X-anvndning"
-
 #~ msgid "Opera"
 #~ msgstr "Opera"
 
@@ -3958,9 +4881,6 @@
 #~ "Inte alla protokoll kan anvnda dessa proxyalternativ. Se filen README "
 #~ "fr detaljer."
 
-#~ msgid "No Proxy"
-#~ msgstr "Ingen proxy"
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -3973,12 +4893,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Alternativ fr kompislista"
 
-#~ msgid "Tab Placement:"
-#~ msgstr "Flikplacering:"
-
-#~ msgid "Top"
-#~ msgstr "verst"
-
 #~ msgid "Raise Buddy List on Signons and Signoffs"
 #~ msgstr "Hj kompislista vid inloggningar och utloggningar"
 
@@ -3997,42 +4911,18 @@
 #~ msgid "IM Options"
 #~ msgstr "Snabbmeddelandealternativ"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "Visa knappar som: "
-
-#~ msgid "Pictures And Text"
-#~ msgstr "Bilder och text"
-
-#~ msgid "Pictures"
-#~ msgstr "Bilder"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "Visa alla konversationer i ett fnster med flikar"
-
 #~ msgid "Window Sizes"
 #~ msgstr "Fnsterstorlekar"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Flikplacering"
 
-#~ msgid "Left"
-#~ msgstr "Vnster"
-
-#~ msgid "Right"
-#~ msgstr "Hger"
-
 #~ msgid "Chat Options"
 #~ msgstr "Chattalternativ"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Visa konversationer i samma flikfnster"
 
-#~ msgid "Font Options"
-#~ msgstr "Typsnittsalternativ"
-
 #~ msgid "Italic Text"
 #~ msgstr "Kursiv text"
 
@@ -4066,15 +4956,9 @@
 #~ msgid "Conversations"
 #~ msgstr "Konversationer"
 
-#~ 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)."
 
--- a/po/zh_CN.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/zh_CN.po	Sun Jan 05 23:21:50 2003 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\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,370 +16,546 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "ʱ뿪"
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr ""
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+#, fuzzy
+msgid "Auto-login"
+msgstr "Զ¼"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "뿪"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr ""
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "ʺ"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr " Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "˳"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - "
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+# #: src/protocols/oscar/oscar.c:1771
+# #, c-format
+# msgid "User information for %s unavailable: %s"
+# msgstr "޷鵽û %s Ϣ"
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "ͼ"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr ""
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Gaim "
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr "ر"
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr ""
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr "ˢ"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr ""
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "ɾ"
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "б"
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "ĵб"
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr ""
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr ""
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr ""
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr ""
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 #, fuzzy
 msgid "(No"
 msgstr "No"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 #, fuzzy
 msgid "Change"
 msgstr "ȡ"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "дļ %s"
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "<HR><B>%s ѵ¼</B><BR><HR>"
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "ʱϢ"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "촰"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "֤ʧ"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+msgid "Notification Removal"
+msgstr ""
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "ֱܽ"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr ""
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "һҳʾжԻ"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr ""
 
-#: src/protocols/gg/gg.c:72
-msgid "Available for friends only"
-msgstr ""
-
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr "ʱ뿪"
-
 #: src/protocols/gg/gg.c:74
+msgid "Available for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 #, fuzzy
 msgid "Invisible"
 msgstr ""
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr ""
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 #, fuzzy
 msgid "Unable to resolve hostname."
 msgstr "ܶļ %s"
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 #, fuzzy
 msgid "Unable to connect to server."
 msgstr "ܵ¼ AIM"
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 #, fuzzy
 msgid "Error while reading from socket."
 msgstr "ȡļ %s "
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 #, fuzzy
 msgid "Error while writing to socket."
 msgstr "дļ %s "
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 #, fuzzy
 msgid "Authentication failed."
 msgstr "֤ʧ"
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr ""
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr ""
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr ""
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 #, fuzzy
 msgid "Could not connect"
 msgstr "޷"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 #, fuzzy
 msgid "Unable to read socket"
 msgstr "ܶļ %s"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 #, fuzzy
 msgid "Unable to connect."
 msgstr "ֱܽ"
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 #, fuzzy
 msgid "Reading data"
 msgstr ""
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr ""
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr ""
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr ""
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr ""
 
-#: src/protocols/gg/gg.c:521
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
+#, fuzzy, c-format
+msgid "Connect to %s failed"
+msgstr "ѹر"
+
+#: src/protocols/gg/gg.c:531
 #, fuzzy
 msgid "Unable to ping server"
 msgstr "ֱܽ"
 
-#: src/protocols/gg/gg.c:533
+#: src/protocols/gg/gg.c:543
 #, fuzzy
 msgid "Send as message"
 msgstr "Ϣ"
 
-#: src/protocols/gg/gg.c:541
+#: src/protocols/gg/gg.c:551
 #, fuzzy
 msgid "Looking up GG server"
 msgstr "Ѱ %s"
 
-#: src/protocols/gg/gg.c:544
+#: src/protocols/gg/gg.c:554
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr ""
 
-#: src/protocols/gg/gg.c:570
-#, fuzzy, c-format
-msgid "Connect to %s failed"
-msgstr "ѹر"
-
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr ""
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr ""
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr ""
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr ""
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 #, fuzzy
 msgid "yes"
 msgstr "Yes"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 #, fuzzy
 msgid "no"
 msgstr "ϸ"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr ""
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 #, fuzzy
 msgid "First name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 #, fuzzy
 msgid "Second Name"
 msgstr "¼"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr ""
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr ""
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr ""
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr ""
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "б"
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "б"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "Gaim - "
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "б"
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "ֱܽ"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "ܶļ %s"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 #, fuzzy
 msgid "Directory Search"
 msgstr "ַ¼"
@@ -388,776 +564,1116 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 #, fuzzy
 msgid "Import Buddy List from Server"
 msgstr "б"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 #, fuzzy
 msgid "Export Buddy List to Server"
 msgstr "б"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "ܶļ %s"
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "ȡ"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "ܾ"
+
+#: src/protocols/icq/gaim_icq.c:306
 #, fuzzy
 msgid "Send message through server"
 msgstr "Ϣ"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "ûϸ"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Gaim ʹ"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, fuzzy, c-format
 msgid "DCC Chat with %s closed"
 msgstr "<HR><B> %s ֱ֮Ѿرա</B><BR><HR>"
 
-#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "ѹر"
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr ""
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:830
-msgid "No IRC nickname given"
-msgstr ""
-
-#: src/protocols/irc/irc.c:976
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "עµû"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr ""
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+#, fuzzy
+msgid "IRC Error"
+msgstr ""
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr ""
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+msgid "No nickname given"
+msgstr ""
+
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 msgid ""
-"%s has requested a DCC chat.  Would you like to establish the direct "
-"connection?"
-msgstr ""
-
-#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "ѶϿ"
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 #, fuzzy
 msgid "Unable to write"
 msgstr "дļ %s"
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "㱻 (%s) ϳˣ"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "ûϸ"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2232
 #, fuzzy
 msgid "Channel:"
 msgstr "ȡ"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "룺"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 #, fuzzy
 msgid "DCC Chat"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+#, fuzzy
+msgid "Server:"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "˿"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "ܶļ %s"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "ܶļ %s"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Ϣ"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 msgid "No such user."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "Ƕ"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 #, fuzzy
 msgid "Authenticating"
 msgstr "֤ʧ"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 #, fuzzy
 msgid "Unknown login error"
 msgstr "¼"
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Gaim - "
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 #, fuzzy
 msgid "Connection lost"
 msgstr "ѹر"
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 #, fuzzy
 msgid "Unable to connect"
 msgstr "ֱܽ"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 #, fuzzy
 msgid "Connected"
 msgstr "ѶϿ"
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "֤ʧ"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 #, fuzzy
 msgid "Connecting"
 msgstr "ѹر"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 #, fuzzy
 msgid "Jabber Error"
 msgstr "Ϣ"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2656
-#, fuzzy
-msgid "Server:"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 #, fuzzy
 msgid "Handle:"
 msgstr "ʱ䣺"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "ֱܽ"
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 #, fuzzy
 msgid "Chats"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 #, fuzzy
 msgid "View Error Msg"
 msgstr "鿴¼"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "յʱ뿪Ϣ"
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 #, fuzzy
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 #, fuzzy
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 #, fuzzy
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr ""
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 #, fuzzy
 msgid "Telephone"
 msgstr "ȫѡ"
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 #, fuzzy
 msgid "Role"
 msgstr "ɾ"
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 #, fuzzy
 msgid "User Identity"
 msgstr "ûϸ"
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 #, fuzzy
 msgid "Server Registration successful!"
 msgstr "ûע"
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 #, fuzzy
 msgid "Set User Info"
 msgstr "ûϸ"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 #, fuzzy
 msgid "Invalid User"
 msgstr ""
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr ""
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 #, fuzzy
 msgid "Invalid Username"
 msgstr ""
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 #, fuzzy
 msgid "Invalid Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 #, fuzzy
 msgid "Not on list"
 msgstr "ѹر"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 #, fuzzy
 msgid "Not logged in"
 msgstr "<HR><B>%s ѵ¼</B><BR><HR>"
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 #, fuzzy
 msgid "Internal server error"
 msgstr "ڲ"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 #, fuzzy
 msgid "File operation error"
 msgstr "ڲӴ\n"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 #, fuzzy
 msgid "Memory allocation error"
 msgstr "شӴ\n"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 #, fuzzy
 msgid "Server busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 #, fuzzy
 msgid "Server unavailable"
 msgstr "ַ¼ʱϡ"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 #, fuzzy
 msgid "Database connect error"
 msgstr "ڲӴ\n"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 #, fuzzy
 msgid "Error creating connection"
 msgstr "g003: Ӵ\n"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 #, fuzzy
 msgid "Too many sessions"
 msgstr "ƥ̫ࡣ"
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 #, fuzzy
 msgid "Authentication failed"
 msgstr "֤ʧ"
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 #, fuzzy
 msgid "Not allowed when offline"
 msgstr "ĵؽȥǹزҪ"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 #, fuzzy
 msgid "Unknown Error Code"
 msgstr "¼"
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 msgid "An MSN message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "AOL "
+
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "ܵ¼ AIM"
+
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1179
+#: src/protocols/msn/msn.c:1401
 #, fuzzy
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "㱻 (%s) ϳˣ"
 
-#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 #, fuzzy
 msgid "Error reading from server"
 msgstr "ȡļ %s "
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "ܵ¼ AIM"
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "ܵ¼ AIM"
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Э鶯"
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "ֱܽ"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "ܵ¼ AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr ""
+"%s\n"
+"%s ޷¼ %s"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 #, fuzzy
 msgid "Unable to send password"
 msgstr "ܶļ %s"
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 #, fuzzy
 msgid "Password sent"
 msgstr "룺"
 
-#: src/protocols/msn/msn.c:1752
-#, fuzzy
-msgid "Unable to write to server"
-msgstr "ܵ¼ AIM"
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "дļ %s"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr ""
+"%s\n"
+"%s ޷¼ %s"
+
+#: src/protocols/msn/msn.c:1974
 #, fuzzy
 msgid "Synching with server"
 msgstr "עµû"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 #, fuzzy
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 #, fuzzy
 msgid "Hidden"
 msgstr "ظǶǵͼ"
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+msgid "Be right back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2430
+msgid "Away from the computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2432
+msgid "On the phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2434
+msgid "Out to lunch"
+msgstr ""
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+msgid "Idle"
+msgstr "ת"
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "ļ"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "¼"
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "¼"
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "Ҫ飺"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "ַ¼ʱϡ"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+#, fuzzy
+msgid "In local permit/deny"
+msgstr "ij˼ܾ"
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "ַ¼ʱϡ"
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "<HR><B> %s ֱ֮Ѿرա</B><BR><HR>"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, fuzzy, c-format
 msgid "Direct IM with %s failed"
 msgstr "<HR><B> %s ֱ֮Ѿرա</B><BR><HR>"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "Ӵ\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "شӴ\n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "ѶϿ"
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "㱻 (%s) ϳˣ"
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "û졣"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "ӵ"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "ͳȺӦ\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "ڲӴ\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "ܵ¼ AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "¼ %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "dz\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "޷"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 msgid "Connection established, cookie sent"
 msgstr "ӳɹͳɡɣ"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr ""
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr ""
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "ʱûи÷"
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1165,50 +1681,87 @@
 "ӣϿƵ̫ˣʮԡҪԣȵʱ"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "ʹõ汾̫ˡµİɣ"
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "֤ʧ"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "ڲ"
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "<HR><B>ѽ %s ֱӡ</B><BR><HR>"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+msgid "Transfer timed out"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "ӵ"
+
+#: src/protocols/oscar/oscar.c:1632
+msgid "File transfer aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+msgid "No reason given."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "֤ʧ"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1216,479 +1769,569 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-msgid "No reason given."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1587
-#, fuzzy, c-format
-msgid "You missed %d message from %s because it was invalid."
-msgstr "һ %s ļʱϢϢ̫ˡ"
-
-#: src/protocols/oscar/oscar.c:1588
-#, fuzzy, c-format
-msgid "You missed %d messages from %s because they were invalid."
-msgstr "һ %s ļʱϢϢ̫ˡ"
-
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:2141
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
+#, c-format
+msgid ""
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
+#, c-format
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2254
 #, fuzzy, c-format
-msgid "You missed %d message from %s because it was too large."
+msgid "You missed %hu message from %s because it was invalid."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:2255
 #, fuzzy, c-format
-msgid "You missed %d messages from %s because they were too large."
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "һ %s ļʱϢϢ̫ˡ"
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1607
+#: src/protocols/oscar/oscar.c:2265
 #, fuzzy, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
+msgid "You missed %hu messages from %s because they were too large."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1608
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgstr "һ %s ļʱϢϢ̫ˡ"
+
+#: src/protocols/oscar/oscar.c:2275
 #, fuzzy, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1617
+#: src/protocols/oscar/oscar.c:2284
 #, fuzzy, c-format
-msgid "You missed %d message from %s because it was too evil."
+msgid "You missed %hu message from %s because he/she was too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1618
+#: src/protocols/oscar/oscar.c:2285
 #, fuzzy, c-format
-msgid "You missed %d messages from %s because they are too evil."
+msgid "You missed %hu messages from %s because he/she was too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1627
+#: src/protocols/oscar/oscar.c:2294
 #, fuzzy, c-format
-msgid "You missed %d message from %s because you are too evil."
+msgid "You missed %hu message from %s because you are too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1628
+#: src/protocols/oscar/oscar.c:2295
 #, fuzzy, c-format
-msgid "You missed %d messages from %s because you are too evil."
+msgid "You missed %hu messages from %s because you are too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1636
+#: src/protocols/oscar/oscar.c:2303
 #, fuzzy, c-format
-msgid "You missed %d message from %s for unknown reasons."
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "Īضʧһ %s Ϣ"
 
-#: src/protocols/oscar/oscar.c:1637
+#: src/protocols/oscar/oscar.c:2304
 #, fuzzy, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+msgid "You missed %hu messages from %s for an unknown reason."
 msgstr "Īضʧһ %s Ϣ"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2342
+#, c-format
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1707
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2389
 #, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1736
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1755
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "¼"
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
+msgid "No reason was given."
+msgstr ""
+
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
 #, fuzzy, c-format
-msgid "Your message to %s did not get sent: %s"
+msgid "Your message to %s did not get sent:"
 msgstr "Ϣ޷ͳ"
 
-#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
-msgid "No reason was given."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1772
+#: src/protocols/oscar/oscar.c:2528
 #, c-format
-msgid "User information for %s unavailable: %s"
+msgid "User information for %s unavailable:"
 msgstr ""
 
 # #: src/protocols/oscar/oscar.c:1771
 # #, c-format
 # msgid "User information for %s unavailable: %s"
 # msgstr "޷鵽û %s Ϣ"
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "ͼ"
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "IM ͼ"
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "ļ"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr "ļ"
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "Ϸ"
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "Ʊ"
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "б"
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 #, fuzzy
 msgid "AP User"
 msgstr "¼û"
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1886
-#, fuzzy
+#: src/protocols/oscar/oscar.c:2655
 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 ""
-"û: <B>%s</B>  %s <BR>\n"
-"%s 漶 : <B>%d %%</B><BR>\n"
-"ʱ¼: <B>%s</B><BR>\n"
-"ʱ䣨ӣ: <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:1914
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2677
 #, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "ûƣ <B>%s</B>\n"
 "<BR>漶 <B>%d %%</B>\n"
 "<BR>ʱ̣ <B>%s</B><BR>תʱ䣨ӣ <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>û뿪ʱû¿</i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 #, fuzzy
 msgid "Client Capabilities: "
 msgstr "ԣ%s\n"
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>δṩκϢ</i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "ӿѾϿ"
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "֤ʧ"
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "֤ʧ"
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "g003: Ӵ\n"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "ʺ"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "ܶļ %s"
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, 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:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "ֱܽ"
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4621
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
 #, 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 ׽¶ĺβͣзա"
-
-#: src/protocols/oscar/oscar.c:3586
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4642
 #, 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:3593
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3618
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4667
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "յʱ뿪Ϣ"
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "ֱϢ"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 #, fuzzy
 msgid "Get Capabilities"
 msgstr "ԣ%s\n"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "дļ %s"
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "ܶļ %s"
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Ϣ̫ %s Ԫˡ"
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s δ¼"
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr " %s "
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "ȡһϢ㳬˷ٶơ"
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr " %s 졣"
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "㷢͸ %s ٶ̫ˡ"
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "һ %s ļʱϢϢ͵ٶ̫졣"
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "ʧˡ"
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "ƥ̫ࡣ"
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr "ҪIJ"
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "ַ¼ʱϡ"
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "ʲơ"
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "ؼֱԡ"
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "ûйؼ֡"
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "ûûַ¼"
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "֧ҡ"
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr " %s "
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "ʱûи÷"
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr "Ŀǰľ漶̫ߣ޷롣"
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "ĵ¼ %s"
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, fuzzy, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr " %d ˡѶϢ %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "ѹر"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "ȴӦ"
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC ȡͣԼϢˡ"
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Gaim - "
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -1699,259 +2342,248 @@
 "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:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "ַ¼"
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr "TOC "
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "TOC "
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "޷ӡ"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "޷ӡ"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "޷ӡ"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - Ϊ"
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, 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:1963
+#: src/protocols/toc/toc.c:1980
 #, 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:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s Ƿһļ"
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ϣ޷ͳ"
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+#, fuzzy
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr ""
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr " Gaim  %s "
 
-#: src/about.c:135
+#: src/about.c:112
 #, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written using Gtk+ and is licensed under the GPL.\n"
 "URL: "
 
-#: src/about.c:137
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
-msgstr ""
-
-#: src/about.c:147
+#: src/about.c:122
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-msgstr ""
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "ַ"
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr "뿪"
-
-#: src/aim.c:162
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "ر"
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "ĵ¼"
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - ¼"
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "¼"
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr "룺"
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "˳"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr "ʺ"
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr "¼"
-
-#: src/aim.c:354
-msgid "About"
-msgstr ""
-
-#: src/aim.c:355
-msgid "Options"
-msgstr "ѡ  "
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr "    "
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr ""
-
-#: src/aim.c:841 src/multi.c:1481
-#, fuzzy
-msgid "Auto-login"
-msgstr "Զ¼"
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - ʱ뿪"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "Һֻˣ"
 
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr ""
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "µʱ뿪Ϣ"
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "ɾ뿪Ϣ"
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "ʺΪ뿪"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Ⱥ"
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "ʱϢ"
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "ϸ"
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "Ŷ"
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr "Ӽ"
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "鿴¼"
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr ""
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "ȥŶ"
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "ȡ"
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(1 Ϣ)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr ""
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "ѵ¼ʺţ %s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "棺%d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "ԣ%s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1962,16 +2594,16 @@
 "¼%s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "ʱ䣺"
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "<HR><B>%s ѵ¼</B><BR><HR>"
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, fuzzy, c-format
 msgid "%s logged out."
 msgstr "<HR><B>%s ѵ¼</B><BR><HR>"
@@ -1980,177 +2612,173 @@
 # #, c-format
 # msgid "%s logged out."
 # msgstr "<HR><B>%s 뿪 %s%s </B><BR><HR>"
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "ѡеѵ"
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "ʱϢ"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "һ"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "ʱ뿪Ϣ"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - б"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "ļ"
 
-#: src/buddy.c:2667
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr "һǶ"
 
-#: src/buddy.c:2669
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr ""
 
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr "ʱϢ"
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "µʱ뿪Ϣ"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr "ûϸ"
 
-#: src/buddy.c:2678
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "б"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "ظǶǵͼ"
+
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2706
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "ʺ"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr ""
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Э鶯"
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "˽"
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "鿴ϵͳ¼"
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl "
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr "ؽű"
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "жؽű"
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr "гѼؽű"
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 #, fuzzy
 msgid "Online Help"
 msgstr ""
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 #, fuzzy
 msgid "Debug Window"
 msgstr "ʾ Debug "
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr " Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "б"
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "һ¸Ƕ"
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "һ¸Ƕ"
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 #, fuzzy
 msgid "Remove selected Buddy/Group"
 msgstr "ɾѡеĸǶ"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "޸б"
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - б"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr ""
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "趨ʹõdzƣ"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr "ȡ"
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr ""
 
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "Ϣ"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 #, fuzzy
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr ""
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 #, fuzzy
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr ""
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, fuzzy, c-format
 msgid "%d %s in room"
 msgstr "ûˣȥ"
@@ -2160,639 +2788,549 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr " %d һ"
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s "
 
-#: src/buddy_chat.c:1010
+# #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+# #: src/buddy_chat.c:1544
+# #, c-format
+# msgid "%d %s in room"
+# msgstr " %d һ"
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s "
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "[%s] ʹû [%s]"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, fuzzy, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 뿪"
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s 뿪"
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim Ⱥ"
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "⣺"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "ûˣȥ"
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr "Ļ"
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "ͳ"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
+#: src/buddy_chat.c:1586 src/conversation.c:2906
+msgid "Warn"
+msgstr ""
+
+#: src/buddy_chat.c:1592 src/conversation.c:2925
 msgid "Block"
 msgstr "ס죡"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
-msgid "Warn"
-msgstr ""
-
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - ¼Ի"
-
-#: src/conversation.c:492
+#: src/conversation.c:443
 #, fuzzy
 msgid "Gaim - Insert Image"
 msgstr "Gaim - ʱϢû"
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "Īضʧһ %s Ϣ"
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr "Ŀǰ %d"
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "λ趨 %d\n"
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr ""
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr ""
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr "б"
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr "б"
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr "¼"
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr "¼"
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr ""
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr ""
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "С"
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr "С"
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "С"
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr ""
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr ""
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr ""
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "ѡ"
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr ""
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "ɫ"
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr "ɫ"
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr "ɫ"
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "Ի"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "볬"
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr ""
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr "Цͼ"
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "Ц"
-
-#: src/conversation.c:2272
-#, fuzzy
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "IM ͼ"
 
-#: src/conversation.c:2272
-#, fuzzy
-msgid "Image"
-msgstr "IM ͼ"
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "ر"
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "ѡ  "
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "ʼ¼"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr "¼"
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr "Ի"
-
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr ""
-
-#: src/conversation.c:2294
-#, fuzzy
-msgid "Toggle Sound"
-msgstr "򿪣رռ¼"
-
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr ""
-
-#: src/conversation.c:2782
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr ""
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - жԻ"
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "Ϣ"
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 #, fuzzy
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Ϊ"
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr ""
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 #, fuzzy
 msgid "Enable Animation"
 msgstr ""
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 #, fuzzy
 msgid "Hide Icon"
 msgstr "ظǶǵͼ"
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 #, fuzzy
 msgid "Save Icon As..."
 msgstr "Gaim - Ϊ"
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "Gaim - û"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "뾯 %s"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "棿"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
+#: src/dialogs.c:438
+#, fuzzy
+msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "治ô"
 
-#: src/dialogs.c:471
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr " %sѱɾȥ\n"
 
-#: src/dialogs.c:496
-#, fuzzy, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - "
-
-#: src/dialogs.c:509
-#, fuzzy
-msgid "Remove Buddy"
-msgstr "Ƕ"
-
-#: src/dialogs.c:519
-#, c-format
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "¼"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
+msgstr "ʺ"
+
+#: src/dialogs.c:804
 msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
-msgstr ""
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr ""
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "ȷ"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - ʱϢû"
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr "һTʱϢ"
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "û"
-
-#: src/dialogs.c:816
-#, fuzzy
-msgid "Account:"
-msgstr "ʺ"
-
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "Gaim - ȡû"
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr ""
-
-#: src/dialogs.c:1004
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "Ⱥ"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr ""
-
-#: src/dialogs.c:1110
-#, fuzzy
-msgid "Contact"
-msgstr ""
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "¼"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 #, fuzzy
 msgid "Add To"
 msgstr ""
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - ʱ뿪"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
-msgstr ""
-
-#: src/dialogs.c:1451
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr "˽ѡΪ"
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "еûϵ"
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "ֻûϵ"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "ֻûϵ"
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr "ûб"
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "ܾûϵ"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "סЩһ"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "סļһ"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "ҪӵģǶ"
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - "
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 #, fuzzy
 msgid "Account"
 msgstr "ʺ"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "Ӻʱ¼"
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "Ӻʱ"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "Ӻʱ־ָ"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "ѵ¼"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 #, fuzzy
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 #, fuzzy
 msgid "Open IM Window"
 msgstr "ʱϢ"
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr ""
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 #, fuzzy
 msgid "Send Message"
 msgstr "Ϣ"
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "ִֶ"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "ֶͲ"
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "´ηȻִ"
 
-#: src/dialogs.c:1971
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr ""
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "ȡ"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 趨ַ¼"
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "ַ¼"
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "ҳѰҵ"
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr ""
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr ""
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr ""
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr ""
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "ʡ"
 
-#: src/dialogs.c:2126
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr ""
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "벻һ"
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "еı"
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr ""
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr ""
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "루ȷ"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "ȷ"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 趨û"
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "Ľ"
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr "ܾ"
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - ӽֹ"
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ¼Ի"
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "Ѱ"
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - ûϲѰ"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ݵʲѰ"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "볬"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "趨ɫ"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "趨ɫ"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "ѡ"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr ""
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - б"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "ʱ뿪Ϣûб"
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "ʱ뿪ϢΪ"
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - ʱ뿪Ϣ"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "µʱ뿪Ϣ"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "ʱ뿪⣺"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "沢ʹ"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "ʹ"
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "沢ʹ"
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "Ц"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr "ȡһŶ"
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - ȡһŶ"
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "ӵ"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - ¼Ϊ"
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "ܽ\n"
@@ -2801,149 +3339,176 @@
 # #, c-format
 # msgid "Unable to remove file %s - %s"
 # msgstr "ɾļ %s"
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "Ҫ¼"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "ȷ"
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 #, fuzzy
 msgid "Date"
 msgstr "ʡ"
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 #, fuzzy
 msgid "Conversation"
 msgstr "Ի"
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - "
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr ""
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
+msgid "Gaim - Rename Buddy"
+msgstr "Gaim - Ƕ"
+
+#: src/dialogs.c:4445
+msgid "Rename Buddy"
+msgstr "Ƕ"
+
+#: src/dialogs.c:4452
 msgid "New name:"
 msgstr "֣"
 
-#: src/dialogs.c:4484
-msgid "Gaim - Rename Buddy"
-msgstr "Gaim - Ƕ"
-
-#: src/dialogs.c:4494
-msgid "Rename Buddy"
-msgstr "Ƕ"
-
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - ѡ Perl ű"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr ""
 
-#: src/html.c:183
+#: src/html.c:185
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
 msgstr "յˣ%s\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Ӵ\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr ""
-"%s\n"
-"%s ޷¼ %s"
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "¼"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "Э飺"
+
+#: src/multi.c:542
 #, fuzzy
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - "
 
-#: src/multi.c:497
+#: src/multi.c:585
 #, fuzzy
 msgid "Buddy Icon File:"
 msgstr "ͼ"
 
-#: src/multi.c:508
+#: src/multi.c:598
 #, fuzzy
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr ""
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "ӵ %s\n"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "¼"
 
-#: src/multi.c:559
+#: src/multi.c:653
 #, fuzzy
 msgid "Alias:"
 msgstr "Ŷ"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "Э飺"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "ס"
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "Զ¼"
 
-#: src/multi.c:616
+#: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "ѡ"
+
+#: src/multi.c:715
 msgid "New Mail Notifications"
 msgstr ""
 
-#: src/multi.c:706
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "ѡ  "
+
+#: src/multi.c:809
 #, fuzzy
 msgid "Register with server"
 msgstr "עµû"
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - ޸ʺ"
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr ""
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "룺"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "¼"
+
+#: src/multi.c:1077
 #, fuzzy
 msgid "TOC not found."
 msgstr "Ҳļ %s\n"
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "Э鶯"
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2952,577 +3517,604 @@
 "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:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "ɾ %s"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "ɾ"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - ʺű༭"
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr "ȫѡ"
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr "ѡԶظϢ"
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "ȫѡ"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "޸"
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "¼/뿪"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr "ɾ"
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr ""
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "¼ %s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - ʺű༭"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "ȡ"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "¼"
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 #, fuzzy
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 #, fuzzy
 msgid "Connection Error"
 msgstr "ѹر"
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim - б"
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - "
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-#, fuzzy
-msgid "Loaded Plugins"
-msgstr ""
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr "ȫѡ"
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr "ļ·"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr ""
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "ļز"
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr "趨"
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "ѡIJ"
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr "¼"
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "¼ѡеIJ"
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr "жز"
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "жѡIJ"
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "ڽ̸ʾ¼dzϢ"
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr "һѡ"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "ʾ Debug "
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "ʹޱ߿ť"
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "ʽ"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr ""
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr "б"
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr "¼"
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr ""
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr "ȡ"
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "Цͼ"
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "Цͼ"
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr "ɫ"
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "ɫ"
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "ɫ"
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr "бʾ"
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "ʾͼЦ"
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "Ϣʾʱ"
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "Գӷʽʾ URL"
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "ʾƴĵ"
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "յϢɫ"
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "յϢ"
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "յϢС"
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "ԶɵϢ"
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr " Enter Ϣ"
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl-Enter Ϣ"
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "ʱϢ"
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "ESC رմ"
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "ESC رմ"
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Ctrl-{B/I/U/S}  HTML "
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "Ctrl- Цͼ"
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr "׶"
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr " Ϣ/Ϣ/ ť"
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "ڰťʾͼ"
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "б"
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "洰ڵĴСλ"
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "¼ʱ"
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr "ʾ"
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "ûиǶ¼"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "ʾ"
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr "бʾ"
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 #, fuzzy
 msgid "Show buddy type _icons"
 msgstr "ʾͼ"
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "ʾ漶"
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "ʾתʱ"
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 msgid "Grey i_dle buddies"
 msgstr ""
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "ʱϢ"
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "ťʾã"
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "ͼ"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr ""
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "ͼκ"
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "µĴڿ趨"
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "µĴڸ߶趨"
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "봰ڸ߶ȣ"
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "¼ʱ"
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "Ϣش"
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "ͼ"
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "ظǶǵͼ"
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr ""
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "ڽ̸ʾ¼dzϢ"
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 msgid "Typing Notification"
 msgstr ""
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 msgid "Notify buddies that you are _typing to them"
 msgstr ""
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr "TAB Զȫ"
 
-#: src/prefs.c:505
-#, fuzzy
-msgid "_Tab-Complete Nicks"
+#: src/prefs.c:406
+#, fuzzy
+msgid "_Tab-complete nicks"
 msgstr "TAB Զȫdz"
 
-#: src/prefs.c:506
-#, fuzzy
-msgid "_Old-Style Tab Completion"
+#: src/prefs.c:407
+#, fuzzy
+msgid "_Old-style tab completion"
 msgstr "ʽ TAB Զȫ"
 
-#: src/prefs.c:509
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr "ڴʾǼ/뿪Ϣ"
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Իҳλ"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr ""
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "׶"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "ұ"
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "һҳʾ"
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 #, fuzzy
 msgid "Show a_liases in tabs/titles"
 msgstr "ڴڻҳıʾŶ"
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr ""
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "һҳʾ"
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "ͬһһҳʾԻ"
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr "б"
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr ""
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr ""
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "޴"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr ""
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr "ַ"
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr "˿"
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr "¼û"
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr "¼"
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 #, fuzzy
 msgid "Browser Selection"
 msgstr "ѡ"
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr ""
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr "ûֲ"
+
+#: src/prefs.c:606
 msgid "Browser Options"
 msgstr "ѡ"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "ȱʡ´"
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr "Ϣ"
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr "ʱϢ"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "¼жԻ"
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr "¼ļڵ HTML "
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "鿴ϵͳ¼"
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "¼Ƕ¼˳ʱ"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "¼Ƕʲôʱ򷢴ʲôʱ"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "¼Ƕʲôʱ뿪ʲôʱ"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "¼Լʱ¼//뿪"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "ÿһǶʹòͬļ¼ļ"
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "ѡ"
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "ĵؽȥǹزҪ"
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "뿪ʱ"
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr ""
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr ""
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "ڲ"
+
+#: src/prefs.c:687
+#, fuzzy
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3531,153 +4123,225 @@
 "\n"
 "(ļ·ʹ %s; Ϊʹڲ)"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "ϢʱԶȡʱ뿪״̬"
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "ʱ뿪ʱյϢŵ"
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "ʱ뿪ʱµĶԻ"
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "ҪԶظ"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "ҪԶظ"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "ֻڷʱŷԶظ"
 
-#: src/prefs.c:828
-msgid "Idle"
-msgstr "ת"
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "ҪԶظ"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr ""
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Gaim ʹ"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "X ʹ"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "ʱϢ"
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr "ʱ뿪"
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "ʱ뿪Ϣ"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - "
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Test"
 msgstr ""
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "ѡ"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr "༭"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 msgid "Interface"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr "Ϣ"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "ʱϢ"
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "촰"
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "¼"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr "¼Ч"
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "ʱ뿪⣺"
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "ʱ뿪Ϣ"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr "    "
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - 趨"
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Gaim "
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
-msgstr ""
-
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"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:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "ʾ Debug "
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3685,131 +4349,394 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr "%s ʹ %sѾɾˡ%s ߡ"
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "ܣ"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "Gaim - ʾ"
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 #, fuzzy
 msgid "Gaim - New Mail"
 msgstr "Gaim - ļ"
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr ""
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, fuzzy, c-format
 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:590
+#: src/prpl.c:634
 msgid ""
 "\n"
 "\n"
 "Do you wish to add him or her to your buddy list?"
 msgstr ""
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 
-#: src/prpl.c:670
+#: src/prpl.c:714
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - ûע"
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 msgid "Register"
 msgstr "ע"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "ĵ¼"
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d Ϣ)"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(1 Ϣ)"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr "Yes"
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1101
+#: src/server.c:1163
 #, fuzzy
 msgid "More Info"
 msgstr "ûϸ"
 
-#: src/sound.c:63
+#: src/sound.c:68
 #, fuzzy
 msgid "Buddy logs in"
 msgstr "ͼ"
 
-#: src/sound.c:64
+#: src/sound.c:69
 #, fuzzy
 msgid "Buddy logs out"
 msgstr "ӵѣ"
 
-#: src/sound.c:65
+#: src/sound.c:70
 #, fuzzy
 msgid "Message received"
 msgstr "յϢʱ"
 
-#: src/sound.c:66
+#: src/sound.c:71
 #, fuzzy
 msgid "Message received begins conversation"
 msgstr "µĶԻʱ"
 
-#: src/sound.c:67
+#: src/sound.c:72
 #, fuzzy
 msgid "Message sent"
 msgstr "Ϣ"
 
-#: src/sound.c:68
+#: src/sound.c:73
 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 "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:75
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:76
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr ""
 
 #, fuzzy
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "һ %s ļʱϢϢ̫ˡ"
+
+#, 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>"
+#~ msgstr ""
+#~ "û: <B>%s</B>  %s <BR>\n"
+#~ "%s 漶 : <B>%d %%</B><BR>\n"
+#~ "ʱ¼: <B>%s</B><BR>\n"
+#~ "ʱ䣨ӣ: <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\"> : "
+#~ "Ա"
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "֤ʧ"
+
+#~ 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 ׽¶ĺβͣзա"
+
+#~ msgid "Web Site"
+#~ msgstr "ַ"
+
+#~ msgid "Password: "
+#~ msgstr "룺"
+
+#~ msgid "About"
+#~ msgstr ""
+
+#~ msgid "Perl"
+#~ msgstr "Perl "
+
+#~ msgid "Load Script"
+#~ msgstr "ؽű"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "жؽű"
+
+#~ msgid "List Scripts"
+#~ msgstr "гѼؽű"
+
+#~ msgid "Whisper"
+#~ msgstr "Ļ"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - ¼Ի"
+
+#~ msgid "Currently at %d, "
+#~ msgstr "Ŀǰ %d"
+
+#~ msgid "Setting position to %d\n"
+#~ msgstr "λ趨 %d\n"
+
+#~ msgid "Bold Text"
+#~ msgstr ""
+
+#~ msgid "Bold"
+#~ msgstr ""
+
+#~ msgid "Italics Text"
+#~ msgstr "б"
+
+#~ msgid "Italics"
+#~ msgstr "б"
+
+#~ msgid "Underline Text"
+#~ msgstr "¼"
+
+#~ msgid "Underline"
+#~ msgstr "¼"
+
+#~ msgid "Strike through Text"
+#~ msgstr ""
+
+#~ msgid "Strike"
+#~ msgstr ""
+
+#~ msgid "Decrease font size"
+#~ msgstr "С"
+
+#~ msgid "Small"
+#~ msgstr "С"
+
+#~ msgid "Normal font size"
+#~ msgstr "С"
+
+#~ msgid "Normal"
+#~ msgstr ""
+
+#~ msgid "Increase font size"
+#~ msgstr ""
+
+#~ msgid "Big"
+#~ msgstr ""
+
+#~ msgid "Font"
+#~ msgstr ""
+
+#~ msgid "Text Color"
+#~ msgstr "ɫ"
+
+#~ msgid "Background Color"
+#~ msgstr "ɫ"
+
+#~ msgid "Link"
+#~ msgstr ""
+
+#~ msgid "Insert smiley face"
+#~ msgstr "Цͼ"
+
+#~ msgid "Smiley"
+#~ msgstr "Ц"
+
+#, fuzzy
+#~ msgid "Image"
+#~ msgstr "IM ͼ"
+
+#, fuzzy
+#~ msgid "Toggle Sound"
+#~ msgstr "򿪣رռ¼"
+
+#~ msgid "Sound"
+#~ msgstr ""
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - û"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "뾯 %s"
+
+#, fuzzy
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - "
+
+#, fuzzy
+#~ msgid "Remove Buddy"
+#~ msgstr "Ƕ"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - ʱϢû"
+
+#~ msgid "IM who:"
+#~ msgstr "һTʱϢ"
+
+#~ msgid "User:"
+#~ msgstr "û"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim - ȡû"
+
+#~ msgid "Add Group"
+#~ msgstr ""
+
+#~ msgid "Add Buddy"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Contact"
+#~ msgstr ""
+
+#~ msgid "Allow List"
+#~ msgstr "ûб"
+
+#~ msgid "Block List"
+#~ msgstr "סļһ"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "ȡһŶ"
+
+#~ msgid "Rename Group"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr ""
+#~ "%s\n"
+#~ "%s ޷¼ %s"
+
+#~ msgid "Select All"
+#~ msgstr "ȫѡ"
+
+#~ msgid "Select Autos"
+#~ msgstr "ѡԶظϢ"
+
+#~ msgid "Select None"
+#~ msgstr "ȫѡ"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "¼/뿪"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim - б"
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - "
+
+#, fuzzy
+#~ msgid "Loaded Plugins"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr "ȫѡ"
+
+#~ msgid "Filepath:"
+#~ msgstr "ļ·"
+
+#~ msgid "Load"
+#~ msgstr ""
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "ļز"
+
+#~ msgid "Configure"
+#~ msgstr "趨"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "ѡIJ"
+
+#~ msgid "Reload"
+#~ msgstr "¼"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "¼ѡеIJ"
+
+#~ msgid "Unload"
+#~ msgstr "жز"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "жѡIJ"
+
+#~ msgid "Close this window"
+#~ msgstr "ڽ̸ʾ¼dzϢ"
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "ʹޱ߿ť"
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "ԶɵϢ"
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "¼ʱ"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Gaim "
+
+#~ msgid "%s was using %s, which got removed. %s is now offline."
+#~ msgstr "%s ʹ %sѾɾˡ%s ߡ"
+
+#~ msgid "Accept?"
+#~ msgstr "ܣ"
+
+#, fuzzy
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Gaim - "
 
@@ -3822,10 +4749,6 @@
 #~ msgstr ""
 
 #, fuzzy
-#~ msgid "IRC Error"
-#~ msgstr ""
-
-#, fuzzy
 #~ msgid "Password Change Error!"
 #~ msgstr "Gaim - "
 
@@ -3841,10 +4764,6 @@
 #~ msgid "MSN Error"
 #~ msgstr ""
 
-#, fuzzy
-#~ msgid "Invalid name"
-#~ msgstr ""
-
 #~ msgid "Chat Error!"
 #~ msgstr ""
 
@@ -3865,9 +4784,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "ԭ"
 
-#~ msgid "AOL error"
-#~ msgstr "AOL "
-
 #~ msgid "Error"
 #~ msgstr ""
 
@@ -3971,15 +4887,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "淢ʱ"
 
-#~ msgid "None"
-#~ msgstr ""
-
-#~ msgid "Gaim Use"
-#~ msgstr "Gaim ʹ"
-
-#~ msgid "X Use"
-#~ msgstr "X ʹ"
-
 #~ msgid "Netscape"
 #~ msgstr "Netscape"
 
@@ -3994,9 +4901,6 @@
 #~ "for details."
 #~ msgstr "еЭ鶼ʹЩã README ļ"
 
-#~ msgid "No Proxy"
-#~ msgstr "޴"
-
 #, fuzzy
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS v4 "
@@ -4004,13 +4908,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "бѡ"
 
-#, fuzzy
-#~ msgid "Tab Placement:"
-#~ msgstr "Իҳλ"
-
-#~ msgid "Top"
-#~ msgstr ""
-
 #~ msgid "Conversation Options"
 #~ msgstr "Իѡ"
 
@@ -4026,33 +4923,12 @@
 #~ msgid "IM Options"
 #~ msgstr "ʱϢѡ"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "ťʾã"
-
-#~ msgid "Pictures And Text"
-#~ msgstr "ͼκ"
-
-#~ msgid "Pictures"
-#~ msgstr "ͼ"
-
-#~ msgid "Text"
-#~ msgstr ""
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "һҳʾжԻ"
-
 #~ msgid "Window Sizes"
 #~ msgstr "ڴС趨"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Իҳλ"
 
-#~ msgid "Left"
-#~ msgstr ""
-
-#~ msgid "Right"
-#~ msgstr "ұ"
-
 #~ msgid "Chat Options"
 #~ msgstr "ѡ"
 
@@ -4096,15 +4972,9 @@
 #~ msgid "Conversations"
 #~ msgstr "Ի"
 
-#~ msgid "Enable sounds"
-#~ msgstr ""
-
 #~ msgid "KFM"
 #~ msgstr "KFM"
 
-#~ msgid "Manual"
-#~ msgstr "ûֲ"
-
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "ѵ¼"
 
@@ -4165,9 +5035,6 @@
 #~ msgid "Message:"
 #~ msgstr "Ϣ"
 
-#~ msgid "Command:"
-#~ msgstr ""
-
 #~ msgid "Sound:"
 #~ msgstr ""
 
@@ -4228,9 +5095,6 @@
 #~ msgid "Gaim - Export Buddy List"
 #~ msgstr "Gaim - б"
 
-#~ msgid "Logging Options"
-#~ msgstr "ӵ %s\n"
-
 #~ msgid "Text Only"
 #~ msgstr "ɫ"
 
@@ -4312,12 +5176,6 @@
 #~ msgid "TOC Options"
 #~ msgstr "ѡ"
 
-#~ msgid "TOC Host:"
-#~ msgstr "TOC "
-
-#~ msgid "Login Host:"
-#~ msgstr ""
-
 #~ msgid "HTTP Proxy"
 #~ msgstr "HTTP "
 
@@ -4348,9 +5206,6 @@
 #~ msgid "Permit some"
 #~ msgstr "ֻijЩ"
 
-#~ msgid "Add buddy to permit/deny"
-#~ msgstr "ij˼ܾ"
-
 #~ msgid "Remove buddy from permit/deny"
 #~ msgstr "ij˴ܾɾ"
 
--- a/po/zh_TW.po	Sun Jan 05 12:09:34 2003 +0000
+++ b/po/zh_TW.po	Sun Jan 05 23:21:50 2003 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"POT-Creation-Date: 2002-08-25 23:43-0400\n"
+"POT-Creation-Date: 2003-01-05 12:23-0500\n"
 "PO-Revision-Date: 2002-07-09 17:02+0800\n"
 "Last-Translator: Paladin Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -16,353 +16,525 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67 src/buddy_chat.c:272
+#: plugins/docklet/docklet.c:119
+msgid "New..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
+#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
+#: src/protocols/jabber/jabber.c:1165
+msgid "Away"
+msgstr "離開"
+
+#: plugins/docklet/docklet.c:129 src/away.c:485
+msgid "Back"
+msgstr "返回"
+
+#: plugins/docklet/docklet.c:138 src/multi.c:255
+msgid "Auto-login"
+msgstr "自動登入"
+
+#: plugins/docklet/docklet.c:143 src/buddy.c:2648
+msgid "Signoff"
+msgstr "登出"
+
+#: plugins/docklet/docklet.c:151
+#, fuzzy
+msgid "Mute Sounds"
+msgstr "音效"
+
+#: plugins/docklet/docklet.c:156
+#, fuzzy
+msgid "Accounts..."
+msgstr "帳    號"
+
+#: plugins/docklet/docklet.c:157
+#, fuzzy
+msgid "Preferences..."
+msgstr "偏好設定"
+
+#: plugins/docklet/docklet.c:161
+#, fuzzy
+msgid "About Gaim..."
+msgstr "關於 Gaim"
+
+#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgid "Quit"
+msgstr "退    出"
+
+#: plugins/docklet/docklet.c:400
+#, fuzzy
+msgid "Tray Icon Configuration"
+msgstr "Gaim - 音效設定"
+
+#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
+#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
+#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
+#: plugins/docklet/docklet.c:409
+msgid "_Hide new messages until tray icon is clicked"
+msgstr ""
+
+#: plugins/docklet/docklet.c:421
+#, fuzzy
+msgid "Tray Icon"
+msgstr "好友圖示"
+
+#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+msgid ""
+"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"display the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list or login window. Also "
+"allows messages to be queued until the icon is clicked, similar to ICQ "
+"(although the icon doesn't flash yet =)."
+msgstr ""
+
+#: plugins/docklet/docklet.c:424
+msgid "Robert McQueen &lt;robot101@debian.org>"
+msgstr ""
+
+#: plugins/docklet/docklet.c:430
+msgid "System Tray Icon"
+msgstr ""
+
+#: plugins/chatlist.c:72 src/buddy_chat.c:275
 msgid "Buddy Chat"
 msgstr "與好友聊天"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
+#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
+#: plugins/chatlist.c:357
 msgid "Gaim Chat"
 msgstr "Gaim - 聊天"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
-#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
-#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
-#: src/server.c:1097
-msgid "Close"
-msgstr "關閉"
-
-#: plugins/chatlist.c:344
+#: plugins/chatlist.c:306
 msgid "Chat Rooms"
 msgstr "聊天室"
 
-#: plugins/chatlist.c:363
+#: plugins/chatlist.c:318
 msgid "Refresh"
 msgstr "更新"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
-#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
-#: src/dialogs.c:2521 src/multi.c:1062
+#. buttons
+#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
+#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
 msgid "Add"
 msgstr "增加"
 
-#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
-#: src/dialogs.c:1496 src/dialogs.c:1530
+#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
+#: src/conversation.c:2890
 msgid "Remove"
 msgstr "移除"
 
-#: plugins/chatlist.c:388
+#: plugins/chatlist.c:336
 msgid "List of available chats"
 msgstr "現有的聊天室清單"
 
-#: plugins/chatlist.c:398
+#: plugins/chatlist.c:346
 msgid "List of subscribed chats"
 msgstr "訂閱的聊天室清單"
 
-#: plugins/gtik.c:699
+#: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr ""
 
-#: plugins/gtik.c:711
+#: plugins/gtik.c:731
 msgid "Update Frequency in min"
 msgstr "更新頻率(以分為單位)"
 
-#: plugins/gtik.c:727
+#: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
+#: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
 msgstr ""
 
-#: plugins/gtik.c:738
+#: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr ""
 
-#: plugins/gtik.c:974
+#: plugins/gtik.c:994
 msgid "(No"
 msgstr "(No"
 
-#: plugins/gtik.c:975
+#: plugins/gtik.c:995
 msgid "Change"
 msgstr "變更"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Unable to write to config file"
+msgstr "無法寫入檔案 %s。"
+
+#: plugins/notify.c:389
+#, fuzzy
+msgid "Notify plugin"
+msgstr "尚未登入"
+
+#: plugins/notify.c:561
+msgid "Notify For"
+msgstr ""
+
+#: plugins/notify.c:562
+#, fuzzy
+msgid "_IM windows"
+msgstr "即時訊息視窗"
+
+#: plugins/notify.c:567
+#, fuzzy
+msgid "_Chat windows"
+msgstr "群組聊天視窗"
+
+#. --------------
+#: plugins/notify.c:573
+#, fuzzy
+msgid "Notification Methods"
+msgstr "跳出通知"
+
+#: plugins/notify.c:576
+msgid "Prepend _string into window title (hit enter to save):"
+msgstr ""
+
+#: plugins/notify.c:587
+msgid "_Quote window title"
+msgstr ""
+
+#: plugins/notify.c:592
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr ""
+
+#: plugins/notify.c:597
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#: plugins/notify.c:602
+msgid "_Notify even if conversation is in focus"
+msgstr ""
+
+#. --------------
+#: plugins/notify.c:608
+#, fuzzy
+msgid "Notification Removal"
+msgstr "跳出通知"
+
+#: plugins/notify.c:609
+msgid "Remove when conversation window gains _focus"
+msgstr ""
+
+#: plugins/notify.c:614
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#: plugins/notify.c:619
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#: plugins/notify.c:624
+msgid "Appl_y"
+msgstr ""
+
+#: plugins/autorecon.c:54 plugins/autorecon.c:65
+msgid "When you are kicked offline, this reconnects you."
+msgstr ""
+
+#: plugins/autorecon.c:61
+#, fuzzy
+msgid "Auto Reconnect"
+msgstr "無法連線"
+
+#: plugins/timestamp.c:73
+#, fuzzy
+msgid "Timestamp"
+msgstr "測試"
+
+#: plugins/timestamp.c:75
+msgid "Adds iChat-style timestamps to conversations every 5 minutes."
+msgstr ""
+
+#: plugins/history.c:72
+msgid "History"
+msgstr ""
+
+#: plugins/history.c:74
+#, fuzzy
+msgid "Shows recently logged conversations in new conversations "
+msgstr "將所有的交談顯示在同一個有標籤的視窗中"
+
+#: plugins/iconaway.c:52
+msgid "Iconify on away"
+msgstr ""
+
+#: plugins/iconaway.c:54 plugins/iconaway.c:65
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr ""
+
+#: plugins/iconaway.c:61
+msgid "Iconify On Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
+#: src/protocols/msn/msn.c:2438
 msgid "Available"
 msgstr ""
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:74
 msgid "Available for friends only"
 msgstr "只有好友可以看到我上線"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
-#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
-msgid "Away"
-msgstr "離開"
-
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:76
 msgid "Away for friends only"
 msgstr "離開(只有好友可以看到我)"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:77
 msgid "Invisible"
 msgstr "隱身"
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:78
 msgid "Invisible for friends only"
 msgstr "隱身(只好好友可以看到我)"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
 msgid "Unavailable"
 msgstr ""
 
-#: src/protocols/gg/gg.c:182
+#: src/protocols/gg/gg.c:165
 msgid "Unable to resolve hostname."
 msgstr "無法解析主機名稱。"
 
-#: src/protocols/gg/gg.c:185
+#: src/protocols/gg/gg.c:168
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: src/protocols/gg/gg.c:188
+#: src/protocols/gg/gg.c:171
 msgid "Invalid response from server."
 msgstr "無效的伺服器回應。"
 
-#: src/protocols/gg/gg.c:191
+#: src/protocols/gg/gg.c:174
 msgid "Error while reading from socket."
 msgstr "讀取 Socket 時發生錯誤。"
 
-#: src/protocols/gg/gg.c:194
+#: src/protocols/gg/gg.c:177
 msgid "Error while writing to socket."
 msgstr "寫入 Socket 時發生錯誤。"
 
-#: src/protocols/gg/gg.c:197
+#: src/protocols/gg/gg.c:180
 msgid "Authentication failed."
 msgstr "認證失敗。"
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:183
 msgid "Unknown Error Code."
 msgstr "未知的錯誤代碼。"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
 #, c-format
 msgid "Status: %s"
 msgstr "狀態:%s"
 
-#: src/protocols/gg/gg.c:317
-msgid "Nick:"
-msgstr "暱稱:"
-
-#: src/protocols/gg/gg.c:318
-msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu 使用者"
-
-#: src/protocols/gg/gg.c:337
+#: src/protocols/gg/gg.c:309
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: src/protocols/gg/gg.c:344
+#: src/protocols/gg/gg.c:316
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:429
 msgid "Unable to connect."
 msgstr "無法連結。"
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:442
 msgid "Reading data"
 msgstr "讀取資料"
 
-#: src/protocols/gg/gg.c:468
+#: src/protocols/gg/gg.c:445
 msgid "Balancer handshake"
 msgstr ""
 
-#: src/protocols/gg/gg.c:471
+#: src/protocols/gg/gg.c:448
 msgid "Reading server key"
 msgstr "讀取 Server Key"
 
-#: src/protocols/gg/gg.c:474
+#: src/protocols/gg/gg.c:451
 msgid "Exchanging key hash"
 msgstr "交換密鑰"
 
-#: src/protocols/gg/gg.c:482
+#: src/protocols/gg/gg.c:460
 msgid "Critical error in GG library\n"
 msgstr "在 GG Library 中的重大錯誤\n"
 
-#: src/protocols/gg/gg.c:521
-msgid "Unable to ping server"
-msgstr "無法取得伺服器回應"
-
-#: src/protocols/gg/gg.c:533
-msgid "Send as message"
-msgstr "以訊息送出"
-
-#: src/protocols/gg/gg.c:541
-msgid "Looking up GG server"
-msgstr "搜尋 GG 伺服器"
-
-#: src/protocols/gg/gg.c:544
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "無效的 Gadu-Gadu UIN 定義"
-
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:531
+msgid "Unable to ping server"
+msgstr "無法取得伺服器回應"
+
+#: src/protocols/gg/gg.c:543
+msgid "Send as message"
+msgstr "以訊息送出"
+
+#: src/protocols/gg/gg.c:551
+msgid "Looking up GG server"
+msgstr "搜尋 GG 伺服器"
+
+#: src/protocols/gg/gg.c:554
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "無效的 Gadu-Gadu UIN 定義"
+
+#: src/protocols/gg/gg.c:604
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:667
 msgid "Couldn't get search results"
 msgstr "無法取得搜尋結果"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:672
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜尋引擎"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:697
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "yes"
 msgstr "確定"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:698
 msgid "no"
 msgstr "取消"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:702
 msgid "UIN"
 msgstr "帳號"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "名"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:711
 msgid "Second Name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:715
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
 msgid "Birth year"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:735
 msgid "Sex"
 msgstr "性別"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
+#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:771
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "對不起,伺服器上並沒有儲存任何的好友名單!"
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:777
 msgid "Couldn't Import Buddy List from Server"
 msgstr "無法自伺服器上取得好友名單"
 
-#: src/protocols/gg/gg.c:814
+#: src/protocols/gg/gg.c:824
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "成功的將好朋名單傳送到伺服器上"
 
-#: src/protocols/gg/gg.c:819
+#: src/protocols/gg/gg.c:829
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "無法傳送好朋名單到伺服器上"
 
-#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:835
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "成功的將好友名單自伺服器上刪除"
 
-#: src/protocols/gg/gg.c:830
+#: src/protocols/gg/gg.c:840
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "無法刪除在伺服器上的好友名單"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
 msgstr "密碼修改成功"
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "密碼無法修改"
 
-#: src/protocols/gg/gg.c:952
+#: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953
+#: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1038
+#: src/protocols/gg/gg.c:1048
 #, fuzzy
 msgid "Couldn't export buddy list"
 msgstr "無法自伺服器上取得好友名單"
 
-#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060
+#: src/protocols/gg/gg.c:1070
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1118
 #, fuzzy
 msgid "Unable to access directory"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:1119
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1141
+#: src/protocols/gg/gg.c:1151
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "無法送出密碼"
 
-#: src/protocols/gg/gg.c:1142
+#: src/protocols/gg/gg.c:1152
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Directory Search"
 msgstr "目錄搜尋"
 
@@ -370,725 +542,1063 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
-#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
-#: src/dialogs.c:2167
+#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
+#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
 msgid "Import Buddy List from Server"
 msgstr "自伺服器上匯入好友名單"
 
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
 msgid "Export Buddy List to Server"
 msgstr "匯出好友名單到伺服器上"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
 msgid "Delete Buddy List from Server"
 msgstr "將伺服器上的好友名單刪除"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1214
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "無法讀取檔案 %s。"
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:233
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+msgid "Nick:"
+msgstr "暱稱:"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu 使用者"
+
+#: src/protocols/icq/gaim_icq.c:229
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:308
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
+#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
+#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
+#: src/prpl.c:280 src/prpl.c:638
+msgid "Cancel"
+msgstr "取消"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
+#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
+#: src/protocols/oscar/oscar.c:2120
+msgid "Authorize"
+msgstr ""
+
+#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
+#: src/protocols/oscar/oscar.c:2174
+msgid "Deny"
+msgstr "拒絕"
+
+#: src/protocols/icq/gaim_icq.c:306
 msgid "Send message through server"
 msgstr "透過伺服器傳送訊息"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
-#: src/protocols/toc/toc.c:1219
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
+#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
+#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
+#: src/protocols/toc/toc.c:1259
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#: src/protocols/icq/gaim_icq.c:512
+#, fuzzy
+msgid "Gaim User"
+msgstr "Gaim 使用"
+
+#: src/protocols/irc/irc.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
 #, 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:719
+#, fuzzy
+msgid "No topic is set"
+msgstr "不在清單中"
+
+#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s 把聊天主題修改為:%s</B>"
 
-#: src/protocols/irc/irc.c:825
-msgid "There is no such nick or channel on this IRC channel."
-msgstr ""
-
-#: src/protocols/irc/irc.c:828
-msgid "There is no such IRC Server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:830
-#, fuzzy
-msgid "No IRC nickname given"
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1089
+#, fuzzy
+msgid "Rehashing server"
+msgstr "讀取 Server Key"
+
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
+#, fuzzy
+msgid "IRC Operator"
+msgstr "IRC 錯誤"
+
+#. ERR_NOSUCHNICK
+#: src/protocols/irc/irc.c:1092
+msgid "No such nick/channel"
+msgstr "沒有那個暱稱或頻道"
+
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1397
+msgid "IRC Error"
+msgstr "IRC 錯誤"
+
+#. ERR_NOSUCHSERVER
+#: src/protocols/irc/irc.c:1095
+msgid "No such server"
+msgstr "沒有那部伺服器"
+
+#. ERR_NONICKNAMEGIVEN
+#: src/protocols/irc/irc.c:1097
+#, fuzzy
+msgid "No nickname given"
 msgstr "沒有給定暱名"
 
-#: src/protocols/irc/irc.c:976
+#. ERR_NOPRIVILEGES
+#: src/protocols/irc/irc.c:1100
+msgid "You're not an IRC operator!"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1103
+msgid "That nick is already in use.  Please enter a new nick"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
+#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+msgid "IRC CTCP info"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1287
 #, c-format
+msgid "%s would like to establish a DCC chat"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288
 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/msn/msn.c:315
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:4621
+#, fuzzy
+msgid "Connect"
+msgstr "連線成功"
+
+#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "無法寫入"
 
-#: src/protocols/irc/irc.c:1071
+#: src/protocols/irc/irc.c:1395
 #, fuzzy, c-format
-msgid "You have been kicked from %s:"
+msgid "You have been kicked from %s: %s"
 msgstr "%s 正在呼叫您:%s"
 
-#: src/protocols/irc/irc.c:1076
+#: src/protocols/irc/irc.c:1400
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "被 %s 呼叫:%s"
 
-#: src/protocols/irc/irc.c:1581
+#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+msgid "CTCP ClientInfo"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
+#, fuzzy
+msgid "CTCP UserInfo"
+msgstr "取得使用者資訊"
+
+#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgid "CTCP Version"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+msgid "CTCP Ping"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1972
+#, c-format
+msgid "Topic for %s is %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2064
 #, c-format
 msgid "You have left %s"
 msgstr "您離開了 %s"
 
-#: src/protocols/irc/irc.c:1671
+#: src/protocols/irc/irc.c:2065
+msgid "IRC Part"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2232
 msgid "Channel:"
 msgstr "Channel:"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/protocols/irc/irc.c:1856
+#: src/protocols/irc/irc.c:2650
 msgid "DCC Chat"
 msgstr "DCC 聊天"
 
-#: src/protocols/jabber/jabber.c:950
+#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
+#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+msgid "Server:"
+msgstr "伺服器:"
+
+#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
+#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#, fuzzy
+msgid "Port:"
+msgstr "端口"
+
+#: src/protocols/irc/irc.c:2733
+msgid "Encoding:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Unable to change password."
 msgstr "無法送出密碼"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:973
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:978
 #, fuzzy
 msgid "Unable to change password"
 msgstr "無法送出密碼"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:979
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1139
 msgid "Unknown"
 msgstr "未知"
 
-#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
-#: src/buddy.c:2862
+#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1185
 msgid "Online"
 msgstr "上線"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1169
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1171
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1368
 #, fuzzy, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber 錯誤"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Error %s: %s"
 msgstr "錯誤 %s:%s"
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1477
 msgid "Unknown Error in presence"
 msgstr "未知的錯誤發生。"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1647
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他們的好友清單中。"
 
-#: src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1672
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1660
+#: src/protocols/jabber/jabber.c:1675
 #, fuzzy
 msgid "No such user."
 msgstr "沒有這個使用者"
 
-#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
-#: src/dialogs.c:926
+#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
+#: src/protocols/msn/msn.c:1336
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1808
+#: src/protocols/jabber/jabber.c:1817
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/protocols/jabber/jabber.c:1845
+#: src/protocols/jabber/jabber.c:1854
 msgid "Unknown login error"
 msgstr "未知的登入錯誤"
 
-#: src/protocols/jabber/jabber.c:2036
+#: src/protocols/jabber/jabber.c:2242
 msgid "Password successfully changed."
 msgstr "密碼修改成功。"
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
 msgid "Connection lost"
 msgstr "失去連線"
 
-#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
-#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
-#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
+#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
+#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2294
 msgid "Connected"
 msgstr "連線成功"
 
-#: src/protocols/jabber/jabber.c:2091
+#: src/protocols/jabber/jabber.c:2297
 msgid "Requesting Authentication Method"
 msgstr "要求認證的方式"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:2619
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:2621
 msgid "Jabber Error"
 msgstr "Jabber 錯誤"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2856
 msgid "Room:"
 msgstr "聊天室:"
 
-#: src/protocols/jabber/jabber.c:2656
-msgid "Server:"
-msgstr "伺服器:"
-
-#: src/protocols/jabber/jabber.c:2661
+#: src/protocols/jabber/jabber.c:2865
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2889
 #, fuzzy
 msgid "Unable to join chat"
 msgstr "無法連線"
 
-#: src/protocols/jabber/jabber.c:2718
+#: src/protocols/jabber/jabber.c:2922
 msgid "Chats"
 msgstr "聊天"
 
-#: src/protocols/jabber/jabber.c:3033
+#: src/protocols/jabber/jabber.c:3229
 msgid "View Error Msg"
 msgstr "觀看錯誤訊息"
 
-#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
+#: src/protocols/oscar/oscar.c:4673
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/protocols/jabber/jabber.c:3057
+#: src/protocols/jabber/jabber.c:3253
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3060
+#: src/protocols/jabber/jabber.c:3256
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3279
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "跳出通知"
 
-#: src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3477
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3478
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3479
 msgid "Given Name"
 msgstr "給予一個名字"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3480
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3482
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3291
+#: src/protocols/jabber/jabber.c:3483
 msgid "Extended Address"
 msgstr "其他地址"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3484
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3293
+#: src/protocols/jabber/jabber.c:3485
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3486
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
+#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
 msgid "Country"
 msgstr "國家"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3488
 msgid "Telephone"
 msgstr "電話"
 
-#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
+#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
 msgid "Email"
 msgstr "電子郵件"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3490
 msgid "Organization Name"
 msgstr "組織名稱"
 
-#: src/protocols/jabber/jabber.c:3299
+#: src/protocols/jabber/jabber.c:3491
 msgid "Organization Unit"
 msgstr "組織單位"
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3492
 msgid "Title"
 msgstr "離開原因的標題"
 
-#: src/protocols/jabber/jabber.c:3301
+#: src/protocols/jabber/jabber.c:3493
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3302
+#: src/protocols/jabber/jabber.c:3494
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
+#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3328
+#: src/protocols/jabber/jabber.c:3520
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可"
 
-#: src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3521
 msgid "User Identity"
 msgstr "使用者識別"
 
-#: src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3933
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 編輯 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3815
+#: src/protocols/jabber/jabber.c:4006
 msgid "Server Registration successful!"
 msgstr "伺服器註冊成功!"
 
-#: src/protocols/jabber/jabber.c:3842
+#: src/protocols/jabber/jabber.c:4033
 msgid "Unknown registration error"
 msgstr "未知的註冊錯誤"
 
-#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
+#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:222
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "語法錯誤(可能是 Gaim 的 Bug)"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:225
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "無效的參數(可能是 Gaim 的 Bug)"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:228
 msgid "Invalid User"
 msgstr "無效的使用者"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:231
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:234
 msgid "Already Login"
 msgstr "已經登入"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:237
 msgid "Invalid Username"
 msgstr "無效的使用者名稱"
 
-#: src/protocols/msn/msn.c:248
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Friendly Name"
 msgstr "無效的朋友名稱"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:243
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:246
 msgid "Already there"
 msgstr "己經在那裡"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:249
 msgid "Not on list"
 msgstr "不在清單中"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:252
 msgid "User is offline"
 msgstr "使用者是離線的"
 
-#: src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:255
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:258
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:261
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:264
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:276
+#: src/protocols/msn/msn.c:268
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:279
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
 msgid "Not logged in"
 msgstr "尚未登入"
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:275
 msgid "Internal server error"
 msgstr "內部伺服器錯誤"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:278
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:281
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:284
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
-#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:288
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
-#: src/protocols/msn/msn.c:299
+#: src/protocols/msn/msn.c:291
 msgid "Server unavailable"
 msgstr "伺服器不存在"
 
-#: src/protocols/msn/msn.c:302
+#: src/protocols/msn/msn.c:294
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:305
+#: src/protocols/msn/msn.c:297
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
-#: src/protocols/msn/msn.c:308
+#: src/protocols/msn/msn.c:300
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:304
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
-#: src/protocols/msn/msn.c:318
+#: src/protocols/msn/msn.c:310
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:321
+#: src/protocols/msn/msn.c:313
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:324
+#: src/protocols/msn/msn.c:316
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
-#: src/protocols/msn/msn.c:327
+#: src/protocols/msn/msn.c:319
 msgid "Not expected"
 msgstr "沒有預期的"
 
-#: src/protocols/msn/msn.c:330
+#: src/protocols/msn/msn.c:322
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:326
 msgid "Authentication failed"
 msgstr "認證失敗"
 
-#: src/protocols/msn/msn.c:337
+#: src/protocols/msn/msn.c:329
 msgid "Not allowed when offline"
 msgstr "在離線時是不被允許的"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:332
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
-#: src/protocols/msn/msn.c:343
+#: src/protocols/msn/msn.c:335
 msgid "User unverified"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:338
 msgid "Unknown Error Code"
 msgstr "未知的錯誤代碼"
 
-#: src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:491
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/msn.c:562
 #, fuzzy
 msgid "An MSN message may not have been received."
 msgstr "有個訊息可能沒被收到。"
 
-#: src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:1041
 #, fuzzy
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim 無法送出訊息"
 
-#: src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:1042
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
 msgstr ""
 
-#: src/protocols/msn/msn.c:921
+#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
+#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
+#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
+#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
+#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
+#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
+#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
+#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
+#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#, fuzzy
+msgid "Write error"
+msgstr "AOL 錯誤"
+
+#: src/protocols/msn/msn.c:1143
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "使用者 %s(%s)想要將 %s 加入他(她)的好友清單。"
 
-#: src/protocols/msn/msn.c:1078
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+msgid "Unable to write to server"
+msgstr "無法寫入到伺服器"
+
+#: src/protocols/msn/msn.c:1300
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "使用者 %s(%s)想要將您加入他們的好友清單"
 
-#: src/protocols/msn/msn.c:1179
+#: src/protocols/msn/msn.c:1401
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
-#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1576
+msgid "Error transfering"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
-#: src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1744
+#, fuzzy
+msgid "Unable to connect to Notification Server"
+msgstr "無法連線到伺服器。"
+
+#: src/protocols/msn/msn.c:1751
+#, fuzzy
+msgid "Unable to talk to Notification Server"
+msgstr "無法寫入到伺服器"
+
+#: src/protocols/msn/msn.c:1767
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Protocol 相關設定"
+
+#: src/protocols/msn/msn.c:1774
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "無法開啟直接的即時訊息"
+
+#: src/protocols/msn/msn.c:1781
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "無法登入到 AIM"
+
+#: src/protocols/msn/msn.c:1788
+#, fuzzy
+msgid "Unable to send USR\n"
+msgstr "無法送出訊息:太大了"
+
+#: src/protocols/msn/msn.c:1793
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1839
 msgid "Unable to send password"
 msgstr "無法送出密碼"
 
-#: src/protocols/msn/msn.c:1627
+#: src/protocols/msn/msn.c:1844
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: src/protocols/msn/msn.c:1752
-msgid "Unable to write to server"
-msgstr "無法寫入到伺服器"
-
-#: src/protocols/msn/msn.c:1758
+#: src/protocols/msn/msn.c:1873
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "無法寫入"
+
+#: src/protocols/msn/msn.c:1881
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "無法送出訊息:太大了"
+
+#: src/protocols/msn/msn.c:1974
 msgid "Synching with server"
 msgstr "伺服器同步"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
+#: src/protocols/msn/msn.c:2426
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
 msgid "Out To Lunch"
 msgstr "去吃午飯了"
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:2045
+#: src/protocols/msn/msn.c:2428
+msgid "Be right back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2430
+#, fuzzy
+msgid "Away from the computer"
+msgstr "不在電腦前"
+
+#: src/protocols/msn/msn.c:2432
+#, fuzzy
+msgid "On the phone"
+msgstr "電話中"
+
+#: src/protocols/msn/msn.c:2434
+#, fuzzy
+msgid "Out to lunch"
+msgstr "去吃午飯了"
+
+#: src/prefs.c:748 src/protocols/msn/msn.c:2436
+#, fuzzy
+msgid "Idle"
+msgstr "閒置時間:"
+
+#: src/protocols/msn/msn.c:2473
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2118
+#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgid "Send File"
+msgstr "傳送檔案"
+
+#: src/protocols/msn/msn.c:2555
 msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
+#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
 msgid "Set Friendly Name"
 msgstr "設定好友名稱"
 
-#: src/protocols/msn/msn.c:2134
+#: src/protocols/msn/msn.c:2571
 msgid "Set Friendly Name:"
 msgstr "設定好友名稱:"
 
-#: src/protocols/msn/msn.c:2135
+#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2288
+#: src/protocols/msn/msn.c:2732
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
 #, fuzzy
 msgid "Invalid MSN screenname"
 msgstr "無效的使用者名稱"
 
-#: src/protocols/msn/msn.c:2345
+#: src/protocols/msn/msn.c:2789
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
-#: src/protocols/toc/toc.c:1104
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
+#: src/protocols/toc/toc.c:1144
 msgid "Join what group:"
 msgstr "加入群組:"
 
-#: src/protocols/oscar/oscar.c:330
+#: src/protocols/oscar/oscar.c:394
+#, fuzzy
+msgid "Invalid error"
+msgstr "無效的使用者"
+
+#: src/protocols/oscar/oscar.c:395
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "無效的名稱"
+
+#: src/protocols/oscar/oscar.c:396
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:397
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:399
+#, fuzzy
+msgid "Service unavailable"
+msgstr "伺服器不存在"
+
+#: src/protocols/oscar/oscar.c:400
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:401
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:402
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:403
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:404
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:405
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:406
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:407
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:408
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:409
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:410
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:411
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:412
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:413
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "目錄服務暫時不存在。"
+
+#: src/protocols/oscar/oscar.c:414
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:415
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:416
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:417
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:418
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:332
+#: src/protocols/oscar/oscar.c:464
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:502
 msgid "connection error (rend)\n"
 msgstr "連線錯誤 (rend)\n"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:513
 msgid "major connection error\n"
 msgstr "主要連結錯誤\n"
 
-#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:539
 msgid "Chat is currently unavailable"
 msgstr "這個交談目前並不存在"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
+msgid "Buddy canceled transfer"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:619
 msgid "Password sent, waiting for response\n"
 msgstr "送出密碼,等待回應\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:654
 msgid "internal connection error\n"
 msgstr "內部連結錯誤\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:655
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:660
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:742
 msgid "Signed off.\n"
 msgstr "登出。\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
+#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:769
 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:810 src/protocols/toc/toc.c:503
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:815
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:819
+#, fuzzy
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "服務暫時不存在。"
+
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:823
 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."
@@ -1097,46 +1607,83 @@
 "線,那麼您的等待時間將會更加的延長。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
-msgid "The client version you are using is too old. Please upgrade at "
+#: src/protocols/oscar/oscar.c:828
+#, fuzzy, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的 Client 端程式太過老舊。請更新到"
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
 msgid "Authentication Failed"
 msgstr "認證失敗"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:855
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
+#: src/protocols/oscar/oscar.c:1059
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 無法送出訊息"
 
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:875
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
-#: src/protocols/oscar/oscar.c:876
-msgid " for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:1061
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim 無法送出訊息"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1609
+msgid "Transfer timed out"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1631
+#, fuzzy
+msgid "Couldn't open listener to send file"
+msgstr "無法開啟設定檔 %s。"
+
+#: src/protocols/oscar/oscar.c:1632
+msgid "File transfer aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2020
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2116
+#, fuzzy, c-format
+msgid ""
+"The user %lu wants to add you to their buddy list for the following reason: %"
+"s"
+msgstr "使用者 %s 想要將您加入他們的好友清單中。"
+
+#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
+msgid "No reason given."
+msgstr "沒有給予原因。"
+
+#: src/protocols/oscar/oscar.c:2120
+#, fuzzy
+msgid "Authorization Request"
+msgstr "Gaim - ICQ 拒絕認證"
+
+#: src/protocols/oscar/oscar.c:2127
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1146,428 +1693,530 @@
 "使用者 %lu 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
-msgid "No reason given."
-msgstr "沒有給予原因。"
-
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:2128
 #, fuzzy
 msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ 拒絕認證"
 
-#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2134
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "使用者 %lu 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:1587
-#, c-format
-msgid "You missed %d message from %s because it was invalid."
-msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為那是無效的。"
-
-#: src/protocols/oscar/oscar.c:1588
-#, c-format
-msgid "You missed %d messages from %s because they were invalid."
-msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為那是無效的。"
-
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:2141
 #, c-format
-msgid "You missed %d message from %s because it was too large."
-msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息太大了。"
-
-#: src/protocols/oscar/oscar.c:1598
-#, c-format
-msgid "You missed %d messages from %s because they were too large."
-msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息太大了。"
-
-#: src/protocols/oscar/oscar.c:1607
-#, c-format
-msgid "You missed %d message from %s because the rate limit has been exceeded."
-msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為訊息的發送速率到了上限。"
-
-#: src/protocols/oscar/oscar.c:1608
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2149
 #, c-format
 msgid ""
-"You missed %d messages from %s because the rate limit has been exceeded."
-msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為訊息的發送速率到了上限。"
-
-#: src/protocols/oscar/oscar.c:1617
-#, c-format
-msgid "You missed %d message from %s because it was too evil."
-msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
-
-#: src/protocols/oscar/oscar.c:1618
+"You have received an ICQ email\n"
+"\n"
+"1=%s\n"
+"2=%s\n"
+"3=%s\n"
+"4=%s\n"
+"5=%s\n"
+"6=%s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2170
 #, c-format
-msgid "You missed %d messages from %s because they are too evil."
-msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這些訊息可能不懷好意。"
-
-#: src/protocols/oscar/oscar.c:1627
-#, c-format
-msgid "You missed %d message from %s because you are too evil."
-msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
-
-#: src/protocols/oscar/oscar.c:1628
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
+msgid "ICQ user %lu has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2174
+#, fuzzy
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr ""
+"\n"
+"\n"
+"您想將他(她)加入到您的好友名單中嗎?"
+
+#: src/protocols/oscar/oscar.c:2254
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為那是無效的。"
+
+#: src/protocols/oscar/oscar.c:2255
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were invalid."
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為那是無效的。"
+
+#: src/protocols/oscar/oscar.c:2264
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息太大了。"
+
+#: src/protocols/oscar/oscar.c:2265
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because they were too large."
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息太大了。"
+
+#: src/protocols/oscar/oscar.c:2274
+#, fuzzy, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為訊息的發送速率到了上限。"
+
+#: src/protocols/oscar/oscar.c:2275
+#, fuzzy, c-format
+msgid ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為訊息的發送速率到了上限。"
+
+#: src/protocols/oscar/oscar.c:2284
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:1636
-#, c-format
-msgid "You missed %d message from %s for unknown reasons."
-msgstr "您因為不明的原因,而遺失了由 %2$s 送來的 %1$d 個訊息。"
-
-#: src/protocols/oscar/oscar.c:1637
-#, c-format
-msgid "You missed %d messages from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:2285
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because he/she was too evil."
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
+
+#: src/protocols/oscar/oscar.c:2294
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because you are too evil."
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
+
+#: src/protocols/oscar/oscar.c:2295
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s because you are too evil."
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
+
+#: src/protocols/oscar/oscar.c:2303
+#, fuzzy, c-format
+msgid "You missed %hu message from %s for an unknown reason."
 msgstr "您因為不明的原因,而遺失了由 %2$s 送來的 %1$d 個訊息。"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:2304
+#, fuzzy, c-format
+msgid "You missed %hu messages from %s for an unknown reason."
+msgstr "您因為不明的原因,而遺失了由 %2$s 送來的 %1$d 個訊息。"
+
+#: src/protocols/oscar/oscar.c:2342
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgid "%s has declined to receive a file from %s.\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2387
+#, fuzzy, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>狀態:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1707
-#, c-format
-msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+#: src/protocols/oscar/oscar.c:2389
+#, fuzzy, c-format
+msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>狀態:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1736
+#: src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:1755
-#, c-format
-msgid "Your message to %s did not get sent: %s"
-msgstr "您要送給 %s 的訊息無法送出:%s"
-
-#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2446
+#, fuzzy
+msgid "Unknown error"
+msgstr "未知的登入錯誤"
+
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2529
 #, fuzzy
 msgid "No reason was given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:1772
-#, c-format
-msgid "User information for %s unavailable: %s"
+#. Data is assumed to be the destination sn.
+#: src/protocols/oscar/oscar.c:2476
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent:"
+msgstr "您要送給 %s 的訊息無法送出:%s"
+
+#: src/protocols/oscar/oscar.c:2528
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
 msgstr "使用者 %s 的個人資訊並不存在:%s"
 
-#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2113
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2116
+#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
 msgid "Voice"
 msgstr "聲音"
 
-#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2119
+#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
 msgid "IM Image"
 msgstr "即時訊息圖片"
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:495 src/buddy.c:2122
-#: src/buddy.c:2555
+#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2567
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2125
+#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
 msgid "Get File"
 msgstr "接收文件"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2128
-msgid "Send File"
-msgstr "傳送檔案"
-
-#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2132
+#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2135
+#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
 msgid "Stocks"
 msgstr "股票"
 
-#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2138
+#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2141
+#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2144
+#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
 msgid "AP User"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2147
+#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2150
+#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
 msgid "Nihilist"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2153
+#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2156
+#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
 msgid "ICQ Unknown"
 msgstr "ICQ 未知"
 
-#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2159
+#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1886
+#: src/protocols/oscar/oscar.c:2655
 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:1914
-#, c-format
+"<I>Unable to display information because it was sent in an unknown encoding."
+"</I>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2677
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
-"<HR><BR>\n"
+"<HR>\n"
 msgstr ""
 "帳號:<B>%s</B>  %s <BR>\n"
 "警告等級:<B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1946
+#: src/protocols/oscar/oscar.c:2709
 msgid "<i>User has no away message</i>"
 msgstr "<i>使用者沒有離開訊息</i>"
 
-#: src/protocols/oscar/oscar.c:1958
+#: src/protocols/oscar/oscar.c:2720
 msgid "Client Capabilities: "
 msgstr "Client 相容性:"
 
-#: src/protocols/oscar/oscar.c:1966
+#: src/protocols/oscar/oscar.c:2727
 msgid "<i>No Information Provided</i>"
 msgstr "<i>未提供任何信息</i>"
 
-#: src/protocols/oscar/oscar.c:1989
+#: src/protocols/oscar/oscar.c:2751
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "您可能斷線了。"
 
-#: src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:3010
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
+#: src/protocols/oscar/oscar.c:3011
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr "訊息並未送出,因為您已經達到發送訊息速率的上限。請等待十秒後再試一次。"
 
-#: src/protocols/oscar/oscar.c:2457
-#, fuzzy
-msgid "ICQ Authorization denied"
-msgstr "Gaim - ICQ 拒絕認證"
-
-#: src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "ICQ Authorization Granted"
-msgstr "Gaim - ICQ 許可認證"
-
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3463
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3490
+#, fuzzy
+msgid "Error Changing Account Info"
+msgstr "連線開啟錯誤"
+
+#: src/protocols/oscar/oscar.c:3493
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3496
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3499
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3502
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3505
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3508
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3511
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3521
+#, c-format
+msgid ""
+"Your screen name is currently formated as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#, fuzzy
+msgid "Account Info"
+msgstr "帳號"
+
+#: src/protocols/oscar/oscar.c:3527
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3720
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "無法讀取檔案 %s。"
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:3721
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:3764
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim 無法送出訊息"
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:3765
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:3781
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:4168
 #, 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:3231 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
 msgid "Exchange:"
 msgstr "交換:"
 
-#: src/protocols/oscar/oscar.c:3559
+#: src/protocols/oscar/oscar.c:4610
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:4620
 #, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4621
 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:3586
-#, c-format
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4635
+#, fuzzy, 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>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"sending status messages.</I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>狀態:</B> %s<BR><HR><BR><I>遠方的客戶端不支援狀態訊息的"
 "傳送。</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3593
-#, c-format
+#: src/protocols/oscar/oscar.c:4642
+#, fuzzy, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-"</I><BR>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
+"I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>狀態:</B> %s<BR><HR><BR><I>使用都沒有設定狀態訊息。</"
 "I><BR>"
 
-#: src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:4667
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-#: src/protocols/oscar/oscar.c:3631
+#: src/protocols/oscar/oscar.c:4680
 msgid "Direct IM"
 msgstr "直接消息"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:4694
 msgid "Get Capabilities"
 msgstr "取得相容性資訊"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/toc/toc.c:442
 #, c-format
 msgid "Unable to write file %s."
 msgstr "無法寫入檔案 %s。"
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:445
 #, c-format
 msgid "Unable to read file %s."
 msgstr "無法讀取檔案 %s。"
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:448
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "訊息太長,最後的 %s bytes 被截去。"
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:451
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "警告:%s 是不被允許的。"
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:457
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄,因為您達到伺服器所限制的發送速度。"
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:460
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 不可以聊天。"
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:463
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您送訊息給 %s 的速度太快了。"
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:466
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它太大了。"
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:472
 msgid "Failure."
 msgstr "失敗。"
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:475
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:478
 msgid "Need more qualifiers."
 msgstr ""
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:481
 msgid "Dir service temporarily unavailable."
 msgstr "目錄服務暫時不存在。"
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:484
 msgid "Email lookup restricted."
 msgstr "禁止 eMail 檢查。"
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:487
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:490
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:493
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:497
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因:%s。"
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:506
 msgid "The service is temporarily unavailable."
 msgstr "服務暫時不存在。"
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:509
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:512
 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."
@@ -1575,37 +2224,37 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "發生了一個未知的登入錯誤:%s。"
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "一個未知的錯誤 %d 發生。資訊:%s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:535
 msgid "Connection Closed"
 msgstr "連線關閉"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:573
 msgid "Waiting for reply..."
 msgstr "等待回覆…"
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:642
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:826
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:785
+#: src/protocols/toc/toc.c:829
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -1616,76 +2265,101 @@
 "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:1225
+#: src/protocols/toc/toc.c:1265
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1445
+msgid "TOC Host:"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1451
+#, fuzzy
+msgid "TOC Port:"
+msgstr "端口"
+
+#: src/protocols/toc/toc.c:1578
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "無法開啟傳輸的連線!"
+
+#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
+#: src/protocols/toc/toc.c:1903
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "無法開啟傳輸的連線!"
 
-#: src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1817
 msgid "Could not connect for transfer!"
 msgstr "無法開啟傳輸的連線!"
 
-#: src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1847
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1921
+#: src/protocols/toc/toc.c:1947
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為…"
 
-#: src/protocols/toc/toc.c:1962
+#: src/protocols/toc/toc.c:1979
 #, 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:1963
+#: src/protocols/toc/toc.c:1980
 #, 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:1968
+#: src/protocols/toc/toc.c:1985
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他們。"
 
-#: src/protocols/yahoo/yahoo.c:594
+#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+msgid "Accept"
+msgstr "接受"
+
+#: src/protocols/yahoo/yahoo.c:583
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "您的訊息並沒有被送出。"
 
-#: src/protocols/zephyr/zephyr.c:841
+#: src/protocols/yahoo/yahoo.c:1361
+msgid "Pager Host:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1367
+msgid "Pager Port:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:836
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:878
+#: src/protocols/zephyr/zephyr.c:876
 msgid "Class:"
 msgstr "類別:"
 
-#: src/protocols/zephyr/zephyr.c:882
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Recipient:"
 msgstr ""
 
-#: src/about.c:102
+#: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
 msgstr "關於 Gaim v%s"
 
-#: src/about.c:135
+#: src/about.c:112
+#, fuzzy
 msgid ""
-"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: "
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim 是一個模組化的即時訊息程式,同時提供 AIM、\n"
 "ICQ、Yahoo!、MSN、IRC、Jabber、Napster、Zephyr,\n"
@@ -1694,182 +2368,147 @@
 "\n"
 "網址:"
 
-#: src/about.c:137
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.freenode.net"
-msgstr ""
-
-#: src/about.c:147
+#: src/about.c:122
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#: src/about.c:126
+msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:128
 msgid ""
-"Active Developers\n"
-"====================\n"
-"Rob Flynn (maintainer) [ rob@marko.net ]\n"
-"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-"\n"
-"Crazy Patch Writers\n"
-"===================\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Nathan Walp\n"
-"Mark Doliner\n"
-"\n"
-"Retired Developers\n"
-"===================\n"
-"Jim Duchek\n"
-"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-"Mark Spencer (original author)   [ markster@marko.net ]"
-msgstr ""
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:185
-msgid "Web Site"
-msgstr "網址"
-
-#: src/aim.c:150 src/buddy.c:2683
-msgid "Signoff"
-msgstr "登出"
-
-#: src/aim.c:162
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:136
+msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:144
+msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:151
+msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
+msgstr ""
+
+#: src/about.c:153
+msgid ""
+"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
+"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+msgstr ""
+
+#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
+#: src/server.c:1159
+msgid "Close"
+msgstr "關閉"
+
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your login."
 msgstr "請輸入您的密碼"
 
-#: src/aim.c:260
+#: src/aim.c:284
 msgid "Gaim - Login"
 msgstr "Gaim - 登入"
 
-#: src/aim.c:278
-msgid "Screen Name: "
+#: src/aim.c:307
+#, fuzzy
+msgid "Screen Name:"
 msgstr "帳  號:"
 
-#: src/aim.c:294
-msgid "Password: "
-msgstr "密  碼:"
-
-#: src/aim.c:315 src/buddy.c:2687
-msgid "Quit"
-msgstr "退    出"
-
-#: src/aim.c:320 src/aim.c:834 src/buddy.c:2713
-msgid "Accounts"
-msgstr "帳    號"
-
-#: src/aim.c:322 src/multi.c:915
-msgid "Signon"
-msgstr "登    入"
-
-#: src/aim.c:354
-msgid "About"
-msgstr "關    於"
-
-#: src/aim.c:355
-msgid "Options"
-msgstr "選    項"
-
-#: src/aim.c:357 src/aim.c:837 src/buddy.c:2733
-msgid "Plugins"
-msgstr "插    件"
-
-#: src/aim.c:831 src/buddy.c:2725
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: src/aim.c:841 src/multi.c:1481
-msgid "Auto-login"
-msgstr "自動登入"
-
-#: src/away.c:202
+#: src/away.c:188
 msgid "Gaim - Away!"
 msgstr "Gaim - 離開!"
 
-#: src/away.c:250
+#: src/away.c:235
 msgid "I'm Back!"
 msgstr "我回來了!"
 
-#: src/away.c:266 src/away.c:346 src/away.c:520
-msgid "Back"
-msgstr "返回"
-
-#: src/away.c:388
+#: src/away.c:353
 msgid "New Away Message"
 msgstr "新的離開訊息"
 
-#: src/away.c:408
+#: src/away.c:373
 msgid "Remove Away Message"
 msgstr "移除離開訊息"
 
-#: src/away.c:596
+#: src/away.c:561
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
+#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "群組"
 
-#: src/buddy.c:496 src/buddy.c:648 src/buddy.c:818 src/buddy.c:2553
-#: src/buddy_chat.c:864 src/buddy_chat.c:1281
+#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy_chat.c:863
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2952
+#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
+#: src/conversation.c:2915
 msgid "Info"
 msgstr "訊息內容"
 
-#. Put the buttons in the box
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
-#: src/dialogs.c:3866
+#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
+#: src/dialogs.c:3819
 msgid "Alias"
 msgstr "別名"
 
-#: src/buddy.c:658 src/buddy.c:842
+#: src/buddy.c:654 src/buddy.c:836
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
-#: src/buddy.c:665 src/buddy.c:848
+#: src/buddy.c:661 src/buddy.c:842
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: src/buddy.c:805 src/buddy.c:836
+#: src/buddy.c:799 src/buddy.c:830
 msgid "Rename"
 msgstr "重命名"
 
-#: src/buddy.c:830
+#: src/buddy.c:824
 msgid "Un-Alias"
 msgstr "取消別名"
 
-#: src/buddy.c:1709
+#: src/buddy.c:1683
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: src/buddy.c:1727
+#: src/buddy.c:1701
 msgid "Remove Buddy Pounce"
 msgstr "移除好友狀態捕捉"
 
-#: src/buddy.c:1755
+#: src/buddy.c:1730
+#, fuzzy
+msgid "[no message]"
+msgstr "(一個訊息)"
+
+#: src/buddy.c:1732
 msgid "[Click to edit]"
 msgstr "[ 編輯 ]"
 
-#: src/buddy.c:2238
+#: src/buddy.c:2299
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "登入:%s\n"
 
-#: src/buddy.c:2250
+#: src/buddy.c:2311
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "警告:%d%%\n"
 
-#: src/buddy.c:2262
+#: src/buddy.c:2323
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "通訊協定相容性:%s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2327
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1880,186 +2519,182 @@
 "帳號: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2270
+#: src/buddy.c:2331
 msgid "Idle: "
 msgstr "閒置時間:"
 
-#: src/buddy.c:2339 src/buddy.c:2344
+#: src/buddy.c:2400 src/buddy.c:2405
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/buddy.c:2398 src/buddy.c:2403
+#: src/buddy.c:2459 src/buddy.c:2464
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/buddy.c:2588
+#: src/buddy.c:2562
 msgid "Information on selected Buddy"
 msgstr "顯示被選取好友的資訊"
 
-#: src/buddy.c:2589 src/dialogs.c:736
+#: src/buddy.c:2563
 msgid "Send Instant Message"
 msgstr "送出即時訊息"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2564
 msgid "Start/join a Buddy Chat"
 msgstr "開始或加入好友的聊天"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "開啟離開訊息"
 
-#: src/buddy.c:2663
+#: src/buddy.c:2615
+msgid "Gaim - Buddy List"
+msgstr "Gaim - 好友清單"
+
+#. The file menu
+#: src/buddy.c:2628 src/conversation.c:2039
 msgid "File"
 msgstr "檔案"
 
-#: src/buddy.c:2667
-msgid "Add A Buddy"
+#: src/buddy.c:2632
+#, fuzzy
+msgid "_Add A Buddy"
 msgstr "新增一個好友"
 
-#: src/buddy.c:2669
-msgid "Join A Chat"
+#: src/buddy.c:2634
+#, fuzzy
+msgid "_Join A Chat"
 msgstr "加入聊天"
 
-#: src/buddy.c:2671
-msgid "New Instant Message"
-msgstr "新的即時訊息"
-
-#: src/buddy.c:2673 src/dialogs.c:798
-msgid "Get User Info"
+#: src/buddy.c:2636
+#, fuzzy
+msgid "_New Message"
+msgstr "新的離開訊息"
+
+#: src/buddy.c:2638
+#, fuzzy
+msgid "_Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/buddy.c:2678
+#: src/buddy.c:2643
 msgid "Import Buddy List"
 msgstr "匯入好友清單"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2650
+#, fuzzy
+msgid "Hide"
+msgstr "隱藏"
+
+#: src/buddy.c:2657
 msgid "Tools"
 msgstr "工具"
 
-#: src/buddy.c:2706
+#: src/buddy.c:2667
 msgid "Buddy Pounce"
 msgstr "好友狀態捕捉"
 
-#: src/buddy.c:2719
+#: src/buddy.c:2674
+#, fuzzy
+msgid "_Accounts..."
+msgstr "帳    號"
+
+#: src/buddy.c:2677
+#, fuzzy
+msgid "_Preferences..."
+msgstr "偏好設定"
+
+#: src/buddy.c:2683
 msgid "Protocol Actions"
 msgstr "Protocol 相關設定"
 
-#: src/buddy.c:2723
-msgid "Privacy"
+#: src/buddy.c:2687
+#, fuzzy
+msgid "Pr_ivacy..."
 msgstr "隱私"
 
-#: src/buddy.c:2727
-msgid "View System Log"
+#: src/buddy.c:2690
+#, fuzzy
+msgid "_View System Log..."
 msgstr "觀看系統日誌"
 
-#: src/buddy.c:2739
-msgid "Perl"
-msgstr "Perl 插件"
-
-#: src/buddy.c:2742
-msgid "Load Script"
-msgstr "讀取命令稿"
-
-#: src/buddy.c:2746
-msgid "Unload All Scripts"
-msgstr "清除所有讀入的命令稿"
-
-#: src/buddy.c:2750
-msgid "List Scripts"
-msgstr "列出命令稿"
-
-#: src/buddy.c:2758
+#: src/buddy.c:2695
 msgid "Help"
 msgstr "輔助說明"
 
-#: src/buddy.c:2762
+#: src/buddy.c:2699
 msgid "Online Help"
 msgstr "線上求助"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2700
 msgid "Debug Window"
 msgstr "除錯視窗"
 
-#: src/buddy.c:2764
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1307
+#: src/buddy.c:2721 src/prefs.c:1395
 msgid "Buddy List"
 msgstr "好友清單"
 
-#: src/buddy.c:2835
+#: src/buddy.c:2772
 msgid "Add a new Buddy"
 msgstr "新增一個好友"
 
-#: src/buddy.c:2836
+#: src/buddy.c:2773
 msgid "Add a new Group"
 msgstr "新增一個群組"
 
-#: src/buddy.c:2837
+#: src/buddy.c:2774
 msgid "Remove selected Buddy/Group"
 msgstr "移除被選取的好友或群組"
 
-#: src/buddy.c:2864
+#: src/buddy.c:2797
 msgid "Edit Buddies"
 msgstr "修改好友清單"
 
-#: src/buddy.c:2907
-msgid "Gaim - Buddy List"
-msgstr "Gaim - 好友清單"
-
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:269
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:286
 msgid "Join Chat As:"
 msgstr "加入聊天為:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
-#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
-#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
-#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
-#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
-msgid "Cancel"
-msgstr "取消"
-
-#: src/buddy_chat.c:309
+#: src/buddy_chat.c:307
 msgid "Join"
 msgstr "加入"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
-#: src/buddy_chat.c:1421
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
+#: src/buddy_chat.c:1540
 msgid "Invite"
 msgstr "邀請"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
 msgid "Buddy"
 msgstr "好友"
 
-#: src/buddy_chat.c:417
+#: src/buddy_chat.c:420
 msgid "Message"
 msgstr "訊息"
 
-#: src/buddy_chat.c:454
+#: src/buddy_chat.c:457
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀請好友進入聊天室"
 
-#: src/buddy_chat.c:871
+#: src/buddy_chat.c:870
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
+#: src/buddy_chat.c:872 src/prefs.c:280
 msgid "Ignore"
 msgstr "忽略使用者"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
+#: src/buddy_chat.c:1684
 #, fuzzy, c-format
 msgid "%d %s in room"
 msgstr "沒有人在這個房間"
@@ -2069,759 +2704,701 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/buddy_chat.c:944
+#: src/buddy_chat.c:957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: src/buddy_chat.c:1010
+# #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+# #: src/buddy_chat.c:1544
+# #, c-format
+# msgid "%d %s in room"
+# msgstr "聊天室有 %d 家伙"
+#: src/buddy_chat.c:959
+#, fuzzy, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s 進入聊天室。"
+
+#: src/buddy_chat.c:1038
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/buddy_chat.c:1057
+#: src/buddy_chat.c:1096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/buddy_chat.c:1059
+#: src/buddy_chat.c:1098
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/buddy_chat.c:1158
+#: src/buddy_chat.c:1204
 msgid "Gaim - Group Chats"
 msgstr "Gaim - 群組聊天"
 
-#: src/buddy_chat.c:1221
+#: src/buddy_chat.c:1284
 msgid "Topic:"
 msgstr "主題:"
 
-#: src/buddy_chat.c:1262
+#: src/buddy_chat.c:1323
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
-msgid "Whisper"
-msgstr "悄悄話"
-
-#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2963
+#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
+#: src/conversation.c:2874
 msgid "Send"
 msgstr "送出"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2940
-msgid "Block"
-msgstr "堵住他的嘴!"
-
-#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
-#: src/dialogs.c:455
+#: src/buddy_chat.c:1586 src/conversation.c:2906
 msgid "Warn"
 msgstr "警告"
 
-#: src/conversation.c:431
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - 儲存聊天內容"
-
-#: src/conversation.c:492
+#: src/buddy_chat.c:1592 src/conversation.c:2925
+msgid "Block"
+msgstr "堵住他的嘴!"
+
+#: src/conversation.c:443
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 加入影像"
 
-#: src/conversation.c:1336
+#: src/conversation.c:1305
 #, fuzzy
 msgid "Unable to send message.  The message is too large"
 msgstr "無法送出訊息:太大了"
 
-#: src/conversation.c:1340
+#: src/conversation.c:1309
 #, fuzzy
 msgid "Unable to send message"
 msgstr "無法送出訊息:太大了"
 
-#: src/conversation.c:1559
-#, c-format
-msgid "Currently at %d, "
-msgstr "目前在 %d,"
-
-#: src/conversation.c:1567
-#, c-format
-msgid "Setting position to %d\n"
-msgstr ""
-
-#: src/conversation.c:2217
-msgid "Bold Text"
-msgstr "粗體文字"
-
-#: src/conversation.c:2217
-msgid "Bold"
-msgstr "粗體"
-
-#: src/conversation.c:2221
-msgid "Italics Text"
-msgstr "斜體文字"
-
-#: src/conversation.c:2222
-msgid "Italics"
-msgstr "斜體"
-
-#: src/conversation.c:2225
-msgid "Underline Text"
-msgstr "底線文字"
-
-#: src/conversation.c:2226
-msgid "Underline"
-msgstr "底線"
-
-#: src/conversation.c:2230
-msgid "Strike through Text"
-msgstr "刪除的文字"
-
-#: src/conversation.c:2230
-msgid "Strike"
-msgstr "刪除"
-
-#: src/conversation.c:2236
-msgid "Decrease font size"
-msgstr "縮小字體"
-
-#: src/conversation.c:2236
-msgid "Small"
-msgstr "小"
-
-#: src/conversation.c:2239
-msgid "Normal font size"
-msgstr "正常字體大小"
-
-#: src/conversation.c:2239
-msgid "Normal"
-msgstr "正常"
-
-#: src/conversation.c:2242
-msgid "Increase font size"
-msgstr "增大字體"
-
-#: src/conversation.c:2242
-msgid "Big"
-msgstr "大"
-
-#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
-msgid "Select Font"
-msgstr "選擇字型"
-
-#: src/conversation.c:2250
-msgid "Font"
-msgstr "字型"
-
-#: src/conversation.c:2253
-msgid "Text Color"
-msgstr "文字顏色"
-
-#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
-msgid "Color"
-msgstr "顏色"
-
-#: src/conversation.c:2258
-msgid "Background Color"
-msgstr "背景顏色"
-
-#: src/conversation.c:2265 src/dialogs.c:2932
-msgid "Insert Link"
+#: src/conversation.c:2043
+#, fuzzy
+msgid "_Save Conversation"
+msgstr "儲存交談內容"
+
+#: src/conversation.c:2045
+msgid "View _History"
+msgstr ""
+
+#.
+#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
+#: src/conversation.c:2052
+#, fuzzy
+msgid "Insert _URL"
 msgstr "加入連結"
 
-#: src/conversation.c:2266
-msgid "Link"
-msgstr "連結"
-
-#: src/conversation.c:2269
-msgid "Insert smiley face"
-msgstr "加入一個笑臉"
-
-#: src/conversation.c:2269
-msgid "Smiley"
-msgstr "微笑"
-
-#: src/conversation.c:2272
-msgid "Insert IM Image"
+#: src/conversation.c:2053
+#, fuzzy
+msgid "Insert _Image"
 msgstr "加入即時訊息影像"
 
-#: src/conversation.c:2272
-msgid "Image"
-msgstr "影像"
-
-#: src/conversation.c:2279
-msgid "Enable logging"
+#: src/conversation.c:2058
+#, fuzzy
+msgid "_Close"
+msgstr "關閉"
+
+#: src/conversation.c:2063
+msgid "Options"
+msgstr "選    項"
+
+#. Logging
+#: src/conversation.c:2068
+#, fuzzy
+msgid "Enable _Logging"
 msgstr "開始記錄日誌"
 
-#: src/conversation.c:2280 src/prefs.c:1314
-msgid "Logging"
-msgstr "登入中"
-
-#: src/conversation.c:2289
-msgid "Save Conversation"
-msgstr "儲存交談內容"
-
-#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
-#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
-msgid "Save"
-msgstr "儲存"
-
-#: src/conversation.c:2294
-msgid "Toggle Sound"
-msgstr ""
-
-#: src/conversation.c:2295
-msgid "Sound"
-msgstr "音效"
-
-#: src/conversation.c:2782
+#: src/conversation.c:2086
+#, fuzzy
+msgid "Enable _Sounds"
+msgstr "開始記錄日誌"
+
+#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+msgid " [TYPING]"
+msgstr ""
+
+#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+msgid " [TYPED]"
+msgstr ""
+
+#: src/conversation.c:2689
 msgid "Gaim - Conversations"
 msgstr "Gaim - 交談"
 
-#: src/conversation.c:2869
+#: src/conversation.c:2802
 msgid "Send message as: "
 msgstr "送出訊息為:"
 
-#: src/conversation.c:3533
+#: src/conversation.c:3426
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 儲存圖示"
 
-#: src/conversation.c:3567
+#: src/conversation.c:3460
 msgid "Disable Animation"
 msgstr "關閉動畫"
 
-#: src/conversation.c:3578
+#: src/conversation.c:3467
 msgid "Enable Animation"
 msgstr "開啟動畫"
 
-#: src/conversation.c:3584
+#: src/conversation.c:3473
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/conversation.c:3590
+#: src/conversation.c:3479
 msgid "Save Icon As..."
 msgstr "儲存圖示為…"
 
-#: src/dialogs.c:414
-msgid "Gaim - Warn user?"
-msgstr "Gaim - 警告使用者?"
-
-#: src/dialogs.c:434
+#: src/dialogs.c:422
 #, c-format
-msgid "Do you really want to warn %s?"
-msgstr "你真的想警告 %s?"
-
-#: src/dialogs.c:439
-msgid "Warn anonymously?"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:431
+#, fuzzy
+msgid "Warn _anonymously?"
 msgstr "警告所有的匿名者?"
 
-#: src/dialogs.c:443
-msgid "Anonymous warnings are less harsh."
-msgstr ""
-
-#: src/dialogs.c:471
+#: src/dialogs.c:438
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr ""
+
+#: src/dialogs.c:458
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "由好友名單移除 '%s'。\n"
 
-#: src/dialogs.c:496
-#, c-format
-msgid "Gaim - Remove %s?"
-msgstr "Gaim - 移除 %s?"
-
-#: src/dialogs.c:509
-msgid "Remove Buddy"
-msgstr "移除好友"
-
-#: src/dialogs.c:519
-#, c-format
+#: src/dialogs.c:706
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:722 src/dialogs.c:816
+#, fuzzy
+msgid "_Screenname:"
+msgstr "帳號"
+
+#: src/dialogs.c:735 src/dialogs.c:829
+#, fuzzy
+msgid "_Account:"
+msgstr "帳號:"
+
+#: src/dialogs.c:804
 msgid ""
-"You are about to remove '%s' from\n"
-"your buddy list. Do you want to continue?"
-msgstr ""
-"您正試著將 '%s'  從您的好友清單\n"
-"中移除。您要繼續這個動作嗎?"
-
-#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
-msgid "Accept"
-msgstr "接受"
-
-#. Build OK Button
-#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
-#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
-#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
-msgid "OK"
-msgstr "確定"
-
-#: src/dialogs.c:726
-msgid "Gaim - IM user"
-msgstr "Gaim - 即時訊息使用者"
-
-#: src/dialogs.c:743
-msgid "IM who:"
-msgstr "將即時訊息送給:"
-
-#: src/dialogs.c:807
-msgid "User:"
-msgstr "使用者:"
-
-#: src/dialogs.c:816
-msgid "Account:"
-msgstr "帳號:"
-
-#. Finish up
-#: src/dialogs.c:865
-msgid "Gaim - Get User Info"
-msgstr "Gaim - 取得使用者資訊"
-
-#: src/dialogs.c:979
-msgid "Add Group"
-msgstr "加入群組"
-
-#: src/dialogs.c:1004
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:956
 msgid "Gaim - Add Group"
 msgstr "Gaim - 加入群組"
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:973
+msgid "Please enter the name of the group to be added.\n"
+msgstr ""
+
+#: src/dialogs.c:982 src/dialogs.c:4356
+#, fuzzy
+msgid "_Group:"
+msgstr "群組"
+
+#: src/dialogs.c:1069
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 新增好友"
 
-#: src/dialogs.c:1100
-msgid "Add Buddy"
-msgstr "新增好友"
-
-#: src/dialogs.c:1110
-msgid "Contact"
-msgstr "連絡"
+#: src/dialogs.c:1088
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddylist. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+
+#: src/dialogs.c:1107
+#, fuzzy
+msgid "Screen Name"
+msgstr "帳  號:"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1136
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "增加到"
 
-#: src/dialogs.c:1431
+#: src/dialogs.c:1468
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - 離開!"
 
-#: src/dialogs.c:1443
-msgid "Privacy settings are affected immediately."
-msgstr ""
-
-#: src/dialogs.c:1451
+#: src/dialogs.c:1479
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: src/dialogs.c:1488
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/dialogs.c:1470
+#: src/dialogs.c:1505
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: src/dialogs.c:1471
+#: src/dialogs.c:1509
+#, fuzzy
+msgid "Allow only users on my buddy list"
+msgstr "允許下列的使用者和我聯絡"
+
+#: src/dialogs.c:1513
 msgid "Allow only the users below"
 msgstr "允許下列的使用者和我聯絡"
 
-#: src/dialogs.c:1473
-msgid "Allow List"
-msgstr "允許清單"
-
-#: src/dialogs.c:1504
+#: src/dialogs.c:1551
 msgid "Deny all users"
 msgstr "拒絕所有使用者"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1555
 msgid "Block the users below"
 msgstr "拒絕以下的使用者"
 
-#: src/dialogs.c:1507
-msgid "Block List"
-msgstr "拒絕清單"
-
-#: src/dialogs.c:1560
+#: src/dialogs.c:1620
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友來進行狀態捕捉。"
 
-#: src/dialogs.c:1696
+#: src/dialogs.c:1759
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - 新增好友狀態捕捉"
 
 #. <pounce type="who">
-#: src/dialogs.c:1707
+#: src/dialogs.c:1769
 msgid "Pounce Who"
 msgstr "要捕捉誰的狀態"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1780
 msgid "Account"
 msgstr "帳號"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1744
+#: src/dialogs.c:1806
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/dialogs.c:1754
+#: src/dialogs.c:1816
 msgid "Pounce on sign on"
 msgstr "好友登入"
 
-#: src/dialogs.c:1763
+#: src/dialogs.c:1825
 msgid "Pounce on return from away"
 msgstr "好友暫離"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1834
 msgid "Pounce on return from idle"
 msgstr "好友回來"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1843
 msgid "Pounce when buddy is typing to you"
 msgstr "當好友正在發訊息給你時"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1791
+#: src/dialogs.c:1853
 msgid "Pounce Action"
 msgstr "對應的動作"
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1864
 msgid "Open IM Window"
 msgstr "開啟即時訊息視窗"
 
-#: src/dialogs.c:1811
+#: src/dialogs.c:1873
 msgid "Popup Notification"
 msgstr "跳出通知"
 
-#: src/dialogs.c:1820 src/prefs.c:395
+#: src/dialogs.c:1882 src/prefs.c:296
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:1903
 msgid "Execute command on pounce"
 msgstr "執行指令"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1925
 msgid "Play sound on pounce"
 msgstr "播放音效"
 
 #. </pounce type="action">
-#: src/dialogs.c:1885
+#: src/dialogs.c:1947
 msgid "Save this pounce after activation"
 msgstr "儲存設定(這樣才能在每次事件發生時發生作用)"
 
-#: src/dialogs.c:1971
+#: src/dialogs.c:1967
+#, fuzzy
+msgid "_Save"
+msgstr "儲存"
+
+#: src/dialogs.c:1973
+#, fuzzy
+msgid "C_ancel"
+msgstr "取消"
+
+#: src/dialogs.c:2044
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 設定目錄資訊"
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2052
 msgid "Directory Info"
 msgstr "目錄資訊"
 
-#: src/dialogs.c:2002
+#: src/dialogs.c:2074
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允許在 Web 搜尋來檢視您的個人資訊"
 
 #. Line 1
-#: src/dialogs.c:2005 src/dialogs.c:2710
+#: src/dialogs.c:2077 src/dialogs.c:2777
 msgid "First Name"
 msgstr "名"
 
 #. Line 2
-#: src/dialogs.c:2016 src/dialogs.c:2722
+#: src/dialogs.c:2088 src/dialogs.c:2789
 msgid "Middle Name"
 msgstr ""
 
 #. Line 3
-#: src/dialogs.c:2028 src/dialogs.c:2734
+#: src/dialogs.c:2100 src/dialogs.c:2801
 msgid "Last Name"
 msgstr "姓"
 
 #. Line 4
-#: src/dialogs.c:2039 src/dialogs.c:2746
+#: src/dialogs.c:2111 src/dialogs.c:2813
 msgid "Maiden Name"
 msgstr ""
 
 #. Line 6
-#: src/dialogs.c:2061 src/dialogs.c:2769
+#: src/dialogs.c:2133 src/dialogs.c:2836
 msgid "State"
 msgstr "省"
 
-#: src/dialogs.c:2126
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
+#: src/dialogs.c:5216
+msgid "Save"
+msgstr "儲存"
+
+#: src/dialogs.c:2198
 msgid "New Passwords Do Not Match"
 msgstr "新密碼並不相符"
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2203
 msgid "Fill out all fields completely"
 msgstr "把所有的表格都填了"
 
-#: src/dialogs.c:2156
+#: src/dialogs.c:2228
 msgid "Gaim - Password Change"
 msgstr "Gaim - 修改密碼"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2257
 msgid "Original Password"
 msgstr "舊密碼"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2271
 msgid "New Password"
 msgstr "新密碼"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2285
 msgid "New Password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/dialogs.c:2255
+#. Build OK Button
+#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
+#: src/dialogs.c:3002 src/dialogs.c:4471
+msgid "OK"
+msgstr "確定"
+
+#: src/dialogs.c:2327
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 設定使用者資訊"
 
-#: src/dialogs.c:2367
+#: src/dialogs.c:2442
 msgid "Below are the results of your search: "
 msgstr "以下是您所做查詢的結果:"
 
-#: src/dialogs.c:2500 src/dialogs.c:2507
+#: src/dialogs.c:2574
 msgid "Permit"
 msgstr "許可"
 
-#: src/dialogs.c:2502 src/dialogs.c:2509
-msgid "Deny"
-msgstr "拒絕"
-
-#: src/dialogs.c:2546
+#: src/dialogs.c:2614
 msgid "Gaim - Add Permit"
 msgstr "Gaim - 加入許可"
 
-#: src/dialogs.c:2548
+#: src/dialogs.c:2616
 msgid "Gaim - Add Deny"
 msgstr "Gaim - 增加禁止人"
 
-#: src/dialogs.c:2608
+#: src/dialogs.c:2675
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - 記錄交談"
 
-#: src/dialogs.c:2686 src/dialogs.c:2849
+#: src/dialogs.c:2753 src/dialogs.c:2914
 msgid "Search for Buddy"
 msgstr "找尋好友"
 
-#: src/dialogs.c:2814
+#: src/dialogs.c:2881
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 以資訊找尋好友"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2908
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - 以 Email 來找尋好友"
 
-#: src/dialogs.c:2983
+#: src/dialogs.c:2997
+msgid "Insert Link"
+msgstr "加入連結"
+
+#: src/dialogs.c:3048
 msgid "Gaim - Add URL"
 msgstr "Gaim - 增加 URL"
 
-#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
+#: src/dialogs.c:3147 src/dialogs.c:3164
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3192 src/dialogs.c:3209
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:3354
+#: src/dialogs.c:3284 src/dialogs.c:3308
+msgid "Select Font"
+msgstr "選擇字型"
+
+#: src/dialogs.c:3385
 msgid "Import to:"
 msgstr "匯入到:"
 
-#: src/dialogs.c:3378
+#: src/dialogs.c:3409
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 匯入好友名單"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3445
+#: src/dialogs.c:3470
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能建立一個沒有原因的離開訊息"
 
-#: src/dialogs.c:3446
+#: src/dialogs.c:3471
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3453
+#: src/dialogs.c:3478
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:3521
+#: src/dialogs.c:3541
 msgid "Gaim - New away message"
 msgstr "Gaim - 新的離開訊息"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3550
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:3544
+#: src/dialogs.c:3563
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3614
+msgid "Save & Use"
+msgstr "儲存並使用"
+
+#: src/dialogs.c:3618
 msgid "Use"
 msgstr "使用"
 
-#: src/dialogs.c:3609
-msgid "Save & Use"
-msgstr "儲存並使用"
-
 #. show everything
-#: src/dialogs.c:3806
+#: src/dialogs.c:3752
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/dialogs.c:3859
-msgid "Alias Buddy"
-msgstr "為好友加上別名"
-
-#: src/dialogs.c:3892
+#: src/dialogs.c:3841
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 為好友加上別名"
 
-#: src/dialogs.c:3933 src/dialogs.c:3940
+#: src/dialogs.c:3879 src/dialogs.c:3886
 #, fuzzy, c-format
 msgid "Couldn't write to %s."
 msgstr "無法連到伺服器"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3910
 msgid "Gaim - Save Log File"
 msgstr "Gaim - 儲存日誌檔"
 
-#: src/dialogs.c:3996
+#: src/dialogs.c:3940
 #, fuzzy, c-format
 msgid "Couldn't remove file %s."
 msgstr "無法開啟設定檔 %s。"
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:3967
 msgid "Really clear log?"
 msgstr "真的要清除日誌嗎?"
 
-#: src/dialogs.c:4039
+#: src/dialogs.c:3982
 msgid "Okay"
 msgstr "確定"
 
-#: src/dialogs.c:4210
+#: src/dialogs.c:4163
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:4273
+#: src/dialogs.c:4226
 msgid "Conversation"
 msgstr "交談"
 
-#: src/dialogs.c:4296
+#: src/dialogs.c:4247
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4378
+#: src/dialogs.c:4330
 msgid "Gaim - Rename Group"
 msgstr "Gaim - 修改群組名稱"
 
-#: src/dialogs.c:4388
-msgid "Rename Group"
-msgstr "修改群組名稱"
-
-#: src/dialogs.c:4395 src/dialogs.c:4501
-msgid "New name:"
-msgstr "新名字:"
-
-#: src/dialogs.c:4484
+#: src/dialogs.c:4347
+msgid "Please enter a new name for the selected group.\n"
+msgstr ""
+
+#: src/dialogs.c:4436
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - 修改好友名稱"
 
-#: src/dialogs.c:4494
+#: src/dialogs.c:4445
 msgid "Rename Buddy"
 msgstr "修改好友名稱"
 
+#: src/dialogs.c:4452
+msgid "New name:"
+msgstr "新名字:"
+
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4578
+#: src/dialogs.c:4529
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - 選擇 Perl 命令稿"
 
-#: src/gaimrc.c:1242
+#: src/gaimrc.c:1348
 #, c-format
 msgid "Could not open config file %s."
 msgstr "無法開啟設定檔 %s。"
 
-#: src/html.c:183
+#: src/html.c:185
 #, c-format
 msgid "Received: '%s'\n"
 msgstr "收到:'%s'\n"
 
-#: src/html.c:221
+#: src/html.c:223
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
-#: src/module.c:106 src/module.c:112
-#, fuzzy
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim 無法送出訊息"
-
-#: src/multi.c:454
+#: src/multi.c:235
+#, fuzzy
+msgid "Screenname"
+msgstr "帳號"
+
+#: src/multi.c:263
+#, fuzzy
+msgid "Protocol"
+msgstr "通訊協定:"
+
+#: src/multi.c:542
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - 讀取好友圖示"
 
-#: src/multi.c:497
+#: src/multi.c:585
 msgid "Buddy Icon File:"
 msgstr "好友圖示檔案:"
 
-#: src/multi.c:508
+#: src/multi.c:598
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/multi.c:513 src/prefs.c:1066
+#: src/multi.c:603 src/prefs.c:1221
 msgid "Reset"
 msgstr "重置"
 
-#: src/multi.c:540
+#: src/multi.c:620
+#, fuzzy
+msgid "Login Options"
+msgstr "字型選項"
+
+#: src/multi.c:630
 msgid "Screenname:"
 msgstr "帳號"
 
-#: src/multi.c:559
+#: src/multi.c:653
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/multi.c:569
+#: src/multi.c:665
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/multi.c:574
+#: src/multi.c:672
 msgid "Remember Password"
 msgstr "記住密碼"
 
-#: src/multi.c:575
+#: src/multi.c:673
 msgid "Auto-Login"
 msgstr "自動登入"
 
-#: src/multi.c:616
-msgid "New Mail Notifications"
-msgstr "新郵件通知"
-
 #: src/multi.c:706
+#, fuzzy
+msgid "User Options"
+msgstr "代理伺服器選項"
+
+#: src/multi.c:715
+msgid "New Mail Notifications"
+msgstr "新郵件通知"
+
+#: src/multi.c:767
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "選    項"
+
+#: src/multi.c:809
 msgid "Register with server"
 msgstr "向伺服器註冊"
 
-#: src/multi.c:764
+#: src/multi.c:868
 msgid "Gaim - Modify Account"
 msgstr "Gaim - 修改帳號"
 
-#: src/multi.c:883
+#: src/multi.c:1013
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: src/multi.c:948
+#: src/multi.c:1024
+#, fuzzy, c-format
+msgid "Password for %s:"
+msgstr "密碼:"
+
+#: src/multi.c:1044
+msgid "Signon"
+msgstr "登    入"
+
+#: src/multi.c:1077
 msgid "TOC not found."
 msgstr ""
 
-#: src/multi.c:949
+#: src/multi.c:1078
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:955
+#: src/multi.c:1084
 #, fuzzy
 msgid "Protocol not found."
 msgstr "Protocol 相關設定"
 
-#: src/multi.c:956
+#: src/multi.c:1085
 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."
@@ -2829,40 +3406,45 @@
 "您無法使用這個帳號來登入;您可能沒有設定這個帳號所使用的 Protocol,或者這個 "
 "Protocol 並沒有提供登入的功能。"
 
-#: src/multi.c:987
+#: src/multi.c:1138
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/multi.c:1024
+#: src/multi.c:1139
+msgid "Delete"
+msgstr "刪除"
+
+#: src/multi.c:1187
 msgid "Gaim - Account Editor"
 msgstr "Gaim - 帳號管理"
 
-#: src/multi.c:1043
-msgid "Select All"
-msgstr "全部選取"
-
-#: src/multi.c:1048
-msgid "Select Autos"
-msgstr "選取自動登入"
-
-#: src/multi.c:1052
-msgid "Select None"
-msgstr "取消選取"
-
-#: src/multi.c:1066
-msgid "Modify"
+#: src/multi.c:1257
+#, fuzzy
+msgid "_Modify"
 msgstr "修改"
 
-#: src/multi.c:1070
-msgid "Sign On/Off"
-msgstr "登入/登出"
-
-#: src/multi.c:1074
-msgid "Delete"
-msgstr "刪除"
-
-#: src/multi.c:1389
+#: src/multi.c:1308
+#, fuzzy
+msgid "Done."
+msgstr "無"
+
+#: src/multi.c:1448
+#, fuzzy
+msgid "Signon: "
+msgstr "登入:%s"
+
+#: src/multi.c:1505
+#, fuzzy
+msgid "Gaim Account Signon"
+msgstr "Gaim - 帳號管理"
+
+#: src/multi.c:1517
+#, fuzzy
+msgid "Cancel All"
+msgstr "取消"
+
+#: src/multi.c:1574
 #, c-format
 msgid ""
 "%s\n"
@@ -2871,530 +3453,552 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1408
+#: src/multi.c:1593
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s 無法登入"
 
-#: src/multi.c:1409
+#: src/multi.c:1594
 msgid "Signon Error"
 msgstr "登入錯誤"
 
-#: src/multi.c:1419
+#: src/multi.c:1604
 msgid "Notice"
 msgstr "通知"
 
-#: src/multi.c:1429
+#: src/multi.c:1614
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s 已經登出"
 
-#: src/multi.c:1430
+#: src/multi.c:1615
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: src/plugins.c:120
-msgid "Gaim - Plugin List"
-msgstr "Gaim - 插件列表"
-
-#: src/plugins.c:205
-msgid "Gaim - Plugins"
-msgstr "Gaim - 插件"
-
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:221
-msgid "Loaded Plugins"
-msgstr "已載入的插件"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/plugins.c:265
-#, fuzzy
-msgid "Selected Plugin"
-msgstr "全部選取"
-
-#: src/plugins.c:308
-msgid "Filepath:"
-msgstr "檔案路徑:"
-
-#: src/plugins.c:326
-msgid "Load"
-msgstr "讀取"
-
-#: src/plugins.c:329
-msgid "Load a plugin from a file"
-msgstr "由檔案讀取一個插件"
-
-#: src/plugins.c:331
-msgid "Configure"
-msgstr "設定"
-
-#: src/plugins.c:334
-msgid "Configure settings of the selected plugin"
-msgstr "設定被選取的插件"
-
-#: src/plugins.c:336
-msgid "Reload"
-msgstr "重新讀取"
-
-#: src/plugins.c:340
-msgid "Reload the selected plugin"
-msgstr "重新讀取被選取的插件"
-
-#: src/plugins.c:342
-msgid "Unload"
-msgstr "移除"
-
-#: src/plugins.c:345
-msgid "Unload the selected plugin"
-msgstr "移除被選取的插件"
-
-#: src/plugins.c:350
-msgid "Close this window"
-msgstr "關閉這個視窗"
-
-#: src/prefs.c:279
+#: src/perl.c:343
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#: src/prefs.c:180
 #, fuzzy
 msgid "Interface Options"
 msgstr "一般選項"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:282
-#, fuzzy
-msgid "Show _Debug Window"
+#: src/prefs.c:183
+#, fuzzy
+msgid "Show _debug window"
 msgstr "顯示除錯視窗"
 
-#: src/prefs.c:285
-#, fuzzy
-msgid "Use _borderless buttons"
-msgstr "使用沒有邊框的按鈕"
-
-#: src/prefs.c:301
+#: src/prefs.c:200
 #, fuzzy
 msgid "Style"
 msgstr "省"
 
-#: src/prefs.c:302
+#: src/prefs.c:201
 #, fuzzy
 msgid "_Bold"
 msgstr "粗體"
 
-#: src/prefs.c:303
+#: src/prefs.c:202
 #, fuzzy
 msgid "_Italics"
 msgstr "斜體"
 
-#: src/prefs.c:304
+#: src/prefs.c:203
 #, fuzzy
 msgid "_Underline"
 msgstr "底線"
 
-#: src/prefs.c:305
+#: src/prefs.c:204
 #, fuzzy
 msgid "_Strikethough"
 msgstr "刪除的文字"
 
-#: src/prefs.c:307
+#: src/prefs.c:206
 #, fuzzy
 msgid "Face"
 msgstr "取消"
 
-#: src/prefs.c:310
+#: src/prefs.c:209
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "加入一個笑臉"
 
-#: src/prefs.c:322
+#: src/prefs.c:221
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "加入一個笑臉"
 
-#: src/prefs.c:334
+#: src/prefs.c:228
+msgid "Color"
+msgstr "顏色"
+
+#: src/prefs.c:233
 #, fuzzy
 msgid "_Text color"
 msgstr "文字顏色"
 
-#: src/prefs.c:350
+#: src/prefs.c:249
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "背景顏色"
 
-#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
 #, fuzzy
 msgid "Display"
 msgstr "好友顯示"
 
-#: src/prefs.c:374
+#: src/prefs.c:274
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "顯示所有的笑臉圖示"
 
-#: src/prefs.c:375
+#: src/prefs.c:275
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "顯示訊息時間"
 
-#: src/prefs.c:376
+#: src/prefs.c:276
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "顯示 URL 為超連結"
 
-#: src/prefs.c:377
+#: src/prefs.c:278
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "標示出錯誤的拼字"
 
-#: src/prefs.c:380
+#: src/prefs.c:281
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "忽略顏色"
 
-#: src/prefs.c:381
+#: src/prefs.c:282
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "忽略字型"
 
-#: src/prefs.c:382
+#: src/prefs.c:283
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "忽略字體大小"
 
-#: src/prefs.c:383
-#, fuzzy
-msgid "Ignore Ti_K Automated Messages"
-msgstr "忽略 Tik 自動訊息"
-
-#: src/prefs.c:396
+#: src/prefs.c:297
 #, fuzzy
 msgid "_Enter sends message"
 msgstr "按下 Enter 送出訊息"
 
-#: src/prefs.c:397
+#: src/prefs.c:298
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "按下 Ctrl-Enter 送出訊息"
 
-#: src/prefs.c:399
+#: src/prefs.c:300
 #, fuzzy
 msgid "Window Closing"
 msgstr "即時訊息視窗"
 
-#: src/prefs.c:400
+#: src/prefs.c:301
 #, fuzzy
 msgid "E_scape closes window"
 msgstr "按下 Escape 關閉視窗"
 
-#: src/prefs.c:401
+#: src/prefs.c:302
 #, fuzzy
 msgid "Control-_W closes window"
 msgstr "按下 Ctrl-W 關閉視窗"
 
-#: src/prefs.c:404
+#: src/prefs.c:305
 #, fuzzy
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "按下 Ctrl-{B/I/U/S} 加入 HTML 標籤"
 
-#: src/prefs.c:405
+#: src/prefs.c:306
 #, fuzzy
 msgid "Control-(number) inserts _smileys"
 msgstr "按下 CTRL-(Number) 來加入一個笑臉"
 
-#: src/prefs.c:417
+#: src/prefs.c:318
 #, fuzzy
 msgid "Buttons"
 msgstr "視窗下方"
 
-#: src/prefs.c:418
+#: src/prefs.c:319
 #, fuzzy
 msgid "_Hide IM/Info/Chat buttons"
 msgstr "隱藏「即時訊息、資訊、聊天」按鍵"
 
-#: src/prefs.c:419
+#: src/prefs.c:320
 #, fuzzy
 msgid "Show _pictures on buttons"
 msgstr "在按鍵上顯示圖示"
 
-#: src/prefs.c:421
+#: src/prefs.c:322
 msgid "Buddy List Window"
 msgstr "好友名單視窗"
 
-#: src/prefs.c:422
-#, fuzzy
-msgid "_Save Window Size/Position"
+#: src/prefs.c:323
+#, fuzzy
+msgid "_Save window size/position"
 msgstr "保存視窗的大小和位置"
 
-#: src/prefs.c:423
-#, fuzzy
-msgid "_Raise Window on Events"
+#: src/prefs.c:324
+#, fuzzy
+msgid "_Raise window on events"
 msgstr "當事件發生時,將視窗提到最上方"
 
-#: src/prefs.c:425
+#: src/prefs.c:326
 #, fuzzy
 msgid "Group Display"
 msgstr "群組顯示"
 
-#: src/prefs.c:426
+#: src/prefs.c:327
 #, fuzzy
 msgid "Hide _groups with no online buddies"
 msgstr "隱藏目前沒有線上好友的群組"
 
-#: src/prefs.c:427
+#: src/prefs.c:328
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "顯示群組裡的好友數目"
 
-#: src/prefs.c:429
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/prefs.c:430
+#: src/prefs.c:331
 #, fuzzy
 msgid "Show buddy type _icons"
 msgstr "顯示好友類別圖示"
 
-#: src/prefs.c:431
+#: src/prefs.c:332
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "顯示警告等級"
 
-#: src/prefs.c:432
+#: src/prefs.c:333
 #, fuzzy
 msgid "Show idle _times"
 msgstr "顯示閒置時間"
 
-#: src/prefs.c:433
+#: src/prefs.c:334
 #, fuzzy
 msgid "Grey i_dle buddies"
 msgstr "把閒置的好友設為灰色"
 
-#: src/prefs.c:450 src/prefs.c:492
+#: src/prefs.c:351 src/prefs.c:393
 #, fuzzy
 msgid "Window"
 msgstr "即時訊息視窗"
 
-#: src/prefs.c:457 src/prefs.c:499
+#: src/prefs.c:352 src/prefs.c:394
+#, fuzzy
+msgid "Show _buttons as:"
+msgstr "顯示按鍵為:"
+
+#: src/prefs.c:353 src/prefs.c:395
+msgid "Pictures"
+msgstr "圖形"
+
+#: src/prefs.c:354 src/prefs.c:396
+msgid "Text"
+msgstr "文字"
+
+#: src/prefs.c:355 src/prefs.c:397
+#, fuzzy
+msgid "Pictures and text"
+msgstr "圖形與文字"
+
+#: src/prefs.c:358 src/prefs.c:400
 #, fuzzy
 msgid "New window _width:"
 msgstr "新視窗寬度:"
 
-#: src/prefs.c:458 src/prefs.c:500
+#: src/prefs.c:359 src/prefs.c:401
 #, fuzzy
 msgid "New window _height:"
 msgstr "新視窗高度:"
 
-#: src/prefs.c:459 src/prefs.c:501
+#: src/prefs.c:360 src/prefs.c:402
 #, fuzzy
 msgid "_Entry widget height:"
 msgstr "輸入欄位的高度:"
 
-#: src/prefs.c:460 src/prefs.c:502
+#: src/prefs.c:361 src/prefs.c:403
 #, fuzzy
 msgid "_Raise windows on events"
 msgstr "當事件發生時,將視窗提到最上方"
 
-#: src/prefs.c:461
+#: src/prefs.c:362
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "送出訊息後關閉視穿"
 
-#: src/prefs.c:464
+#: src/prefs.c:365
 msgid "Buddy Icons"
 msgstr "好友圖示"
 
-#: src/prefs.c:465
-#, fuzzy
-msgid "Hide Buddy _Icons"
+#: src/prefs.c:366
+#, fuzzy
+msgid "Hide buddy _icons"
 msgstr "隱藏好友圖示"
 
-#: src/prefs.c:466
-#, fuzzy
-msgid "Disable Buddy Icon A_nimation"
+#: src/prefs.c:367
+#, fuzzy
+msgid "Disable buddy icon a_nimation"
 msgstr "關閉好友圖示動畫"
 
-#: src/prefs.c:469
+#: src/prefs.c:370
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "在視窗中顯示登入訊息"
 
-#: src/prefs.c:471
+#: src/prefs.c:372
 #, fuzzy
 msgid "Typing Notification"
 msgstr "跳出通知"
 
-#: src/prefs.c:472
+#: src/prefs.c:373
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "通知您的好友您正在發訊息給他們"
 
-#: src/prefs.c:504
+#: src/prefs.c:405
 msgid "Tab Completion"
 msgstr ""
 
-#: src/prefs.c:505
-msgid "_Tab-Complete Nicks"
-msgstr ""
-
-#: src/prefs.c:506
-msgid "_Old-Style Tab Completion"
-msgstr ""
-
-#: src/prefs.c:509
+#: src/prefs.c:406
+msgid "_Tab-complete nicks"
+msgstr ""
+
+#: src/prefs.c:407
+msgid "_Old-style tab completion"
+msgstr ""
+
+#: src/prefs.c:410
 #, fuzzy
 msgid "_Show people joining/leaving in window"
 msgstr "在視窗中顯示其他人進入或離開的事件"
 
-#: src/prefs.c:510
+#: src/prefs.c:411
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:526
+#: src/prefs.c:427
 msgid "IM Tabs"
 msgstr ""
 
-#: src/prefs.c:533
+#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
+#, fuzzy
+msgid "Tab _placement:"
+msgstr "Tab 位置:"
+
+#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgid "Top"
+msgstr "視窗上方"
+
+#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#, fuzzy
+msgid "Bottom"
+msgstr "視窗下方"
+
+#: src/prefs.c:431 src/prefs.c:441
+msgid "Left"
+msgstr "視窗左側"
+
+#: src/prefs.c:432 src/prefs.c:442
+msgid "Right"
+msgstr "視窗右側"
+
+#: src/prefs.c:434
 #, fuzzy
 msgid ""
-"Show all _Instant Messages in one tabbed\n"
+"Show all _instant messages in one tabbed\n"
 "window"
 msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
 
-#: src/prefs.c:534
+#: src/prefs.c:435
 msgid "Show a_liases in tabs/titles"
 msgstr ""
 
-#: src/prefs.c:536
+#: src/prefs.c:437
 #, fuzzy
 msgid "Chat Tabs"
 msgstr "聊天"
 
-#: src/prefs.c:543
+#: src/prefs.c:444
 #, fuzzy
 msgid "Show all c_hats in one tabbed window"
 msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
 
-#: src/prefs.c:546
+#: src/prefs.c:447
 msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:547
+#: src/prefs.c:448
 #, fuzzy
 msgid ""
 "Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
 
-#: src/prefs.c:549
+#: src/prefs.c:450
 #, fuzzy
 msgid "Buddy List Tabs"
 msgstr "好友清單"
 
-#: src/prefs.c:570
+#: src/prefs.c:471
 msgid "Proxy Type"
 msgstr "代理伺服器型態"
 
-#: src/prefs.c:582
+#: src/prefs.c:472
+#, fuzzy
+msgid "Proxy _type:"
+msgstr "代理伺服器型態"
+
+#: src/prefs.c:473
+#, fuzzy
+msgid "No proxy"
+msgstr "沒有代理伺服器"
+
+#: src/prefs.c:483
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/prefs.c:595
+#: src/prefs.c:496
 #, fuzzy
 msgid "_Host"
 msgstr "主機位址"
 
-#: src/prefs.c:609
+#: src/prefs.c:510
 msgid "Port"
 msgstr "端口"
 
-#: src/prefs.c:625
+#: src/prefs.c:526
 #, fuzzy
 msgid "_User"
 msgstr "使用者"
 
-#: src/prefs.c:639
+#: src/prefs.c:540
 #, fuzzy
 msgid "Pa_ssword"
 msgstr "密碼"
 
-#: src/prefs.c:670
+#. Registered default browser is used by Windows
+#: src/prefs.c:577
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/prefs.c:578
+#, fuzzy
+msgid "_Browser"
+msgstr "瀏覽器"
+
+#: src/prefs.c:582
+msgid "Manual"
+msgstr ""
+
+#: src/prefs.c:606
 #, fuzzy
 msgid "Browser Options"
 msgstr "代理伺服器選項"
 
-#: src/prefs.c:698
+#: src/prefs.c:607
 #, fuzzy
 msgid "Open new _window by default"
 msgstr "預設為彈出個一新的視窗"
 
-#: src/prefs.c:710
+#: src/prefs.c:622
 #, fuzzy
 msgid "Message Logs"
 msgstr "訊息"
 
-#: src/prefs.c:711
-#, fuzzy
-msgid "_Log all conversations"
+#: src/prefs.c:623
+#, fuzzy
+msgid "_Log all instant messages"
+msgstr "新的即時訊息"
+
+#: src/prefs.c:624
+#, fuzzy
+msgid "Log all c_hats"
 msgstr "記錄所有的交談內容"
 
-#: src/prefs.c:712
+#: src/prefs.c:625
 #, fuzzy
 msgid "Strip _HTML from logs"
 msgstr "將交談記錄中的 HTML 標籤去除"
 
-#: src/prefs.c:714
+#: src/prefs.c:627
 #, fuzzy
 msgid "System Logs"
 msgstr "觀看系統日誌"
 
-#: src/prefs.c:715
+#: src/prefs.c:628
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入/登出"
 
-#: src/prefs.c:717
+#: src/prefs.c:630
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置/取消閒置"
 
-#: src/prefs.c:719
+#: src/prefs.c:632
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開/回來"
 
-#: src/prefs.c:720
+#: src/prefs.c:633
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入/閒置/離開等狀態"
 
-#: src/prefs.c:722
+#: src/prefs.c:635
 #, fuzzy
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "使用個別的檔案來記錄每一個好友的登入"
 
-#: src/prefs.c:749
+#: src/prefs.c:667
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/prefs.c:750
+#: src/prefs.c:668
 #, fuzzy
 msgid "_No sounds when you log in"
 msgstr "當登入時不啟動音效"
 
-#: src/prefs.c:751
+#: src/prefs.c:669
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "離開時發出音效"
 
-#: src/prefs.c:753
+#: src/prefs.c:672
 #, fuzzy
 msgid "Sound Method"
 msgstr "聲音模式"
 
-#: src/prefs.c:777
+#: src/prefs.c:673
+#, fuzzy
+msgid "_Method"
+msgstr "聲音模式"
+
+#: src/prefs.c:676
+msgid "Console beep"
+msgstr ""
+
+#: src/prefs.c:686
+#, fuzzy
+msgid "Internal"
+msgstr "內部錯誤"
+
+#: src/prefs.c:687
+msgid "Command"
+msgstr ""
+
+#: src/prefs.c:696
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -3403,153 +4007,224 @@
 "音效指令\n"
 "(%s for filename)"
 
-#: src/prefs.c:813
+#: src/prefs.c:732
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "送出訊息時取消離開狀態"
 
-#: src/prefs.c:814
+#: src/prefs.c:733
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中"
 
-#: src/prefs.c:815
+#: src/prefs.c:734
 #, fuzzy
 msgid "_Ignore new conversations when away"
 msgstr "在離開時,忽略新的交談"
 
-#: src/prefs.c:817
+#: src/prefs.c:736
 #, fuzzy
 msgid "Auto-response"
 msgstr "不要送出自動回應"
 
-#: src/prefs.c:820
+#: src/prefs.c:739
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:741
 #, fuzzy
 msgid "_Don't send auto-response"
 msgstr "不要送出自動回應"
 
-#: src/prefs.c:823
+#: src/prefs.c:742
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應"
 
-#: src/prefs.c:828
-#, fuzzy
-msgid "Idle"
-msgstr "閒置時間:"
-
-#: src/prefs.c:839
+#: src/prefs.c:743
+#, fuzzy
+msgid "Do_n't send auto-response in active conversations"
+msgstr "不要送出自動回應"
+
+#: src/prefs.c:749
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/prefs.c:750
+msgid "None"
+msgstr "無"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "Gaim usage"
+msgstr "Gaim 使用"
+
+#: src/prefs.c:754
+#, fuzzy
+msgid "X usage"
+msgstr "X 使用"
+
+#: src/prefs.c:756
+#, fuzzy
+msgid "Windows usage"
+msgstr "即時訊息視窗"
+
+#: src/prefs.c:763
 #, fuzzy
 msgid "Auto-away"
 msgstr "離開"
 
-#: src/prefs.c:840
+#: src/prefs.c:764
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:765
+msgid "_Minutes before setting away:"
+msgstr ""
+
+#: src/prefs.c:770
+#, fuzzy
+msgid "Away m_essage:"
+msgstr "離開訊息"
+
+#: src/prefs.c:804 src/prefs.c:892
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\" color=\"red\">%s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:808 src/prefs.c:896
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/prefs.c:813
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+
+#: src/prefs.c:818
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+
+#: src/prefs.c:1003
+msgid "Details"
+msgstr ""
+
+#: src/prefs.c:1108
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - 音效設定"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1217
 msgid "Test"
 msgstr "測試"
 
-#: src/prefs.c:1070
+#: src/prefs.c:1225
 msgid "Choose..."
 msgstr "選擇…"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1353
 #, fuzzy
 msgid "_Edit"
 msgstr "編輯"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1391
 msgid "Interface"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1392
 #, fuzzy
 msgid "Fonts"
 msgstr "字型"
 
-#: src/prefs.c:1305
+#: src/prefs.c:1393
 #, fuzzy
 msgid "Message Text"
 msgstr "訊息送出"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1394
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1396
 msgid "IM Window"
 msgstr "即時訊息視窗"
 
-#: src/prefs.c:1309
+#: src/prefs.c:1397
 #, fuzzy
 msgid "Chat Window"
 msgstr "群組聊天視窗"
 
-#: src/prefs.c:1310
+#: src/prefs.c:1398
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1399
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: src/prefs.c:1312
+#: src/prefs.c:1400
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1402
+msgid "Logging"
+msgstr "登入中"
+
+#: src/prefs.c:1403
 msgid "Sounds"
 msgstr "音效"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1404
 #, fuzzy
 msgid "Sound Events"
 msgstr "音效"
 
-#: src/prefs.c:1317
+#: src/prefs.c:1405
 #, fuzzy
 msgid "Away / Idle"
 msgstr "離開原因:"
 
-#: src/prefs.c:1318
+#: src/prefs.c:1406
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/prefs.c:1380
+#: src/prefs.c:1408
+msgid "Plugins"
+msgstr "插    件"
+
+#: src/prefs.c:1447
 msgid "Gaim - Preferences"
 msgstr "Gaim - 偏好設定"
 
-#: src/prefs.c:1519
-msgid "Gaim debug output window"
-msgstr "Gaim 除錯視窗"
-
-#: src/prpl.c:70
-msgid "Incompatible protocol detected."
-msgstr ""
-
-#: src/prpl.c:71
-msgid ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"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:85
-msgid "Libicq.so detected."
-msgstr ""
-
-#: src/prpl.c:86
+#: src/prefs.c:1565
+#, fuzzy
+msgid "Gaim - Debug Window"
+msgstr "除錯視窗"
+
+#: src/prpl.c:100
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:101
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3557,33 +4232,28 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:105
-#, c-format
-msgid "%s was using %s, which got removed. %s is now offline."
-msgstr ""
-
-#: src/prpl.c:145
-msgid "Accept?"
-msgstr "接受?"
-
-#: src/prpl.c:211
+#: src/prpl.c:252
 msgid "Gaim - Prompt"
 msgstr "Gaim - 提示"
 
-#: src/prpl.c:431
+#: src/prpl.c:453
+msgid "No Subject"
+msgstr ""
+
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - 新郵件"
 
-#: src/prpl.c:457
+#: src/prpl.c:500
 msgid "Open Mail"
 msgstr "開啟郵件"
 
-#: src/prpl.c:582
+#: src/prpl.c:626
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/prpl.c:590
+#: src/prpl.c:634
 msgid ""
 "\n"
 "\n"
@@ -3593,89 +4263,334 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/prpl.c:633
+#: src/prpl.c:677
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "您的系統中並未存在任何可供您註冊一個新帳號的通訊協定。"
 
-#: src/prpl.c:670
+#: src/prpl.c:714
 msgid "Gaim - Registration"
 msgstr "Gaim - 註冊"
 
-#: src/prpl.c:685
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr "註冊資訊"
 
-#: src/prpl.c:702
+#: src/prpl.c:745
 msgid "Register"
 msgstr "註冊"
 
-#: src/server.c:55
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:610
+#: src/server.c:648
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d 個訊息)"
 
-#: src/server.c:616
+#: src/server.c:654
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:901
+#: src/server.c:966
 msgid "Yes"
 msgstr "Yes"
 
-#: src/server.c:902
+#: src/server.c:967
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1101
+#: src/server.c:1163
 msgid "More Info"
 msgstr "更多資訊"
 
-#: src/sound.c:63
+#: src/sound.c:68
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/sound.c:64
+#: src/sound.c:69
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/sound.c:65
+#: src/sound.c:70
 msgid "Message received"
 msgstr "收到訊息"
 
-#: src/sound.c:66
+#: src/sound.c:71
 msgid "Message received begins conversation"
 msgstr "訊息收到,開始進行交談"
 
-#: src/sound.c:67
+#: src/sound.c:72
 msgid "Message sent"
 msgstr "訊息送出"
 
-#: src/sound.c:68
+#: src/sound.c:73
 msgid "Person enters chat"
 msgstr "有人進入聊天室"
 
-#: src/sound.c:69
+#: src/sound.c:74
 msgid "Person leaves chat"
 msgstr "有人離開聊天室"
 
-#: src/sound.c:70
+#: src/sound.c:75
 msgid "You talk in chat"
 msgstr "您已進入聊天室"
 
-#: src/sound.c:71
+#: src/sound.c:76
 msgid "Others talk in chat"
 msgstr "其他人進入聊天室"
 
-#: src/sound.c:74
+#: src/sound.c:79
 msgid "Someone says your name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
+#~ msgid ""
+#~ "%s has requested a DCC chat.  Would you like to establish the direct "
+#~ "connection?"
+#~ msgstr "%s 要求和您用 DCC 來聊天。您想接受他的邀請嗎?"
+
+#~ msgid "You missed %d messages from %s because they are too evil."
+#~ msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這些訊息可能不懷好意。"
+
+#, fuzzy
+#~ msgid "ICQ Authorization Granted"
+#~ msgstr "Gaim - ICQ 許可認證"
+
+#~ 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 位址,同時存"
+#~ "在著系統安全上的顧慮。您確定要繼續嗎?"
+
+#~ msgid "Web Site"
+#~ msgstr "網址"
+
+#~ msgid "Password: "
+#~ msgstr "密  碼:"
+
+#~ msgid "About"
+#~ msgstr "關    於"
+
+#~ msgid "Perl"
+#~ msgstr "Perl 插件"
+
+#~ msgid "Load Script"
+#~ msgstr "讀取命令稿"
+
+#~ msgid "Unload All Scripts"
+#~ msgstr "清除所有讀入的命令稿"
+
+#~ msgid "List Scripts"
+#~ msgstr "列出命令稿"
+
+#~ msgid "Whisper"
+#~ msgstr "悄悄話"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - 儲存聊天內容"
+
+#~ msgid "Currently at %d, "
+#~ msgstr "目前在 %d,"
+
+#~ msgid "Bold Text"
+#~ msgstr "粗體文字"
+
+#~ msgid "Bold"
+#~ msgstr "粗體"
+
+#~ msgid "Italics Text"
+#~ msgstr "斜體文字"
+
+#~ msgid "Italics"
+#~ msgstr "斜體"
+
+#~ msgid "Underline Text"
+#~ msgstr "底線文字"
+
+#~ msgid "Underline"
+#~ msgstr "底線"
+
+#~ msgid "Strike through Text"
+#~ msgstr "刪除的文字"
+
+#~ msgid "Strike"
+#~ msgstr "刪除"
+
+#~ msgid "Decrease font size"
+#~ msgstr "縮小字體"
+
+#~ msgid "Small"
+#~ msgstr "小"
+
+#~ msgid "Normal font size"
+#~ msgstr "正常字體大小"
+
+#~ msgid "Normal"
+#~ msgstr "正常"
+
+#~ msgid "Increase font size"
+#~ msgstr "增大字體"
+
+#~ msgid "Big"
+#~ msgstr "大"
+
+#~ msgid "Font"
+#~ msgstr "字型"
+
+#~ msgid "Text Color"
+#~ msgstr "文字顏色"
+
+#~ msgid "Background Color"
+#~ msgstr "背景顏色"
+
+#~ msgid "Link"
+#~ msgstr "連結"
+
+#~ msgid "Insert smiley face"
+#~ msgstr "加入一個笑臉"
+
+#~ msgid "Smiley"
+#~ msgstr "微笑"
+
+#~ msgid "Image"
+#~ msgstr "影像"
+
+#~ msgid "Sound"
+#~ msgstr "音效"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - 警告使用者?"
+
+#~ msgid "Do you really want to warn %s?"
+#~ msgstr "你真的想警告 %s?"
+
+#~ msgid "Gaim - Remove %s?"
+#~ msgstr "Gaim - 移除 %s?"
+
+#~ msgid "Remove Buddy"
+#~ msgstr "移除好友"
+
+#~ msgid ""
+#~ "You are about to remove '%s' from\n"
+#~ "your buddy list. Do you want to continue?"
+#~ msgstr ""
+#~ "您正試著將 '%s'  從您的好友清單\n"
+#~ "中移除。您要繼續這個動作嗎?"
+
+#~ msgid "Gaim - IM user"
+#~ msgstr "Gaim - 即時訊息使用者"
+
+#~ msgid "IM who:"
+#~ msgstr "將即時訊息送給:"
+
+#~ msgid "User:"
+#~ msgstr "使用者:"
+
+#~ msgid "Gaim - Get User Info"
+#~ msgstr "Gaim - 取得使用者資訊"
+
+#~ msgid "Add Group"
+#~ msgstr "加入群組"
+
+#~ msgid "Add Buddy"
+#~ msgstr "新增好友"
+
+#~ msgid "Contact"
+#~ msgstr "連絡"
+
+#~ msgid "Allow List"
+#~ msgstr "允許清單"
+
+#~ msgid "Block List"
+#~ msgstr "拒絕清單"
+
+#~ msgid "Alias Buddy"
+#~ msgstr "為好友加上別名"
+
+#~ msgid "Rename Group"
+#~ msgstr "修改群組名稱"
+
+#, fuzzy
+#~ msgid "Gaim was unable to load your plugin."
+#~ msgstr "Gaim 無法送出訊息"
+
+#~ msgid "Select All"
+#~ msgstr "全部選取"
+
+#~ msgid "Select Autos"
+#~ msgstr "選取自動登入"
+
+#~ msgid "Select None"
+#~ msgstr "取消選取"
+
+#~ msgid "Sign On/Off"
+#~ msgstr "登入/登出"
+
+#~ msgid "Gaim - Plugin List"
+#~ msgstr "Gaim - 插件列表"
+
+#~ msgid "Gaim - Plugins"
+#~ msgstr "Gaim - 插件"
+
+#~ msgid "Loaded Plugins"
+#~ msgstr "已載入的插件"
+
+#, fuzzy
+#~ msgid "Selected Plugin"
+#~ msgstr "全部選取"
+
+#~ msgid "Filepath:"
+#~ msgstr "檔案路徑:"
+
+#~ msgid "Load"
+#~ msgstr "讀取"
+
+#~ msgid "Load a plugin from a file"
+#~ msgstr "由檔案讀取一個插件"
+
+#~ msgid "Configure"
+#~ msgstr "設定"
+
+#~ msgid "Configure settings of the selected plugin"
+#~ msgstr "設定被選取的插件"
+
+#~ msgid "Reload"
+#~ msgstr "重新讀取"
+
+#~ msgid "Reload the selected plugin"
+#~ msgstr "重新讀取被選取的插件"
+
+#~ msgid "Unload"
+#~ msgstr "移除"
+
+#~ msgid "Unload the selected plugin"
+#~ msgstr "移除被選取的插件"
+
+#~ msgid "Close this window"
+#~ msgstr "關閉這個視窗"
+
+#, fuzzy
+#~ msgid "Use _borderless buttons"
+#~ msgstr "使用沒有邊框的按鈕"
+
+#, fuzzy
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "忽略 Tik 自動訊息"
+
+#, fuzzy
+#~ msgid "_Raise Window on Events"
+#~ msgstr "當事件發生時,將視窗提到最上方"
+
+#~ msgid "Gaim debug output window"
+#~ msgstr "Gaim 除錯視窗"
+
+#~ msgid "Accept?"
+#~ msgstr "接受?"
+
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Gadu-Gadu 錯誤"
 
@@ -3700,15 +4615,6 @@
 #~ msgid "Changing Password failed (%s)"
 #~ msgstr "修改密碼失敗(%s)"
 
-#~ msgid "No such nick/channel"
-#~ msgstr "沒有那個暱稱或頻道"
-
-#~ msgid "IRC Error"
-#~ msgstr "IRC 錯誤"
-
-#~ msgid "No such server"
-#~ msgstr "沒有那部伺服器"
-
 #~ msgid "Password Change Error!"
 #~ msgstr "密碼修改錯誤!"
 
@@ -3721,9 +4627,6 @@
 #~ msgid "MSN Error"
 #~ msgstr "MSN 錯誤"
 
-#~ msgid "Invalid name"
-#~ msgstr "無效的名稱"
-
 #~ msgid "Chat Error!"
 #~ msgstr "聊天錯誤!"
 
@@ -3739,9 +4642,6 @@
 #~ msgid "Reason unknown"
 #~ msgstr "原因不明"
 
-#~ msgid "AOL error"
-#~ msgstr "AOL 錯誤"
-
 #~ msgid "Error"
 #~ msgstr "錯誤"
 
@@ -3839,15 +4739,6 @@
 #~ msgid "Report Idle Times"
 #~ msgstr "報告閒置時間"
 
-#~ msgid "None"
-#~ msgstr "無"
-
-#~ msgid "Gaim Use"
-#~ msgstr "Gaim 使用"
-
-#~ msgid "X Use"
-#~ msgstr "X 使用"
-
 #~ msgid "Konqueror"
 #~ msgstr "Konqueror"
 
@@ -3876,9 +4767,6 @@
 #~ "並不是所有的通訊協定都可以使用這些代理伺服器的選項。\n"
 #~ "請參考 README 來獲得更進一步的資訊。"
 
-#~ msgid "No Proxy"
-#~ msgstr "沒有代理伺服器"
-
 #~ msgid "SOCKS 4"
 #~ msgstr "SOCKS 4"
 
@@ -3891,12 +4779,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "好友名單選項"
 
-#~ msgid "Tab Placement:"
-#~ msgstr "Tab 位置:"
-
-#~ msgid "Top"
-#~ msgstr "視窗上方"
-
 #~ msgid "Conversation Options"
 #~ msgstr "交談選項"
 
@@ -3912,42 +4794,18 @@
 #~ msgid "IM Options"
 #~ msgstr "即時訊息選項"
 
-#~ msgid "Show buttons as: "
-#~ msgstr "顯示按鍵為:"
-
-#~ msgid "Pictures And Text"
-#~ msgstr "圖形與文字"
-
-#~ msgid "Pictures"
-#~ msgstr "圖形"
-
-#~ msgid "Text"
-#~ msgstr "文字"
-
-#~ msgid "Show all conversations in one tabbed window"
-#~ msgstr "將所有的交談顯示在同一個有標籤的視窗中"
-
 #~ msgid "Window Sizes"
 #~ msgstr "視窗大小"
 
 #~ msgid "Tab Placement"
 #~ msgstr "Tab 位置"
 
-#~ msgid "Left"
-#~ msgstr "視窗左側"
-
-#~ msgid "Right"
-#~ msgstr "視窗右側"
-
 #~ msgid "Chat Options"
 #~ msgstr "聊天選項"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "將所有的交談顯示在同一個有標籤的視窗中"
 
-#~ msgid "Font Options"
-#~ msgstr "字型選項"
-
 #~ msgid "Italic Text"
 #~ msgstr "斜体文字"
 
--- a/src/conversation.c	Sun Jan 05 12:09:34 2003 +0000
+++ b/src/conversation.c	Sun Jan 05 23:21:50 2003 +0000
@@ -2723,7 +2723,7 @@
 			convo_menubar = menubar;
 
 			gtk_container_add(GTK_CONTAINER(win), testidea);
-			g_signal_connect(GTK_OBJECT(convo_notebook), "switch-page",
+			g_signal_connect_after(GTK_OBJECT(convo_notebook), "switch-page",
 					   G_CALLBACK(convo_switch), NULL);
 		} else
 			win = c->window = all_convos;
@@ -2745,7 +2745,9 @@
 		gtk_box_pack_start(GTK_BOX(tabby), c->close, FALSE, FALSE, 0);
 		gtk_widget_show_all(tabby);
 		gtk_notebook_insert_page(GTK_NOTEBOOK(convo_notebook), cont, tabby,
-					 g_list_index(conversations, c));
+				g_list_index(conversations, c));
+		gtk_notebook_set_menu_label_text(GTK_NOTEBOOK(convo_notebook), cont,
+				c->name);
 
 		gtk_widget_show(cont);
 	} else {
@@ -2953,7 +2955,6 @@
 	update_buttons_by_protocol(c);
 
 	gtk_widget_show(win);
-
 	if (!(im_options & OPT_IM_ONE_WINDOW)
 			|| ((gtk_notebook_get_current_page(GTK_NOTEBOOK(convo_notebook)) == 0)
 				&& (c == g_list_nth_data(conversations, 0))))