changeset 3450:5dfdf622bdf7

[gaim-migrate @ 3495] I'm tired. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Tue, 27 Aug 2002 02:43:54 +0000
parents 8c6950b6eb82
children 02738ff4c219
files 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/ru.po po/sk.po po/sv.po po/zh_CN.po po/zh_TW.po
diffstat 18 files changed, 23006 insertions(+), 16097 deletions(-) [+]
line wrap: on
line diff
--- a/po/bg.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/bg.po	Tue Aug 27 02:43:54 2002 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.60\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-04-16 04:54+0200\n"
 "Last-Translator: Hristo Todorov <igel@bofh.bg>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -26,9 +26,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr ""
 
@@ -41,16 +41,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr ""
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr ""
 
@@ -74,6 +75,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -92,7 +94,7 @@
 msgid "Change"
 msgstr ":"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 #, fuzzy
 msgid "Available"
 msgstr ""
@@ -101,8 +103,8 @@
 msgid "Available for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr ""
 
@@ -119,7 +121,7 @@
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr ""
 
@@ -151,7 +153,7 @@
 msgid "Unknown Error Code."
 msgstr "   ."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -221,16 +223,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "      Gadu-Gadu UIN!"
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Gaim-Gadu "
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "      "
@@ -276,104 +268,151 @@
 msgid "Sex"
 msgstr ""
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr ""
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "    . !"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "      "
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr " Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "      "
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "      "
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "     "
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "    HTTP "
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "      (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "      (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "      (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "      (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "    (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "      "
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "     "
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "     socket"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "    "
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "     %s"
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "    "
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr ""
@@ -389,20 +428,16 @@
 msgstr "<B>%s   : %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "  /"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "  IRC"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "  "
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "   "
 
 #: src/protocols/irc/irc.c:976
@@ -417,8 +452,8 @@
 msgstr "   "
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "   %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -431,10 +466,6 @@
 msgid "You have left %s"
 msgstr " %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "?IRC ?"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr ":"
@@ -448,252 +479,274 @@
 msgstr "DCC "
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim -   "
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "     socket"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "     socket"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Jabber "
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "   ."
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr " %d      "
 
-#: src/protocols/jabber/jabber.c:1655
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-msgid "Jabber Error"
-msgstr "Jabber "
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim -   "
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-#, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr " "
-
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
+msgid "Jabber Error"
+msgstr "Jabber "
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "??:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "    "
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr " away "
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "??"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "-"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "  -  .    "
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim -   Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "   !"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr " "
 
@@ -861,116 +914,132 @@
 msgid "Unknown Error Code"
 msgstr "   ."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "  MSN"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim     "
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, 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:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr " .     ."
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "    socket."
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "     socket"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr ":"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "      ."
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
-#, fuzzy
-msgid "Busy"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1926
+#, fuzzy
+msgid "Busy"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr ":"
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr " "
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "  :"
@@ -1003,83 +1072,101 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "      %s."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "  -!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "-   "
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - "
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "    "
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr " ,   \n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "   \n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "    AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr ": %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr ".\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "    "
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr " ,   cookie"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "   ."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "    ."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr "   .  10    .   ,      ."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "     .  ."
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim     "
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "Gaim     "
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1089,119 +1176,107 @@
 " %d       :\n"
 "\n"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "   ."
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim -   "
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, fuzzy, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr " %d      "
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim -   "
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr " %d   %s,   ."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr " %d    %s,   ."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr " %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr " %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr " %d   %s,      ."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr " %d   %s,      ."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr " %d   %s,     ."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr " %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr " %d   %s,     ."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr " %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr " %d   %s   ."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr " %d   %s   ."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - "
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC  : %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim -   Oscar SNAC"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "  %s   : %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr " "
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "   ."
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "   %s : %s"
@@ -1306,48 +1381,85 @@
 msgstr "<i>  </i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "    ."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL "
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr "         .   10 ."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr "Gaim -   "
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr "Gaim -   "
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "     %s"
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim     "
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "   ?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "     "
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1355,30 +1467,30 @@
 "continue?"
 msgstr "      %s.       IP- .     .    ."
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr " away "
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr " "
 
@@ -1508,45 +1620,39 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC    .    . "
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "TOC "
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr " "
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "   "
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim -   "
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr "TOC   PAUSE.   , TOC            . Gaim       .   ,    "
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC "
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "    "
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "      !"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "      !"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "    header-  !"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1568,22 +1674,23 @@
 msgstr "%s     "
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "   ."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr ":"
 
@@ -1610,7 +1717,7 @@
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 
 #: src/about.c:147
@@ -1650,6 +1757,9 @@
 "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 " "
@@ -1659,13 +1769,10 @@
 msgstr ""
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "   "
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "  "
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - "
@@ -1706,40 +1813,11 @@
 msgid "Preferences"
 msgstr ""
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr " "
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "  ..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr ".      login box."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr ": %d ."
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "   "
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "    Gaim !"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr ""
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - !"
@@ -1752,6 +1830,10 @@
 msgid "Back"
 msgstr ""
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "   "
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "   "
@@ -1760,7 +1842,7 @@
 msgid "Set All Away"
 msgstr " -> "
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr ""
 
@@ -1770,12 +1852,13 @@
 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:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr ""
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr ""
 
@@ -1795,10 +1878,6 @@
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr ""
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr " "
@@ -1855,7 +1934,7 @@
 msgid "Information on selected Buddy"
 msgstr ""
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr " "
 
@@ -1883,7 +1962,7 @@
 msgid "New Instant Message"
 msgstr " "
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr ""
 
@@ -1895,6 +1974,10 @@
 msgid "Tools"
 msgstr ""
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr ""
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "  "
@@ -1941,7 +2024,7 @@
 msgid "About Gaim"
 msgstr " Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr ""
 
@@ -1974,12 +2057,12 @@
 msgstr "   :"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr ""
 
@@ -1992,7 +2075,7 @@
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr ""
 
@@ -2008,10 +2091,11 @@
 msgid "Un-Ignore"
 msgstr "-"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr ""
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, c-format
@@ -2055,15 +2139,15 @@
 msgstr ""
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr ""
@@ -2077,16 +2161,14 @@
 msgstr "Gaim -   "
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "    :  "
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "  "
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "    :  "
+#, fuzzy
+msgid "Unable to send message"
+msgstr "    :  "
 
 #: src/conversation.c:1559
 #, c-format
@@ -2098,156 +2180,156 @@
 msgid "Setting position to %d\n"
 msgstr "  %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr ""
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr ""
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr ""
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr ""
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr ""
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "  "
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "  "
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "   "
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "  "
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr ""
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "  "
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr ""
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "  "
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr " "
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "  "
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "  "
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "  "
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "  "
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "  e"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "  "
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr " :"
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim -   "
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "  "
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "  "
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "  "
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "   ..."
 
@@ -2291,385 +2373,406 @@
 "  '%s'  .\n"
 "  ?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr ""
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr " :"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr ":"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr ""
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr ""
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr " "
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr " "
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr ""
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr " "
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - !"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr " :"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "o "
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "    "
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr " "
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr " "
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "  -"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr " "
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "   "
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "  "
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr " "
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr ""
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr " "
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "  "
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "    "
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "    "
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "    "
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "   "
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "  "
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "  "
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr ""
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "    "
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "    "
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "  "
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "P        ."
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr ""
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr " "
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr " "
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr " "
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr ""
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "  "
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim -     "
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "  "
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr " "
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim -   "
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr " "
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr " "
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "  ()"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "  "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr ""
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr ""
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim -   Email"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr " "
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr " :"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "      "
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "     "
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim -    "
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "   "
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "  "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "  "
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr ""
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "    "
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim -    "
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "      %s - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "  -?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "       %s."
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "  -?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr ""
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr ""
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr " :"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr ""
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim -   Perl "
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "       %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "  "
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2679,10 +2782,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003:     .\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr "  "
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim     "
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2696,7 +2799,7 @@
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr ""
 
@@ -2738,56 +2841,61 @@
 msgstr ""
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "  "
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "  "
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
 msgstr "      .    ,      "
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "      %s?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim -   "
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr ""
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "  "
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "o"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "/"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2796,28 +2904,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s    "
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "  "
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s "
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "  "
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perl "
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim -  "
@@ -2826,10 +2934,12 @@
 msgid "Gaim - Plugins"
 msgstr "Gaim - "
 
+#. Left side: frame with list of plugin file names
 #: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr " "
 
+#. Right side: frame with description and the filepath of plugin
 #: src/plugins.c:265
 #, fuzzy
 msgid "Selected Plugin"
@@ -2875,428 +2985,596 @@
 msgid "Close this window"
 msgstr "  "
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr ""
+
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:282
 #, fuzzy
-msgid "Windows"
-msgstr "  "
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr " Debug "
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "  "
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr ""
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "  "
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr ""
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr ""
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr ""
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "  "
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr ""
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "  "
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "  "
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr ""
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "  "
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr " "
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr " - "
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "  "
+msgid "Show graphical _smileys"
+msgstr " "
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "   "
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr " URL  "
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "  "
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr " "
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr " "
+msgid "Ignore font _faces"
+msgstr " "
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "   "
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr " TiK  "
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Enter  "
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Ctrl-Enter  "
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "  "
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Esc  "
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Esc  "
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Ctrl-{B/I/U/S}  HTML "
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Ctrl-()  "
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr ""
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr " // "
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr " "
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "   "
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr " / "
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr " URL  "
+msgid "Buddy List Window"
+msgstr "  "
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "  "
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr " /  "
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "   "
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr ""
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "    "
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "   "
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr " - "
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "  "
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "   "
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr " "
+#, fuzzy
+msgid "Show idle _times"
+msgstr "   "
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr " "
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "   "
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr " TiK  "
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Enter  "
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Ctrl-Enter  "
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "  "
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "  "
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "  "
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "  "
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "    "
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "   "
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "    "
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr ""
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Esc  "
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "  "
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Esc  "
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Ctrl-{B/I/U/S}  HTML "
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Ctrl-()  "
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr " // "
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr " / "
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "     "
+msgid "Disable Buddy Icon A_nimation"
+msgstr "   "
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "   "
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "  "
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "   "
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr " "
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Tab -  "
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "    "
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "   "
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr " /  "
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "   "
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "    "
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "   "
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "  "
+msgid "_Show people joining/leaving in window"
+msgstr " /    "
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "   "
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "-     "
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "   "
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "  "
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "  "
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "  "
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "    "
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "   "
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "    "
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "  "
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "   "
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "   "
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "   "
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Tab -  "
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "    "
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr " /    "
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "   /"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr ""
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "-     "
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "-     "
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "   /"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "-     "
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "-     "
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr ""
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr " Proxy"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Proxy "
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr ""
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr ""
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr ""
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr ""
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr ""
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "    "
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr ""
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "  "
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr " HTML  "
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr " "
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "   /"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "   /"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "    /"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "  //"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "       "
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr ""
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "    "
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "  "
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr " "
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 " \n"
 "(%s  )"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "  "
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "    "
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "    "
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "  -"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "  -"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "-   "
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr ":"
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr ""
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim -  - "
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr ""
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr ""
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr ""
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr ":"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr ""
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "  "
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "   "
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr ""
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "  "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "  "
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim 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 "
@@ -3304,11 +3582,11 @@
 "say, it was not successfully loaded."
 msgstr "            .  !"
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr " "
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3316,42 +3594,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "  "
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s  %s   . %s  ."
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr ""
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "?Gaim - ?"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim -  "
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "? ?"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, 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:588
+#: src/prpl.c:590
 msgid ""
 "\n"
 "\n"
@@ -3361,21 +3630,21 @@
 "\n"
 "      ?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "         ."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - "
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "??"
 
@@ -3392,10 +3661,6 @@
 msgid "(1 message)"
 msgstr "(1 )"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr ""
-
 #: src/server.c:901
 msgid "Yes"
 msgstr ""
@@ -3452,12 +3717,171 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gaim-Gadu "
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr " Gadu-Gadu"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "    HTTP "
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "      (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "      (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "      (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "      (%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "    (%s)"
+
+#~ msgid "No such nick/channel"
+#~ msgstr "  /"
+
+#~ msgid "IRC Error"
+#~ msgstr "  IRC"
+
+#~ msgid "No such server"
+#~ msgstr "  "
+
+#~ msgid "IRC Part"
+#~ msgstr "?IRC ?"
+
+#, fuzzy
+#~ msgid "Password Change Error!"
+#~ msgstr "Gaim -   "
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim -   "
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr " "
+
+#~ msgid "MSN Error"
+#~ msgstr "  MSN"
+
+#~ msgid "Invalid name"
+#~ msgstr " "
+
+#~ msgid "Chat Error!"
+#~ msgstr "  -!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - "
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - "
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim -   Oscar SNAC"
+
+#~ msgid "Reason unknown"
+#~ msgstr " "
+
+#~ msgid "AOL error"
+#~ msgstr "AOL "
+
+#~ msgid "Error"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "   ?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC "
+
+#~ msgid "Chat Error"
+#~ msgstr " "
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC "
+
+#~ msgid "Could not write file header!"
+#~ msgstr "    header-  !"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "  ..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr ".      login box."
+
+#~ msgid "Away: %d pending."
+#~ msgstr ": %d ."
+
+#~ msgid "Away."
+#~ msgstr "."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "    Gaim !"
+
+#~ msgid "About..."
+#~ msgstr ""
+
+#~ msgid "Message Error"
+#~ msgstr "  "
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "    :  "
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "  "
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim -     "
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "      %s - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "  "
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr "  "
+
+#~ msgid "Login Error"
+#~ msgstr "  "
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl "
+
+#~ msgid "Select"
+#~ msgstr ""
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "     "
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "   "
+
+#~ msgid "Edit"
+#~ msgstr ""
+
+#~ msgid "Protocol Error"
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "  "
+
+#~ msgid "Disconnect"
+#~ msgstr ""
+
+#~ msgid "Warned"
+#~ msgstr ""
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "  Ticker"
 
-#~ msgid "General Options"
-#~ msgstr ""
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "   ,      ."
 
@@ -3488,9 +3912,6 @@
 #~ msgid "Galeon"
 #~ msgstr ""
 
-#~ msgid "Proxy Options"
-#~ msgstr ""
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3498,9 +3919,6 @@
 #~ "      !\n"
 #~ " README   ."
 
-#~ msgid "Proxy Type"
-#~ msgstr " Proxy"
-
 #~ msgid "No Proxy"
 #~ msgstr " "
 
@@ -3516,24 +3934,12 @@
 #~ msgid "Buddy List Options"
 #~ msgstr " "
 
-#~ msgid "Buddy List Window"
-#~ msgstr "  "
-
 #~ msgid "Tab Placement:"
 #~ msgstr "  :"
 
 #~ msgid "Top"
 #~ msgstr ""
 
-#~ msgid "Bottom"
-#~ msgstr ""
-
-#~ msgid "Group Displays"
-#~ msgstr ""
-
-#~ msgid "Buddy Displays"
-#~ msgstr " - "
-
 #~ msgid "Conversation Options"
 #~ msgstr ""
 
@@ -3576,18 +3982,12 @@
 #~ msgid "Right"
 #~ msgstr ""
 
-#~ msgid "Buddy Icons"
-#~ msgstr ""
-
 #~ msgid "Chat Options"
 #~ msgstr ""
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "     "
 
-#~ msgid "Tab Completion"
-#~ msgstr " "
-
 #~ msgid "Font Options"
 #~ msgstr ""
 
@@ -3600,12 +4000,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "    "
 
-#~ msgid "Sound Options"
-#~ msgstr ""
-
-#~ msgid "Sound method"
-#~ msgstr " "
-
 #~ msgid "Sound played when:"
 #~ msgstr " :"
 
@@ -3618,9 +4012,6 @@
 #~ msgid "minutes using"
 #~ msgstr " "
 
-#~ msgid "Messages"
-#~ msgstr ""
-
 #~ msgid "Make Away"
 #~ msgstr " "
 
--- a/po/cs.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/cs.po	Tue Aug 27 02:43:54 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-05-05 17:15GMT+1\n"
 "Last-Translator: Honza Krl <hkral@centrum.cz>\n"
 "Language-Team: esk jazyk <cs@li.org>\n"
@@ -25,9 +25,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Zavt"
 
@@ -40,16 +40,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Pidat"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Zruit"
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -91,7 +93,7 @@
 msgid "Change"
 msgstr "Kanl:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Ptomen"
 
@@ -99,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "Ptomen jen pro ptele"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Pry"
 
@@ -116,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "Neviditeln jen pro ptele"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Nedostupn"
 
@@ -148,7 +150,7 @@
 msgid "Unknown Error Code."
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
@@ -222,16 +224,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Pokoute se poslat zprvu na nesprvn Gadu-Gadu UIN."
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: 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 "Chyba Gadu-Gadu"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Nemu zskat vsledky vyhledvn"
@@ -277,107 +269,154 @@
 msgid "Sex"
 msgstr "Pohlav"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Msto"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Na serveru nen uloen dn Buddy List."
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "Nemohl jsem importovat Buddy List ze serveru."
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy List byl spn nataen na server."
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Gadu-Gadu infomace"
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Nemohl jsem nathnout Buddy List na server"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "Buddy List byl spn smazn ze serveru"
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Nemohl jsem smazat Buddy List ze serveru"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "Heslo bylo spn zmnno"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "Heslo nemohlo bt zmnno"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "Nemohl jsem poslat HTTP dost"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "Chyba pi importu Buddy Listu ze serveru (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "Chyba pi exportu Buddy Listu na server (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Smazn Buddy Listu ze serveru bylo nespn (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Pipojen na vyhledvac slubu selhalo (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Zmna hesla selhala (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Nemohl jsem importovat Buddy List ze serveru."
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Nemu otevt Pme IM spojen"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Nemu st ze socketu"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Prohledvn seznamu"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Zmnit heslo"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 #, fuzzy
 msgid "Import Buddies List from Server"
 msgstr "Importuj Buddy List"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 #, fuzzy
 msgid "Export Buddies List to Server"
 msgstr "Importuj Buddy List"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Sma Buddy List ze serveru"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Nemu st ze souboru %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 #, 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:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Zskej Info"
@@ -393,20 +432,16 @@
 msgstr "<B>%s zmnil tma na: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "dn prezdvka/kanl"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "Chyba IRC"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "dn server"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Nenapseli jste prezdvku"
 
 #: src/protocols/irc/irc.c:976
@@ -421,8 +456,8 @@
 msgstr "Nemu zapisovat"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Byl jste vykopnut z %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -435,10 +470,6 @@
 msgid "You have left %s"
 msgstr "Opustil jste %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "st IRC"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Kanl:"
@@ -453,46 +484,60 @@
 msgstr "Chat"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
+#, fuzzy
+msgid "Unable to change password."
+msgstr "Nemu st ze socketu"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
-#, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - Zmna hesla"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Nemu st ze socketu"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr "Neznm"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Pipojen"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "Neruit"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Chyba Jabberu"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -500,192 +545,199 @@
 "\n"
 "Pejete si pidat jeho nebo ji do Vaeho Buddy Listu?"
 
-#: src/protocols/jabber/jabber.c:1655
-#, fuzzy
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "dn uivatel"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-msgid "Jabber Error"
-msgstr "Chyba Jabberu"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Kontakty"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autentifikace"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "Neznm chyba pi pihlaovn"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Heslo bylo spn zmnno"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - Zmna hesla"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "Spojen ztraceno"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "Nemu se pipojit"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "Pipojen"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "dm autentifikan metodu"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 #, fuzzy
 msgid "Connecting"
 msgstr "Spojuji"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-#, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "Nesprvne jmno"
-
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
+msgid "Jabber Error"
+msgstr "Chyba Jabberu"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Mstnost:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Nemu se pipojit"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Zobrazit LOG"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Zobrazit notifikaci"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "Cel jmno"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "Jmno"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "Pjmen"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "Pezdvka"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Ulice"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 #, fuzzy
 msgid "Locality"
 msgstr "Lokalita"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "PS"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Stt"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 #, fuzzy
 msgid "Telephone"
 msgstr "telefon"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Nzev organizace"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Nzev"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "Datum narozen"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Popis"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 #, fuzzy
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
@@ -694,23 +746,23 @@
 "Vechny nsledujc daje jsou voliteln. Zadejte pouze ty informace kter "
 "chcete."
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Upravit Jaaber vizitku"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 #, fuzzy
 msgid "Set User Info"
 msgstr "Zskat informace o uivateli"
@@ -878,117 +930,132 @@
 msgid "Unknown Error Code"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "Chyba MSN"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
 #, fuzzy
-msgid "Gaim was unable to send a message"
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim nemohl odeslat zprvu"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, 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:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 #, 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:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Chyba pri ten ze socketu."
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Nemu st ze socketu"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "Heslo: "
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Nemu se pripojit na server."
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 msgid "Synching with server"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
-msgid "Away From Computer"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1923
-msgid "Be Right Back"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1924
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1926
 #, fuzzy
 msgid "Busy"
 msgstr "Kamard"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "Skryj ikonu"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Pjmen"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "ID: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "Nesprvne jmno"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Ke kter skupin pripojit:"
@@ -1021,62 +1088,57 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Byl jste odpojen z chatov mstnosti %s."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Chyba Chatu!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chat je momentln nedostupn"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Chat"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "Nemu se spojit s hostitelem"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Poslno heslo, ekm na odpov\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "vnitn chyba spojen\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Nemu se pihlsit do AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Prihlsit: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Odhlen.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Nemu se pipojit"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 #, fuzzy
 msgid "Connection established, cookie sent"
 msgstr "Spojen vytvoeno, cookie poslno"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Nesprvne heslo alebo pezdvka."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 #, fuzzy
 msgid "Your account is currently suspended."
 msgstr "V et je momentln suspendovm"
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1085,25 +1147,48 @@
 "toznova. Jestli budete pokraovat v pipojovn, budete muset ekat jet "
 "dle."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 "Verze klienta kterou pouvate je pli star. Nainstalujte si novou na"
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Autentifikace peruena"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Vnitn chyba"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim 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
+#, 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
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Pam IM spojen s %s vytvoeno"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1111,122 +1196,108 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "dn dvod."
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ Autorizace odepena"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-#, fuzzy
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim - ICQ autorizace pijata"
-
-#: src/protocols/oscar/oscar.c:1585
+#: 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:1586
+#: 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:1595
+#: src/protocols/oscar/oscar.c:1597
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Ztratil jste %d zprvu z %s protoe byla pli velk."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Ztratil jste %d zprv z %s protoe byly pli velk."
 
-#: src/protocols/oscar/oscar.c:1605
+#: 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:1606
+#: src/protocols/oscar/oscar.c:1608
 #, 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:1615
+#: src/protocols/oscar/oscar.c:1617
 #, 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:1616
+#: src/protocols/oscar/oscar.c:1618
 #, 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:1625
+#: src/protocols/oscar/oscar.c:1627
 #, fuzzy, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Ztratil jste %d zprvu z %s pretoe jste velmi zl."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Ztratil jste %d zprv z %s protoe jste velmi zl."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, fuzzy, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Ztratil jste %d zprvu z %s z neznmch dvod."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, fuzzy, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Ztratil jste %d zprv z %s z neznmch dvod."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Chyba"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1736
-#, fuzzy
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Oscar SNAC Chyba"
-
-#: src/protocols/oscar/oscar.c:1753
+#: 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:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Dvod neznm"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "dn dvod."
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Informcie o uivateli %s nejsou pstupn: %s"
@@ -1341,51 +1412,87 @@
 msgstr "<i>Neposkytnut dn informace</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Vae spojen me bt peruen."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "Chyba AOL"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
 #, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "Vae posledn zprva nebyla odeslna protoe u mte pes limit. "
 "Pokejteprosm 10 sekund a pokus opakujte."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Chyba"
-
-#: src/protocols/oscar/oscar.c:3207
+#: 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
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Nemu st ze souboru %s."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim nemohl odeslat zprvu"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - Varovat uivatele?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vmna:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Nemu otevt Pme IM spojen"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1395,30 +1502,30 @@
 "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:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Stav: %s"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "Pm IM"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Zskat Monosti"
 
@@ -1552,32 +1659,20 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr ""
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Chyba Chatu"
-
 #: src/protocols/toc/toc.c:782
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Heslo bylo spn zmnn"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Zmna hesla"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
-msgstr ""
-
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
+"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
@@ -1585,13 +1680,18 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "Nemu se spojit pro penos!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "Nemu se spojit pro penos!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "Nemu zapsat hlaviku souboru!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1614,22 +1714,22 @@
 
 #: src/protocols/yahoo/yahoo.c:594
 #, fuzzy
-msgid "Your message did not get sent."
+msgid "Your Yahoo! message did not get sent."
 msgstr "Vaa zprva nebyla odeslna."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Tda:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Instance:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Pjemnce:"
 
@@ -1653,10 +1753,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1683,6 +1784,9 @@
 "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"
@@ -1693,13 +1797,9 @@
 
 #: src/aim.c:162
 #, fuzzy
-msgid "Please enter your logon"
+msgid "Please enter your login."
 msgstr "Prosm zadejte svj logon"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Chyba pi pihlaovn"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - Pihlen"
@@ -1741,41 +1841,11 @@
 msgid "Preferences"
 msgstr "Nastaven"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Aotomatick pihlaovn"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Pokoum se pihlsit...."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Nepipojen. Kliknte pro otveven pihlaovacho okna."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr ""
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Pry."
-
-#: src/applet.c:200 src/away.c:388
-#, fuzzy
-msgid "New Away Message"
-msgstr "Nov 'Pry' zprva"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Nemu vytvoit applet Gaim!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "O..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Pry"
@@ -1788,6 +1858,11 @@
 msgid "Back"
 msgstr "Zpt"
 
+#: src/away.c:388
+#, fuzzy
+msgid "New Away Message"
+msgstr "Nov 'Pry' zprva"
+
 #: src/away.c:408
 #, fuzzy
 msgid "Remove Away Message"
@@ -1797,7 +1872,7 @@
 msgid "Set All Away"
 msgstr "Nastav ve na 'Pry'"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Skupina"
 
@@ -1807,12 +1882,13 @@
 msgstr "IM"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1832,10 +1908,6 @@
 msgid "Un-Alias"
 msgstr "Zruit alias"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr ""
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr ""
@@ -1892,7 +1964,7 @@
 msgid "Information on selected Buddy"
 msgstr "Informace o vybranm kamardovi"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 #, fuzzy
 msgid "Send Instant Message"
 msgstr "Poslat zprvu"
@@ -1923,7 +1995,7 @@
 msgid "New Instant Message"
 msgstr "Nov zprva"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Zskat informace o uivateli"
 
@@ -1935,6 +2007,10 @@
 msgid "Tools"
 msgstr "Nstroje"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr ""
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Akce protokolu"
@@ -1981,7 +2057,7 @@
 msgid "About Gaim"
 msgstr "O aplikaci Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Buddy List"
 
@@ -2014,12 +2090,12 @@
 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:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Zruit"
 
@@ -2032,7 +2108,7 @@
 msgid "Invite"
 msgstr "Pozvat"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Kamard"
 
@@ -2049,10 +2125,11 @@
 msgid "Un-Ignore"
 msgstr "Od-ignorovat"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "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
 #, c-format
@@ -2096,15 +2173,15 @@
 msgstr "eptat"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Poslat"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Blokovat"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Varovat"
@@ -2121,18 +2198,13 @@
 
 #: src/conversation.c:1336
 #, fuzzy
-msgid "Unable to send message: too large"
+msgid "Unable to send message.  The message is too large"
 msgstr "Nemu poslat zprvu: moc velk"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-#, fuzzy
-msgid "Message Error"
-msgstr "Chyba zprvy"
-
 #: src/conversation.c:1340
 #, fuzzy
-msgid "Unable to send message: Unknown reason"
-msgstr "Nemu poslat sprvu: Neznmy dvod"
+msgid "Unable to send message"
+msgstr "Nemu poslat zprvu: moc velk"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2144,161 +2216,161 @@
 msgid "Setting position to %d\n"
 msgstr "Nastavuji pozici na %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Tun text"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Tun"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Kurzva"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Kurzva"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Podtren text"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Podtren"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Pekrtnut text"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Pekrtnut"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Zmenit velikost psma"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Mal"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Normlna vekost psma"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normln"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Zvtit velikost psma"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Velk"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Vybrat psmo"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Psmo"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Barva textu"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Barva"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Barva pozad"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Vloit odkaz"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Odkaz"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Vloit smajlk"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Smajlk"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Vloit IM obrzek"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Povolit logovn"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Logovn"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 #, fuzzy
 msgid "Save Conversation"
 msgstr "Uloit konverzaci"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Uloit"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konverzace"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 #, fuzzy
 msgid "Send message as: "
 msgstr "Poslat zprvu jako: "
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Uloit ikonu"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 #, fuzzy
 msgid "Disable Animation"
 msgstr "Zakzat animace"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Povolit animace"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Skryj ikonu"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Uloit ikonu jako..."
 
@@ -2343,393 +2415,413 @@
 "Chystte se odstranit '%s' z Vaeho\n"
 "Buddy Listu. Opravdu to chcete udlat?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Akceptovat"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - IM uivatel"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr ""
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Uivatel:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "et"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Zskat informace o uivateli"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Pidat skupinu"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Pidat skupinu"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Pidat kamarda"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Pidat kamarda"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Pidat k"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Pry"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Nastav soukrom pro:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Povo vem uivatelm kontaktovat m"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Povol jen uvedenm uivatelm"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Seznam povolench"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Odmietnout vechny uivatele"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Blokovat uveden uivatele"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Seznam blokovanch"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr ""
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr ""
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "et"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Zvuk kdy se kamard pihls"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "Otevt IM okno"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Zobrazit notifikaci"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 #, fuzzy
 msgid "Send Message"
 msgstr "Poslat zprvu"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr ""
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr ""
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Povolit Internetovm vyhladvam najt informace o Vs"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Jmno"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Prostedn jmno"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Pjmen"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Jmno za svobodna"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Stt"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Nov heslo nesouhlas"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Chyba zmny hesla"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Vyplte vechny polka"
 
-#: src/dialogs.c:2172
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Zmna hesla"
+
+#: src/dialogs.c:2186
 msgid "Original Password"
 msgstr "Star heslo"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Nov heslo"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Nov heslo (znova)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Nastavit informace o uivateli"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Zde jsou vsledky Vaeho hledn: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Povolit"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Zamtnout"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Pidat povolen"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Pidat zkaz"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 #, fuzzy
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Loguj konverzaci"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Njt kamarda"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Najt kamarda podle informac"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Najt kamarda podle emailu"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Pidat URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Vyberte barvu textu"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Vyberte barvu pozad"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importuj Buddy List"
 
-#: src/dialogs.c:3431
-#, fuzzy
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "Nemete vytvoit 'Pry' zprvu s przdnm nzvem"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 #, fuzzy
 msgid "You cannot create an empty away message"
 msgstr "Nemete vytvoit przdnou 'Pry' zprvu"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 #, fuzzy
 msgid "Gaim - New away message"
 msgstr "Gaim - Nov 'Pry' zprva"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 #, fuzzy
 msgid "New away message"
 msgstr "Nov 'Pry' zprva"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Nzev 'Pry': "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Pout"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Uloit a Pout"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "smv"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Alias kamarda"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias kamarda"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "Nemu se spojit s hostitelem"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Uloit LOG"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Nemu vymazat soubor %s - %s"
-
-#: src/dialogs.c:4009
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "Nemu otevt konfiguran soubor %s."
+
+#: src/dialogs.c:4024
 msgid "Really clear log?"
 msgstr "Skuten vymazat LOG?"
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 #, fuzzy
 msgid "Conversation"
 msgstr "Konverzace"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Vymazat"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Pejmenovat skupinu"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Pejmenovat skupinu"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Nov jmno"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Pejmenovat kamarda"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Pejmenovat kamarda"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vyberte si Perlov skript"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nemu otevt konfiguran soubor %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Chyba nastaven"
-
 #: src/html.c:183
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
@@ -2739,10 +2831,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Chyba pi otvrn spojen.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
-#, fuzzy
-msgid "Plugin Error"
-msgstr "Chyba pi Pihlaovn"
+#: 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
 msgid "Gaim - Load Buddy Icon"
@@ -2756,7 +2848,7 @@
 msgid "Browse"
 msgstr "Prochzet"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Zruit"
 
@@ -2798,17 +2890,22 @@
 msgstr "Vlote heslo"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Chyba pi Pihlaovn"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Akce protokolu"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2816,69 +2913,69 @@
 "Nemete se pihlsit na tento et, nemte nahran protokol, nebo protokol "
 "nem funkci pihlen"
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Jste si jisti, e chcete vymazat %s"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor t"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Vybrat ve"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Vybrat automatick"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Vybrat dn"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Zmnit"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Prihlsit/Odhlsit"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nebyl schopn se pihlsit"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Chyba pi pihlaovn"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s byl odhlen"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 #, fuzzy
 msgid "Connection Error"
 msgstr "Chyba spojen"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perlov skripty"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Seznam plugin"
@@ -2887,11 +2984,13 @@
 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"
@@ -2937,440 +3036,597 @@
 msgid "Close this window"
 msgstr "Zavi toto okno"
 
-#: src/prefs.c:266
-#, fuzzy
-msgid "Windows"
-msgstr "IM okno"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+#: src/prefs.c:279
+#, 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"
 msgstr "Zobraz ladc okno"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Pout tlatka bez okraj"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Stt"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Pout tlatka bez okraj"
-
-#: src/prefs.c:311
-#, fuzzy
-msgid "Strikethough"
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Tun"
+
+#: src/prefs.c:303
+#, fuzzy
+msgid "_Italics"
+msgstr "Kurzva"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Podtren"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Pekrtnut text"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Zruit"
 
-#: src/prefs.c:323
-#, fuzzy
-msgid "Use custom face"
+#: src/prefs.c:310
+#, fuzzy
+msgid "Use custo_m face"
+msgstr "Vloit smajlk"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Vloit smajlk"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Vybrat"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
-#, fuzzy
-msgid "Text color"
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
 msgstr "Barva textu"
 
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Barva pozad"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Zobrazen kamard"
+
+#: src/prefs.c:374
+#, fuzzy
+msgid "Show graphical _smileys"
+msgstr "Zobraz grafick smajlky"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Zobraz asovou znaku u zprv"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "Zobraz URL jako odkazy"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Zvrazni nesprvn napsan slovo"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Ignoruj barvy"
+
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Barva pozad"
+msgid "Ignore font _faces"
+msgstr "Ignoruj psmo"
+
+#: src/prefs.c:382
+#, 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
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Enter pole zprvu"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Control-Enter pole zprvu"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "IM okno"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Klvesa Escape zave okno"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Klvesa Control-W zatve okno"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Control-{B/I/U/S} vlo HTML znaky"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Control-(slo) vlo smajlka"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Dole"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Skryj tlatka IM/Informace/Chat"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Zobraz grafick smajlky"
-
-#: src/prefs.c:420
-#, fuzzy
-msgid "Show timestamp on messages"
-msgstr "Zobraz asovou znaku u zprv"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Zobraz obrzky na tlatkch"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Zobraz URL jako odkazy"
+msgid "Buddy List Window"
+msgstr "Okno Buddy Listu"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Zvrazni nesprvn napsan slovo"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Ulo velikost/pozici okna"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Zvtit okno pi udlostech"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Zobrazen skupin"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Skrt skupiny s dnmi online kamardy"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Zobraz sla ve skupinch"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Zobrazen kamard"
+
+#: src/prefs.c:430
+msgid "Show buddy type _icons"
+msgstr ""
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Zobraz rove varovn"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Ignoruj barvy"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Zobraz dobu neinnosti"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Ignoruj psmo"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Ignoruj velikost psma"
-
-#: src/prefs.c:435
-#, fuzzy
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignoruj TiK automatick zprvy"
-
-#: src/prefs.c:455
-#, fuzzy
-msgid "Enter sends message"
-msgstr "Enter pole zprvu"
-
-#: src/prefs.c:456
-#, fuzzy
-msgid "Control-Enter sends message"
-msgstr "Control-Enter pole zprvu"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Neinn kamard ed"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "IM okno"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Vka novho okna:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "ka novho okna:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Vka vstupnho oknka:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Zvtit okno pi udlostech"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Schovat okno pi udlostech"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Kamardova ikona"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Klvesa Escape zave okno"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Skryj ikony kamard"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Klvesa Control-W zatve okno"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} vlo HTML znaky"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(slo) vlo smajlka"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Skryj tlatka IM/Informace/Chat"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Zobraz obrzky na tlatkch"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Automaticky zobraz Buddy List pi pihlen"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "zakzat animace"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Zobrazuj pihlaovac jmna v okn"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Zobrazit notifikaci"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Upozornit kamardy, e jim pete"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "Tab dokon"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Tab-dokon pezdvku"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Tab dokon"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Zobraz Buddy List u appletu"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Ulo velikost/pozici okna"
-
-#: src/prefs.c:513
-#, fuzzy
-msgid "Raise Window on Events"
-msgstr "Zvtit okno pi udlostech"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Skrt skupiny s dnmi online kamardy"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Zobraz sla ve skupinch"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
+#, fuzzy
+msgid "_Show people joining/leaving in window"
+msgstr "Zobraz pichzejc/odchzejc lidi v okne"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
 msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Zobraz rove varovn"
-
-#: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Zobraz dobu neinnosti"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Neinn kamard ed"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Vka novho okna:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "ka novho okna:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Vka vstupnho oknka:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Zvtit okno pi udlostech"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Schovat okno pi udlostech"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Skryj ikony kamard"
-
-#: src/prefs.c:578
-#, fuzzy
-msgid "Disable Buddy Icon Animation"
-msgstr "zakzat animace"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Zobrazuj pihlaovac jmna v okn"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Upozornit kamardy, e jim pete"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Tab-dokon pezdvku"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr ""
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Zobraz pichzejc/odchzejc lidi v okne"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
-msgstr ""
-
-#: src/prefs.c:674
 #, 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:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:534
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
 msgstr "Zobrazuj aliasy v zlokch/nadpisech"
 
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "Chat"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
 msgstr "Zobraz vechny chaty v jednom okn se zlokami"
 
-#: src/prefs.c:700
+#: src/prefs.c:546
+msgid "Combined Tabs"
+msgstr ""
+
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Zobraz vechny chaty v jednom okn se zlokami"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Buddy List"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Typ proxy"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Hostitel"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Uivatel"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Heslo"
 
-#: src/prefs.c:873
-#, fuzzy
-msgid "Open new window by default"
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
+#, fuzzy
+msgid "Browser Options"
+msgstr "Nastaven proxy"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "Standartn otevi nov okno"
 
-#: src/prefs.c:892
-#, fuzzy
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Zprvy"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Logovat vechny rozhovory"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "Vyma HTML z LOG"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Zobrazit systmov LOG"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "Logovat kdy se kamardi pihls/odhls"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Logovat kdy se kamardi stanou neinnmi/innmi"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Logovat kdy kamardi odejdou pry/vrt se"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Logovat vlastn pihlen/neinnosti/odchody pry"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "Samostatn LOG pro kadho pipojenho kamarda"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Monosti zvuku"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "dn zvuky pi pihlen"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Zvuky pi 'Pre'"
 
-#: src/prefs.c:990
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Metody zvuku"
+
+#: src/prefs.c:777
 #, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Pkaz na pehrvn zvukovch soubor\n"
 "(%s pro jmno souboru)"
 
-#: src/prefs.c:1032
-#, fuzzy
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "Posln zprv zru stav 'Pry'"
 
-#: src/prefs.c:1033
-#, fuzzy
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Kdy jsem 'Pry' nov zprvy zaa do fronty"
 
-#: src/prefs.c:1034
-#, fuzzy
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "Ignoruj nov konverzace kdy jsem 'Pry'"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "Neposlat aotumatickou odpov"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "Neposlat aotumatickou odpov"
 
-#: src/prefs.c:1050
-#, fuzzy
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Poslat automatickou opov pouze pi neinnosti"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "Neinn:"
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Pry"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Nastaven zvuku"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 #, fuzzy
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Vyberte..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Edituj"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Edituj"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Instance:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Psmo"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Zprvy"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "IM okno"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Okno skupinovho chatu"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Prohle"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Zvuky"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Nzev 'Pry': "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 #, fuzzy
 msgid "Away Messages"
 msgstr "'Pry' zprvy"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Nastaven"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: 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 "
@@ -3382,11 +3638,11 @@
 "zdroje jako tato aplikace. Bohuel, protoe to nen stejn verze, nemu Vm "
 "spolehliv ci jak to byla. Samozejm, e se nepodailo protokol nahrt."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Chyba Protokolu"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3394,42 +3650,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Akce protokolu"
-
-#: src/prpl.c:103
+#: 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:106
-msgid "Disconnect"
-msgstr "Odpojit"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Akceptovat?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "GFaim - Dotaz"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nov Pota"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Otevt potu"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s udlal %s jeho kamardem%s%s%s"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3440,23 +3687,23 @@
 "\n"
 "Pejete si pidat jeho nebo ji do Vaeho Buddy Listu?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 "Momentln nemte dn protokol, kter je schopen zaregistrovat nov et."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrace"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 #, fuzzy
 msgid "Register"
 msgstr "Registrovat"
@@ -3475,10 +3722,6 @@
 msgid "(1 message)"
 msgstr "(1 zprva)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Varovn"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Ano"
@@ -3535,8 +3778,158 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
-#~ msgid "General Options"
-#~ msgstr "Veobecn monosti"
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Chyba Gadu-Gadu"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Gadu-Gadu infomace"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "Nemohl jsem poslat HTTP dost"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "Chyba pi importu Buddy Listu ze serveru (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "Chyba pi exportu Buddy Listu na server (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Smazn Buddy Listu ze serveru bylo nespn (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Pipojen na vyhledvac slubu selhalo (%s)"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - Zmna hesla"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Nesprvne jmno"
+
+#~ msgid "MSN Error"
+#~ msgstr "Chyba MSN"
+
+#~ msgid "Invalid name"
+#~ msgstr "Nesprvne jmno"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Chyba Chatu!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Chat"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Chyba"
+
+#, fuzzy
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Oscar SNAC Chyba"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Dvod neznm"
+
+#~ msgid "AOL error"
+#~ msgstr "Chyba AOL"
+
+#~ msgid "Error"
+#~ msgstr "Chyba"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Varovat uivatele?"
+
+#~ msgid "Chat Error"
+#~ msgstr "Chyba Chatu"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "Nemu zapsat hlaviku souboru!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Pokoum se pihlsit...."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Nepipojen. Kliknte pro otveven pihlaovacho okna."
+
+#~ msgid "Away."
+#~ msgstr "Pry."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Nemu vytvoit applet Gaim!"
+
+#~ msgid "About..."
+#~ msgstr "O..."
+
+#, fuzzy
+#~ msgid "Message Error"
+#~ msgstr "Chyba zprvy"
+
+#, fuzzy
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "Nemu poslat sprvu: Neznmy dvod"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Chyba zmny hesla"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "Nemu vymazat soubor %s - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "Chyba nastaven"
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr "Chyba pi Pihlaovn"
+
+#~ msgid "Login Error"
+#~ msgstr "Chyba pi Pihlaovn"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perlov skripty"
+
+#~ msgid "Select"
+#~ msgstr "Vybrat"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Automaticky zobraz Buddy List pi pihlen"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Zobraz Buddy List u appletu"
+
+#~ msgid "Edit"
+#~ msgstr "Edituj"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Chyba Protokolu"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Akce protokolu"
+
+#~ msgid "Disconnect"
+#~ msgstr "Odpojit"
+
+#~ msgid "Warned"
+#~ msgstr "Varovn"
 
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr ""
@@ -3569,9 +3962,6 @@
 #~ msgid "Galeon"
 #~ msgstr "Galeon"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Nastaven proxy"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3579,9 +3969,6 @@
 #~ "Ne vechny protokoly mou vyuvat tyto nastaven proxy. Zkonsultujte,\n"
 #~ "prosm, README soubor kvli detailm."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Typ proxy"
-
 #~ msgid "No Proxy"
 #~ msgstr "Bez proxy"
 
@@ -3597,9 +3984,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Monosti Buddy Listu"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Okno Buddy Listu"
-
 #, fuzzy
 #~ msgid "Tab Placement:"
 #~ msgstr "Poloha tabulky:"
@@ -3607,15 +3991,6 @@
 #~ msgid "Top"
 #~ msgstr "Nahoe"
 
-#~ msgid "Bottom"
-#~ msgstr "Dole"
-
-#~ msgid "Group Displays"
-#~ msgstr "Zobrazen skupin"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Zobrazen kamard"
-
 #, fuzzy
 #~ msgid "Conversation Options"
 #~ msgstr "Monosti konverzace"
@@ -3660,9 +4035,6 @@
 #~ msgid "Right"
 #~ msgstr "Vpravo"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Kamardova ikona"
-
 #~ msgid "Chat Options"
 #~ msgstr "Monosti chatu"
 
@@ -3670,9 +4042,6 @@
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Zobraz vechny konverzace v jednom okn se zlokami"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Tab dokon"
-
 #~ msgid "Font Options"
 #~ msgstr "Monosti psma"
 
@@ -3685,13 +4054,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Velikost psma pro text"
 
-#~ msgid "Sound Options"
-#~ msgstr "Monosti zvuku"
-
-#, fuzzy
-#~ msgid "Sound method"
-#~ msgstr "Metody zvuku"
-
 #, fuzzy
 #~ msgid "Sound played when:"
 #~ msgstr "Pehrt zvuk pi:"
@@ -3705,10 +4067,6 @@
 #~ msgid "minutes using"
 #~ msgstr "minut pouvn"
 
-#, fuzzy
-#~ msgid "Messages"
-#~ msgstr "Zprvy"
-
 #~ msgid "Make Away"
 #~ msgstr "Udlej 'Pre'"
 
--- a/po/da.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/da.po	Tue Aug 27 02:43:54 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GAIM 0.55\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-04-01 23:04+0200\n"
 "Last-Translator: Lars Sarauw Hansen <sarauw@dk.ibm.com>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -28,9 +28,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Luk"
 
@@ -43,16 +43,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Tilfj"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Slet"
 
@@ -76,6 +77,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -94,7 +96,7 @@
 msgid "Change"
 msgstr "Kanal:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 #, fuzzy
 msgid "Available"
 msgstr "Ikke tilgngelig"
@@ -103,8 +105,8 @@
 msgid "Available for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Fravrende"
 
@@ -121,7 +123,7 @@
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Ikke tilgngelig"
 
@@ -153,7 +155,7 @@
 msgid "Unknown Error Code."
 msgstr "Ukendt fejlkode."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -223,16 +225,6 @@
 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:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu Fejl"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Kunne ikke hente sgeresultater"
@@ -278,104 +270,151 @@
 msgid "Sex"
 msgstr "Kn"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "By"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Der er ingen venne-liste gemt p serveren."
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "Kunne ikke importere venne-liste fra server"
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Overfrsel af venne-liste til server er get godt"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Gadu-Gadu Information"
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Kunne ikke overfre venne-liste til server"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "Venne-liste p server slettet"
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kunne ikke slette venne-liste p server"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "Adgangskoden er ndret"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "Adgangskoden blev ikke ndret"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "Kunne ikke sende web-foresprgsel"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "Import af venne-liste fra server fejlede (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "Eksport af venne-liste til server fejlede (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Sletning af venne-liste p server fejlede (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Tilslutning til sgetjeneste fejlede (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Skift af adgangskode fejlede (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Kunne ikke importere venne-liste fra server"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Kunne ikke oprette direkte forbindelse"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Kan ikke lse fra netvrket"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Databasesgning"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Importr venne-liste fra server"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Eksportr venne-liste til server"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Slet venne-liste p server"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Kunne ikke lse filen %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Send besked gennem server"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Brugerinformation"
@@ -391,20 +430,16 @@
 msgstr "<B>%s har ndret emnet til: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "Klenavn/kanal findes ikke"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "IRC Fejl"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "Ingen server af den type"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Klenavn ikke angivet"
 
 #: src/protocols/irc/irc.c:976
@@ -419,8 +454,8 @@
 msgstr "Kunne ikke skrive"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Du er blevet smidt ud af %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -433,10 +468,6 @@
 msgid "You have left %s"
 msgstr "Du har forladt %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "IRC Deltager"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Kanal:"
@@ -450,46 +481,60 @@
 msgstr "DCC Chat"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - Skift adgangskode"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "Kan ikke lse fra netvrket"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Kan ikke lse fra netvrket"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Logget ind"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "Totalt fravrende"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "Vil ikke forstyrres"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Besked-fejl"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Ukendt fejlkode."
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -497,188 +542,195 @@
 "\n"
 "Vil du tilfje vedkommende til din venne-liste?"
 
-#: src/protocols/jabber/jabber.c:1655
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
 #, fuzzy
-msgid "No such user"
+msgid "No such user."
 msgstr "Ingen server af den type"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-#, fuzzy
-msgid "Jabber Error"
-msgstr "Besked-fejl"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Venner"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "Ukendt logind-fejl"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Adgangskoden er ndret"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - Skift adgangskode"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "Kunne ikke tilslutte"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "Finder godkendelsesmetode"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
 #, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "Ugyldigt navn"
-
-#: src/protocols/jabber/jabber.c:2648
+msgid "Jabber Error"
+msgstr "Besked-fejl"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Rum:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "Klenavn:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Kunne ikke tilslutte"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Ls log"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Hent fravrsbesked"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Vis besked"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "Efternavn"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "Fornavn"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "Klenavn"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "Hjemmeside"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Adresse 1"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "Adresse 2"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Omrde"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "E-post adresse"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Organisationsnavn"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "Organisatorisk enhed"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr "Rolle"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "Fdselsdato"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -686,23 +738,23 @@
 "Alle oplysninger er valgfri. Skriv kun de ting, du nsker andre skal vide om "
 "dig"
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "Brugeroplysninger"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Redigr Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "Du er nu registreret p serveren!"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Ukendt fejl under registrering"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "Ret brugeroplysninger"
 
@@ -870,118 +922,134 @@
 msgid "Unknown Error Code"
 msgstr "Ukendt fejlkode."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "MSN Fejl"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim kunne ikke sende en besked"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 "Du er blevet koblet af serveren, da du er logget ind fra en anden maskine "
 "ogs."
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Fejl under lsning fra netvrket."
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Kan ikke lse fra netvrket"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "Adgangskode:"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Kunne ikke kontakte server"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "Registrr p server"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 #, fuzzy
 msgid "Busy"
 msgstr "Ven"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "Skjul ikon"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Efternavn"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Brugernavn:"
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "Ugyldigt navn"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Hvilken gruppe:"
@@ -1014,60 +1082,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Forbindelse til chat-rum %s afbrudt."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Chat-fejl!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chat er ikke tilgngelig nu"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Chat"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "Kunne ikke kontakte vrt"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Adgangskode sendt - venter p svar\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "Intern forbindelsesfejl\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Kunne ikke logge p AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Tilsluttet: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Koblet af.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Forbindelse fejlede"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Forbindelse oprettet, infokage sendt"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Forkert navn eller adgangskode."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Din konto er ikke aktiv for jeblikket."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1075,24 +1138,47 @@
 "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/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Din klient er for gammel. Hent en opgradering p"
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Godkendelse fejlede."
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Intern fejl"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim 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
+#, 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
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte forbindelse til %s oprettet"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1100,51 +1186,47 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "Klenavn ikke angivet"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, 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:1586
+#: 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:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Du har ikke modtaget %d besked fra %s fordi den var for stor."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Du har ikke modtaget %d beskeder fra %s fordi de var for store."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Du har ikke modtaget %d besked fra %s fordi der er sendt for mange beskeder."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
@@ -1152,71 +1234,62 @@
 "Du har ikke modtaget %d beskeder fra %s fordi der er sendt for mange "
 "beskeder."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Du har ikke modtaget %d besked fra %s fordi den var storeslem :-)."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Du har ikke modtaget %d beskeder fra %s fordi de var storeslemme :-)."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Du har ikke modtaget %d besked fra %s pga din drlige opfrsel :-)."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Du har ikke modtaget %d beskeder fra %s pga din drlige opfrsel :-)"
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Du har ikke modtaget %d besked fra %s af ukendte rsager."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Du har ikke modtaget %d beskeder fra %s af ukendte rsager"
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Fejl"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fejlen: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Oscar SNAC fejl"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Din besked til %s blev ikke sendt: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Ukendt rsag"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "Klenavn ikke angivet"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Oplysninger om %s ikke tilgngelige: %s"
@@ -1326,50 +1399,87 @@
 msgstr "<i>Ingen information tilgngelig</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Din forbindelse kan vre afbrudt."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL fejl"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "Den seneste besked blev ikke sendt, fordi serveren har for travlt. Vent 10 "
 "sekunder og prv s igen."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Fejl"
-
-#: src/protocols/oscar/oscar.c:3207
+#: 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
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Kunne ikke lse filen %s."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim kunne ikke sende en besked"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - Advar bruger?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Deltagere:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Kunne ikke oprette direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1379,30 +1489,30 @@
 "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:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Hent fravrsbesked"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "Direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Klientinformation"
 
@@ -1535,49 +1645,43 @@
 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:599
-msgid "TOC Resume"
-msgstr "TOC er klar igen"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Chat-fejl"
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "Adgangskode skiftet"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Skift adgangskode"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC har sendt en PAUSE-kommando. Dermed ignorerer TOC alle beskeder der "
 "sendes, men du kan alligevel risikere at blive logget af, hvis du forsger "
 "at sende en besked. Gaim vil derfor tilbageholde alle beskeder. Dette er kun "
 "midlertidigt, s hav tlmodighed..."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC Pause"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Hent oplysninger"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "Kunne ikke oprette forbindelse til overfrsel!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "Kunne ikke oprette forbindelse til overfrsel!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "Kunne ikke skrive starten af filen."
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1599,22 +1703,23 @@
 msgstr "%s beder dig om at sende en fil"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Din besked blev ikke sendt"
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Modtager:"
 
@@ -1641,7 +1746,7 @@
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 
 #: src/about.c:147
@@ -1686,6 +1791,9 @@
 "===============\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"
@@ -1695,13 +1803,10 @@
 msgstr "Log af"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Indtast dit brugernavn"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Logind-fejl"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - Logind"
@@ -1742,40 +1847,11 @@
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Auto-logind"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Prver at logge p..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Ikke logget ind. Klik for at logge ind."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Fravrende: %d venter."
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Fravrende"
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Ny fravrsbesked"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Kan ikke starte Gaim i panelet!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "Om..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Fravrende!"
@@ -1788,6 +1864,10 @@
 msgid "Back"
 msgstr "Tilbage"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Ny fravrsbesked"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Slet fravrsbesked"
@@ -1796,7 +1876,7 @@
 msgid "Set All Away"
 msgstr "St alle fravrende"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Gruppe"
 
@@ -1806,12 +1886,13 @@
 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:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Information"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1831,10 +1912,6 @@
 msgid "Un-Alias"
 msgstr "Slet alias"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "Handling"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "Opret handling"
@@ -1891,7 +1968,7 @@
 msgid "Information on selected Buddy"
 msgstr "Information om markeret ven"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Send besked"
 
@@ -1919,7 +1996,7 @@
 msgid "New Instant Message"
 msgstr "Ny besked"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Se brugeroplysninger"
 
@@ -1931,6 +2008,10 @@
 msgid "Tools"
 msgstr "Vrktjer"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "Handling"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Protokolhandlinger"
@@ -1977,7 +2058,7 @@
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Venne-liste"
 
@@ -2010,12 +2091,12 @@
 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:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Annullr"
 
@@ -2028,7 +2109,7 @@
 msgid "Invite"
 msgstr "Invitr"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Ven"
 
@@ -2044,10 +2125,11 @@
 msgid "Un-Ignore"
 msgstr "Ignorr ikke"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "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
 #, c-format
@@ -2091,15 +2173,15 @@
 msgstr "Hvisk"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Send"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Ignorr"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Advar"
@@ -2113,16 +2195,14 @@
 msgstr "Gaim - Indst billede"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "Kunne ikke sende besked: For lang"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Besked-fejl"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "Kunne ikke sende besked af ukendte rsager"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "Kunne ikke sende besked: For lang"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2134,156 +2214,156 @@
 msgid "Setting position to %d\n"
 msgstr "Flytter position til %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Fed tekst"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Fed"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Kursiv tekst"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Kursiv"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Understreget tekst"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Understregning"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Gennemstreget tekst"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Gennemstregning"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Mindre skrift"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Lille"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Normal skriftstrrelse"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Strre skrift"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Stor"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Vlg skrifttype"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Skrifttype"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Tekstfarve"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Farve"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Baggrundsfarve"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Indst lnke"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Lnke"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Indst humr-ansigt"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Humr-ansigt"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "Indst billede"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr "Billede"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Registrr i logfil"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Logger"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Gem samtale"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Gem"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Lyd"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Samtaler"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Send besked som:"
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Gem ikon"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Brug ikke animation"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Brug animation"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Gem ikon som..."
 
@@ -2327,385 +2407,406 @@
 "Du er ved at slette %s fra din\n"
 "venneliste. Vil du fortstte?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Acceptr"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "O.k."
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - Bruger"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "Besked til:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Bruger:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "Konto"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Se brugeroplysninger"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Tilfj gruppe"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Tilfj gruppe"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Tilfj ven"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Tilfj ven"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Tilfj til"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Fravrende!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Indstil for:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Tillad alle brugere at kontakte mig"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Tillad kun nedenstende brugere"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Tilladte brugere"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Ignorr alle brugere"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Ignorr kun nedenstende brugere"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Ignorerede brugere"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Hvem vil du sende en handling ved logind?"
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Fejl ved udfrsel af handling"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Ny handling"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Hvem vil du vente p:"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Konto"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Hvornr skal handlingen udfres:"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Nr ven logger ind"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Nr ikke lngere fravrende"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Nr ven bliver aktiv igen"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "Nr ven skriver til dig"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Hvad skal der ske:"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "bn besked-vindue"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Vis besked"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Send besked"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Udfr kommando"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Afspil lyd"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Gem denne handling til senere brug"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Ret kataloginformation"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Kataloginformation"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Tillad netsgninger at finde information om dig"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Fornavn"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Mellemnavn"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Efternavn"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Dbsnavn"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Landsdel"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Adgangskoder er ikke ens"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Fejl ved skift af adgangskode"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Udfyld alle felter ordentligt"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "Oprindelig adgangskode"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Skift adgangskode"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "Oprindelig adgangskode"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Ny adgangskode"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Ny adgangskode (igen)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Ret brugerinformation"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Her er resultatet af din sgning:"
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Tillad"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Ignorr"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Tilfj tilladelse"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ignorr fra nu af"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Sg efter ven"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Find ven udfra information"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Find ven udfra e-post adresse"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Tilfj hjemmesideadresse"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Vlg tekstfarve"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Vlg baggrundsfarve"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importr til:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importr venne-liste"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "Du kan ikke lave en fravrsbesked uden en titel"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "Du kan ikke lave en tom fravrsbesked"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Ny fravrsbesked"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Ny fravrsbesked"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Titel:"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Brug"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Gem og brug"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Smil!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Lav alias for ven"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Lav alias for ven"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "Kunne ikke kontakte vrt"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Gem logfil"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Kunne ikke slette filen %s - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "Er du sikker p at du vil slette loggen?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "Kunne ikke bne konfigurationsfilen %s."
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "Er du sikker p at du vil slette loggen?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "O.k."
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Dato"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Samtale"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Ryd"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Omdb gruppe"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Omdb gruppe"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Nyt navn:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Omdb ven"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Omdb ven"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vlg Perl-skript"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunne ikke bne konfigurationsfilen %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Fejl i indstillinger"
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2715,10 +2816,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fejl ved oprettelse af forbindelse\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr "Fejl ved logind"
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim kunne ikke sende en besked"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2732,7 +2833,7 @@
 msgid "Browse"
 msgstr "Gennemse"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Nulstil"
 
@@ -2774,17 +2875,22 @@
 msgstr "Indtast adgangskode"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Fejl ved logind"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Protokolhandlinger"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2792,40 +2898,40 @@
 "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:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker p at du vil slette %s?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Ret konto"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Vlg alle"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Vlg auto-logind"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Vlg ingen"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Ret"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Log ind/ud"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Slet"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2834,28 +2940,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s kunne ikke logge ind"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Logind-fejl"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "Bemrk!"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s er logget ud"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "Forbindelsesfejl"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perl-skripter"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim "
@@ -2864,10 +2970,12 @@
 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"
@@ -2913,426 +3021,594 @@
 msgid "Close this window"
 msgstr "Luk dette vindue"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, 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 "Windows"
-msgstr "Besked-vindue"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Vis fejlsgningsvindue"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Ingen kant p knapper"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Landsdel"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Ingen kant p knapper"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Fed"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Kursiv"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Understregning"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Gennemstreget tekst"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Annullr"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "Indst humr-ansigt"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Indst humr-ansigt"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Vlg"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Tekstfarve"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Baggrundsfarve"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Visning af venner"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "Tekstfarve"
+msgid "Show graphical _smileys"
+msgstr "Vis grafiske humransigter"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Vis tidspunkt i beskeder"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "Vis URLer som henvisninger"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Fremhv forkert stavede ord"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Ignorr farver"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Baggrundsfarve"
+msgid "Ignore font _faces"
+msgstr "Ignrer skrifttyper"
+
+#: src/prefs.c:382
+#, 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
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "ENTER sender besked"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "CTRL+ENTER sender besked"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "Besked-vindue"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "ESC lukker vindue"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "ESC lukker vindue"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "CTRL+{B/I/U/S} indstter HTML-koder"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "CTRL+nummer indstter humransigt"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "I bunden"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Skjul besked/info/chat-knapperne"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Vis grafiske humransigter"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Vis tidspunkt i beskeder"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Brug billeder p knapper"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Vis URLer som henvisninger"
+msgid "Buddy List Window"
+msgstr "Venne-liste"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Fremhv forkert stavede ord"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Husk vinduets strrelse og placering"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Send vindue i forgrunden ved aktivitet"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Visning af grupper"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Vis ikke gruppe, hvis ingen er logget ind"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Vis tal for hver gruppe"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Visning af venner"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "Brug status-ikoner"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Vis advarselsniveau"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Ignorr farver"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Vis inaktiv tid"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Ignrer skrifttyper"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Ignrer skriftstrrelser"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignrer TiK's automatiske beskeder"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "ENTER sender besked"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "CTRL+ENTER sender besked"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Vis inaktive venner med gr farve"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "Besked-vindue"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Bredde i punkter:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "Hjde i punkter:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Hjde p skrivefeltet:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Send vindue i forgrunden ved aktivitet"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Luk vindue nr besked er sendt"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Ikoner/knapper"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "ESC lukker vindue"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Skjul knapper"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "ESC lukker vindue"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "CTRL+{B/I/U/S} indstter HTML-koder"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "CTRL+nummer indstter humransigt"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Skjul besked/info/chat-knapperne"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Brug billeder p knapper"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Vis automatisk venne-listen efter logind"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Animr ikke venne-ikoner"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Besked nr venner logger ind/ud"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Vis besked"
+
+#: src/prefs.c:472
+#, 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
+msgid "Tab Completion"
+msgstr "Autofuldfrelse"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Autofuldfr navne ved tryk p TAB"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "TAB som i gamle Gaim-versioner"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Vis venne-listen tt ved panelet"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Husk vinduets strrelse og placering"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "Send vindue i forgrunden ved aktivitet"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Vis ikke gruppe, hvis ingen er logget ind"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Vis tal for hver gruppe"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "Brug status-ikoner"
+msgid "_Show people joining/leaving in window"
+msgstr "Vis nr nogen logger ind eller ud "
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Vis advarselsniveau"
-
-#: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Vis inaktiv tid"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Vis inaktive venner med gr farve"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Bredde i punkter:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "Hjde i punkter:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Hjde p skrivefeltet:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Send vindue i forgrunden ved aktivitet"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Luk vindue nr besked er sendt"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Skjul knapper"
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "Animr ikke venne-ikoner"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Besked nr venner logger ind/ud"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Vis venner at du er ved at skrive til dem"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Autofuldfr navne ved tryk p TAB"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "TAB som i gamle Gaim-versioner"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Vis nr nogen logger ind eller ud "
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
-msgstr ""
-
-#: src/prefs.c:674
 #, 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:675
+#: src/prefs.c:534
 #, fuzzy
-msgid "Show aliases in tabs/titles"
+msgid "Show a_liases in tabs/titles"
 msgstr "Vis aliaser i faneblade/titler"
 
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "Chat"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
 msgstr "Vis hver chat som faneblad i et vindue"
 
-#: src/prefs.c:700
+#: src/prefs.c:546
+msgid "Combined Tabs"
+msgstr ""
+
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Vis hver chat som et faneblad i samme vindue"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Venne-liste"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Mellemvrtstype"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Mellemvrt"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Vrtsnavn"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Brugernavn"
 
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
+msgstr "Adgangskode"
+
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
+#, fuzzy
+msgid "Browser Options"
+msgstr "Indstillinger for mellemvrt (proxy)"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
+msgstr "Start altid program i nyt vindue"
+
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Beskeder"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
+msgstr "Gem alle samtaler"
+
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
+msgstr "Ingen HTML-koder i logfilen"
+
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Se systemlog"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
+msgstr "Registrr at venner logger ind/ud"
+
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
+msgstr "Registrr at venner bliver aktive/inaktive"
+
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
+msgstr "Registrr venners fravr/genkomst"
+
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
+msgstr "Registrr eget logind/inaktivitet/fravr"
+
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
+msgstr "Separat logfil for hver ven"
+
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Indstillinger for lyd"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
+msgstr "Ingen lyde, nr du logger ind"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
+msgstr "Afspil lyde under fravr"
+
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Afspil lyd ved hjlp af:"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
+msgid ""
+"Sound c_ommand\n"
+"(%s for filename)"
+msgstr "Kommando (brug %s istedet for filnavn):"
+
 #: src/prefs.c:813
-msgid "Password"
-msgstr "Adgangskode"
-
-#: src/prefs.c:873
+#, fuzzy
+msgid "_Sending messages removes away status"
+msgstr "Beskedafsendelse ophver fravrsstatus"
+
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
+msgstr "St nye beskeder i k under fravr"
+
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
+msgstr "Ignrer nye samtaler under fravr"
+
+#: src/prefs.c:817
 #, fuzzy
-msgid "Open new window by default"
-msgstr "Start altid program i nyt vindue"
-
-#: src/prefs.c:892
-msgid "Log all conversations"
-msgstr "Gem alle samtaler"
-
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
-msgstr "Ingen HTML-koder i logfilen"
-
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
-msgstr "Registrr at venner logger ind/ud"
-
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
-msgstr "Registrr at venner bliver aktive/inaktive"
-
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
-msgstr "Registrr venners fravr/genkomst"
-
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
-msgstr "Registrr eget logind/inaktivitet/fravr"
-
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
-msgstr "Separat logfil for hver ven"
-
-#: src/prefs.c:952
-msgid "No sounds when you log in"
-msgstr "Ingen lyde, nr du logger ind"
-
-#: src/prefs.c:953
-msgid "Sounds while away"
-msgstr "Afspil lyde under fravr"
-
-#: src/prefs.c:990
-#, c-format
-msgid ""
-"Sound command\n"
-"(%s for filename)"
-msgstr "Kommando (brug %s istedet for filnavn):"
-
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
-msgstr "Beskedafsendelse ophver fravrsstatus"
-
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
-msgstr "St nye beskeder i k under fravr"
-
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
-msgstr "Ignrer nye samtaler under fravr"
-
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+msgid "Auto-response"
+msgstr "Send ikke automatisk svar"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "Send ikke automatisk svar"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Send kun automatisk svar, nr fravrende"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "Inaktiv:"
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Fravrende"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Opstning af lyd"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Vlg..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Ret"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Ret"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Instans:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Skrifttype"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Beskeder"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "Besked-vindue"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Gruppechat-vindue"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Mellemvrt"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Netlser/browser"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Lydeffekter"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Lydeffekter"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Titel:"
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Fravrsbeskeder"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Indstillinger"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: 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 "
@@ -3344,11 +3620,11 @@
 "kildekode er fra, men under alle omstndigheder kan protokollen ikke "
 "indlses."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Protokol-fejl"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3356,42 +3632,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Protokolhandlinger"
-
-#: src/prpl.c:103
+#: 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:106
-msgid "Disconnect"
-msgstr "Afbryd forbindelse"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Acceptr?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - Sprgsml"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Ny post"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "bn post"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s har gjort %s til en ven%s%s%s"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3402,7 +3669,7 @@
 "\n"
 "Vil du tilfje vedkommende til din venne-liste?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3410,15 +3677,15 @@
 "Du har ikke nogen protokoller indlst, som understtter oprettelsen af nye "
 "konti."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrering"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Registreringsinformation"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "Registrr"
 
@@ -3435,10 +3702,6 @@
 msgid "(1 message)"
 msgstr "(1 besked)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Advaret!"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Ja"
@@ -3495,12 +3758,171 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gadu-Gadu Fejl"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Gadu-Gadu Information"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "Kunne ikke sende web-foresprgsel"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "Import af venne-liste fra server fejlede (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "Eksport af venne-liste til server fejlede (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Sletning af venne-liste p server fejlede (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Tilslutning til sgetjeneste fejlede (%s)"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - Skift adgangskode"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Ugyldigt navn"
+
+#~ msgid "MSN Error"
+#~ msgstr "MSN Fejl"
+
+#~ msgid "Invalid name"
+#~ msgstr "Ugyldigt navn"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Chat-fejl!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Chat"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Fejl"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Oscar SNAC fejl"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Ukendt rsag"
+
+#~ msgid "AOL error"
+#~ msgstr "AOL fejl"
+
+#~ msgid "Error"
+#~ msgstr "Fejl"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Advar bruger?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC er klar igen"
+
+#~ msgid "Chat Error"
+#~ msgstr "Chat-fejl"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC Pause"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "Kunne ikke skrive starten af filen."
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Prver at logge p..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Ikke logget ind. Klik for at logge ind."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Fravrende: %d venter."
+
+#~ msgid "Away."
+#~ msgstr "Fravrende"
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Kan ikke starte Gaim i panelet!"
+
+#~ msgid "About..."
+#~ msgstr "Om..."
+
+#~ msgid "Message Error"
+#~ msgstr "Besked-fejl"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "Kunne ikke sende besked af ukendte rsager"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Fejl ved udfrsel af handling"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Fejl ved skift af adgangskode"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "Kunne ikke slette filen %s - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "Fejl i indstillinger"
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr "Fejl ved logind"
+
+#~ msgid "Login Error"
+#~ msgstr "Fejl ved logind"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl-skripter"
+
+#~ msgid "Select"
+#~ msgstr "Vlg"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Vis automatisk venne-listen efter logind"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Vis venne-listen tt ved panelet"
+
+#~ msgid "Edit"
+#~ msgstr "Ret"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Protokol-fejl"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Protokolhandlinger"
+
+#~ msgid "Disconnect"
+#~ msgstr "Afbryd forbindelse"
+
+#~ msgid "Warned"
+#~ msgstr "Advaret!"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Vis status lbende i separat vindue"
 
-#~ msgid "General Options"
-#~ msgstr "Generelle indstillinger"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr ""
 #~ "ndringer bliver aktive jeblikkeligt, medmindre andet er beskrevet."
@@ -3532,9 +3954,6 @@
 #~ msgid "Galeon"
 #~ msgstr "Galeon"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Indstillinger for mellemvrt (proxy)"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3542,9 +3961,6 @@
 #~ "Ikke alle protokoller kan bruge en mellemvrt (proxy). Ls README-filen "
 #~ "for detaljer."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Mellemvrtstype"
-
 #~ msgid "No Proxy"
 #~ msgstr "Ingen mellemvrt"
 
@@ -3560,24 +3976,12 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Udseende"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Venne-liste"
-
 #~ msgid "Tab Placement:"
 #~ msgstr "Placering af faneblade"
 
 #~ msgid "Top"
 #~ msgstr "I toppen"
 
-#~ msgid "Bottom"
-#~ msgstr "I bunden"
-
-#~ msgid "Group Displays"
-#~ msgstr "Visning af grupper"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Visning af venner"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Indstillinger for samtaler"
 
@@ -3620,18 +4024,12 @@
 #~ msgid "Right"
 #~ msgstr "Til hjre"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Ikoner/knapper"
-
 #~ msgid "Chat Options"
 #~ msgstr "Indstillinger for chat"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Vis samtaler som faneblade i samme vindue"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Autofuldfrelse"
-
 #~ msgid "Font Options"
 #~ msgstr "Indstillinger for skrifttyper"
 
@@ -3644,12 +4042,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Skriftstrrelse:"
 
-#~ msgid "Sound Options"
-#~ msgstr "Indstillinger for lyd"
-
-#~ msgid "Sound method"
-#~ msgstr "Afspil lyd ved hjlp af:"
-
 #~ msgid "Sound played when:"
 #~ msgstr "Afspil lyd, nr:"
 
@@ -3662,9 +4054,6 @@
 #~ msgid "minutes using"
 #~ msgstr "minutter og send"
 
-#~ msgid "Messages"
-#~ msgstr "Beskeder"
-
 #~ msgid "Make Away"
 #~ msgstr "St fravrende"
 
--- a/po/de.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/de.po	Tue Aug 27 02:43:54 2002 +0000
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-03-31 11:29+0200\n"
 "Last-Translator: Karsten Weiss <knweiss@gmx.de>\n"
 "Language-Team: de <de@li.org>\n"
@@ -35,9 +35,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Schlieen"
 
@@ -50,16 +50,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Hinzufgen"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -83,6 +84,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -101,7 +103,7 @@
 msgid "Change"
 msgstr "Kanal:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Erreichbar"
 
@@ -109,8 +111,8 @@
 msgid "Available for friends only"
 msgstr "Nur fr Freunde erreichbar"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Abwesend"
 
@@ -126,7 +128,7 @@
 msgid "Invisible for friends only"
 msgstr "Nur fr Freunde unsichtbar"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Unerreichbar"
 
@@ -158,7 +160,7 @@
 msgid "Unknown Error Code."
 msgstr "Unbekannter Fehlercode."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -230,16 +232,6 @@
 msgstr ""
 "Sie versuchen eine Nachricht an eine ungltige Gadu-Gadu UIN zu senden."
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu Fehler"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Die Suche war ohne Ergebnis"
@@ -285,104 +277,152 @@
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Stadt"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Auf dem Server ist leider keine Buddy-List gespeichert."
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "Buddy-Liste konnte nicht vom Server importiert werden"
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy-Liste wurde erfolgreich zum Server bertragen"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Gadu-Gadu Informationen"
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Die Buddy-Liste konnte nicht zum Server bertragen werden"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "Die Buddy-Liste wurde erfolgreich vom Server gelscht"
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Die Buddy-Liste konnte nicht vom Server gelscht werden"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "Das Passwort wurde erfolgreich gendert"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "Das Passwort konnte nicht gendert werden"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "http-Anforderung konnten nicht versandt werden"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "Der Import der Buddy-Liste vom Server ist fehlgeschlagen (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "Der Export der Buddy-Liste zum Server ist fehlgeschlagen (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Das Lschen der Buddy-Liste vom Server ist fehlgeschlagen (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Die Verbindung mit dem Suchdienst ist fehlgeschlagen (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Das ndern des Passworts ist fehlgeschlagen (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Buddy-Liste konnte nicht vom Server importiert werden"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+# "Direct IM"
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Direkte Verbindung nicht mglich"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Socket kann nicht gelesen werden."
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Verzeichnissuche"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Passwort ndern"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Buddy-Liste vom Server importieren"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Buddy-Liste zum Server exportieren"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Lschen der Buddy-Liste vom Server"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Datei %s konnte nicht gelesen werden."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Nachricht mittels Server senden"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Benutzer-Info"
@@ -399,20 +439,16 @@
 msgstr "<B>%s hat das Thema abgendert auf: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "Es gibt keinen solchen Spitznamen/Kanal"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "Chat-Fehler"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "Dieser Server existiert nicht"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Kein Spitzname angegeben"
 
 #: src/protocols/irc/irc.c:976
@@ -429,8 +465,8 @@
 msgstr "Schreiben nicht mglich"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Sie wurden hinausgeworfen von %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -443,10 +479,6 @@
 msgid "You have left %s"
 msgstr "Sie haben %s verlassen"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "IRC Part"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Kanal:"
@@ -460,46 +492,60 @@
 msgstr "DCC-Chat"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - Passwort-nderung"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "Socket kann nicht gelesen werden."
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Socket kann nicht gelesen werden."
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Online"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "Nicht stren"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Nachrichten-Fehler"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode."
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -507,190 +553,197 @@
 "\n"
 "Mchten Sie sie zu Ihrer Buddy-List hinzufgen?"
 
-#: src/protocols/jabber/jabber.c:1655
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
 #, fuzzy
-msgid "No such user"
+msgid "No such user."
 msgstr "Dieser Server existiert nicht"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-#, fuzzy
-msgid "Jabber Error"
-msgstr "Nachrichten-Fehler"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Buddies"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "Unbekannter Anmeldefehler"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Das Passwort wurde erfolgreich gendert"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - Passwort-nderung"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "Verbindung abgebrochen"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "Verbindung kann nicht hergestellt werden"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "Verbunden"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "Anfrage der Authentifizierungsmethode fehlgeschlagen"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
 #, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "Ungltiger Name"
-
-#: src/protocols/jabber/jabber.c:2648
+msgid "Jabber Error"
+msgstr "Nachrichten-Fehler"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Raum:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "Krzel:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Verbindung kann nicht hergestellt werden"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Mitschnitt anzeigen"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Abwesenheits-Mitteilung holen"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Popup-Benachrichtigung"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "Vollstndiger Name"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "Nachname"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "Vorname"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Strae"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
 # ???
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "rtlichkeit"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Bezirk"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "Telefon"
 
 # Die offizielle GNOME-bersetzung
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "E-Mail"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr "Funktion"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -698,23 +751,23 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben mchten."
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "Benutzer Identitt"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCard bearbeiten"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "Server-Anmeldung erfolgreich!"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Unbekannter Fehler bei der Anmeldung"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
@@ -882,118 +935,134 @@
 msgid "Unknown Error Code"
 msgstr "Unbekannter Fehlercode."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "MSN-Fehler"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim konnte keine Nachricht senden"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 "Die Verbindung wurde getrennt. Sie haben sich von einem anderen Ort "
 "angemeldet."
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen aus Socket."
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Socket kann nicht gelesen werden."
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "Passwort: "
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Verbindung zum Server nicht mglich."
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "Beim Server anmelden"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 #, fuzzy
 msgid "Busy"
 msgstr "Buddy"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "Icon verbergen"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Zweiter Name"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Benutzername: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "Ungltiger Name"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "An welcher Gruppe teilnehmen:"
@@ -1028,60 +1097,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Die Verbindung zum Raum %s wurde unterbrochen"
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Chat-Fehler!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chat ist momentan nicht mglich."
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Chat"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "Keine Verbindung zum Host"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Passwort wurde bertragen. Warte auf Antwort\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "Interner Verbindungsfehler\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Anmeldung nicht mglich"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Abgemeldet.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Verbinden nicht mglich"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Verbindung hergestellt. Cookie gesendet"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Ungltiger Benutzername oder Passwort."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1090,24 +1154,47 @@
 "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, mssen Sie sogar "
 "noch lnger warten"
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Ihre AIM-Software ist zu alt. Aktuelle Software finden Sie unter "
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Legitimation fehlgeschlagen"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim konnte keine Nachricht senden"
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "Gaim konnte keine Nachricht senden"
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte Verbindung mit %s hergestellt"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1115,51 +1202,47 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "Kein Spitzname angegeben"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Sie haben %d Nachricht von %s verpasst, da sie ungltig war."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da sie ungltig waren."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Sie haben %d Nachricht von %s verpasst, da sie zu gro war."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da sie zu gro waren."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Sie haben %d Nachricht von %s verpasst, da die Senderate berschritten wurde."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
@@ -1167,74 +1250,65 @@
 "Sie haben %d Nachrichten von %s verpasst, da die Senderate berschritten "
 "wurde."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Sie haben %d Nachricht von %s verpasst, da sie zu boshaft war."
 
 # ???
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da sie zu boshaft waren."
 
 # ???
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Sie haben %d Nachricht von %s verpasst, da Sie zu boshaft sind."
 
 # ???
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da Sie zu boshaft sind."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Sie haben %d Nachricht von %s aus unbekannten Grnden verpasst."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Sie haben %d Nachricht von %s aus unbekannten Grnden verpasst."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Fehler"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC war den Fehler: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Oscar SNAC Fehler"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Ihre Nachricht zu %s wurde nicht gesendet: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Grund unbekannt"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "Kein Spitzname angegeben"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Benutzerinformationen fr %s sind nicht verfgbar: %s"
@@ -1345,53 +1419,90 @@
 msgstr "<i>Keine Information bereitgestellt</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Die Verbindung wurde unterbrochen"
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL-Fehler"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "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:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Fehler"
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr "Authentifizierung fehlgeschlagen."
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr "Authentifizierung fehlgeschlagen."
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Datei %s konnte nicht gelesen werden."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim konnte keine Nachricht senden"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - Benutzer warnen?"
-
 # Ich bin mir nicht sicher was "Exchange" hier genau bedeutet.
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Austausch:"
 
 # "Direct IM"
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Direkte Verbindung nicht mglich"
 
 # Direct IM
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1402,30 +1513,30 @@
 "kann er Ihre ipadresse sehn und knnte ein sicherheitsrisiko darstellen. "
 "Mchten Sie weitermachen?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Abwesenheits-Mitteilung holen"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Fhigkeiten holen"
 
@@ -1562,49 +1673,43 @@
 msgstr ""
 "TOC ist von seiner Pause zurckgekehrt. Sie knnen wieder Nachrichten senden."
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "TOC Fortsetzung"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Chat-Fehler"
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "Passwort-nderung erfolgreich"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Passwort-nderung"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC hat einen PAUSE-Befehl gesendet. Wenn dies passiert, ignoriert TOC jede "
 "Nachricht und kann Sie unter Umstnden abmelden, wenn Sie eine Nachricht "
 "senden. Gaim verhindert jetzt, da Nachrichten durchgehen. Dies ist nur "
 "temporr, bitte haben Sie Geduld."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC Pause"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Verzeichnis Information holen"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "bertragungsverbindung konnte nicht hergestellt werden!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "bertragungsverbindung konnte nicht hergestellt werden!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "Dateikopf konnte nicht geschrieben werden!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1626,23 +1731,24 @@
 msgstr "%s bittet Sie eine Datei zu senden"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Die Nachricht wurde nicht verschickt"
 
 # ???
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Instanz:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Empfnger:"
 
@@ -1667,10 +1773,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1714,6 +1821,9 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
+#. this makes the sizes not work.
+#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Webseite"
@@ -1723,13 +1833,10 @@
 msgstr "Abmelden"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Anmeldefehler"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - Anmeldung"
@@ -1771,41 +1878,11 @@
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Auto-Login"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Anmeldeversuch..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Offline. Hier klicken, um das Anmeldefenster zu ffnen."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Abwesend: %d ausstehend."
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Abwesend."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Neue Abwesenheits-Mitteilung"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Gaim-Applet kann nicht erstellt werden"
-
-# "Info" ist die offizielle GNOME-bersetzung
-#: src/applet.c:368
-msgid "About..."
-msgstr "Info..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Ich bin abwesend!"
@@ -1818,6 +1895,10 @@
 msgid "Back"
 msgstr "Zurck"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Neue Abwesenheits-Mitteilung"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Abwesenheits-Mitteilung lschen"
@@ -1826,7 +1907,7 @@
 msgid "Set All Away"
 msgstr "Alle auf Abwesend setzen"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Gruppe"
 
@@ -1836,12 +1917,13 @@
 msgstr "Nachricht"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1861,10 +1943,6 @@
 msgid "Un-Alias"
 msgstr "Alias entfernen"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "Buddy-Alarm"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alarm"
@@ -1921,7 +1999,7 @@
 msgid "Information on selected Buddy"
 msgstr "Info ber ausgewhlten Buddy"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Nachricht senden"
 
@@ -1950,7 +2028,7 @@
 msgid "New Instant Message"
 msgstr "Neue Nachricht"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Benutzer-Info holen"
 
@@ -1962,6 +2040,10 @@
 msgid "Tools"
 msgstr "System"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "Buddy-Alarm"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Protokoll-Aktionen"
@@ -2008,7 +2090,7 @@
 msgid "About Gaim"
 msgstr "Info ber Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
@@ -2042,12 +2124,12 @@
 msgstr "Chat betreten als:"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -2060,7 +2142,7 @@
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Buddy"
 
@@ -2076,10 +2158,11 @@
 msgid "Un-Ignore"
 msgstr "Beachten"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "Ignorieren"
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, c-format
@@ -2123,15 +2206,15 @@
 msgstr "Flstern"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Sperren"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Warnen"
@@ -2145,16 +2228,14 @@
 msgstr "Gaim - Bild einfgen"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "Nachricht kann nicht gesendet werden: zu gro"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Nachrichten-Fehler"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "Nachricht kann nicht gesendet werden: Unbekannter Grund"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "Nachricht kann nicht gesendet werden: zu gro"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2166,156 +2247,156 @@
 msgid "Setting position to %d\n"
 msgstr "Setze Position auf %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Fetter Text"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Fett"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Kursiver Text"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Kursiv"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Unterstrichener Text"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Durchgestrichener Text"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Durchgestrichen"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Schrift verkleinern"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Klein"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Normale Schriftgre"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Schrift vergrern"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Gro"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Schriftart whlen "
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Text-Farbe"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Farbe"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Link einfgen"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Smiley-Gesicht einfgen"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "IM Bild einfgen"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr "Bild"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Mitschnitt aktivieren"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Speichern"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Klnge"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Unterhaltungen"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Nachricht senden als: "
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Icon speichern"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Animation deaktivieren"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Animation aktivieren"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
@@ -2359,388 +2440,409 @@
 "Sie sind dabei '%s' aus Ihrer\n"
 "Buddy-List zu entfernen. Fortsetzen?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - Nachricht-Benutzer"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "Nachricht an:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Benutzer:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "Konto"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Benutzer-Info holen"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Gruppe hinzufgen"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Gruppe hinzufgen"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Buddy hinzufgen"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Buddy hinzufgen"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Hinzufgen zu"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Ich bin abwesend!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Setze Privatsphre fr:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Allen Benutzern erlauben, mich zu kontaktieren"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Nur den untenstehenden Benutzern erlauben"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Erlauben"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Allen Usern verwehren"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Nur den untenstehenden Benutzern verwehren"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Verwehren"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte Buddy zum Alarmieren angeben."
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Buddy-Alarmierungsfehler"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Neuer Buddy-Alarm"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Wen alarmieren"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Konto"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Wann alarmieren"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Alarm beim Anmelden"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Alarm bei Rckkehr von Abwesenheit"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Alarm bei Rckkehr von Inaktivitt"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "Alarm wenn der Buddy schreibt"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Alarm-Aktion"
 
 # IM benutzen?
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "Nachricht-Fenster ffnen"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Popup-Benachrichtigung"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Befehl bei Alarm ausfhren"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Klang bei Alarm abspielen"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Diesen Alarm nach Aktivierung speichern"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Profil anlegen"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Profil"
 
 # Die bersetzung stimmt nicht, oder?
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Ermglicht Personen, Ihr Profil im Web zu finden"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Vorname"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Nachname"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Mdchenname"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Die neuen Passwrter stimmen nicht berein"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Fehler beim ndern des Passworts"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Bitte alle Felder komplett ausfllen"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "Altes Passwort"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Passwort-nderung"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "Altes Passwort"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Neues Passwort (wiederholen)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Benutzerinfo setzen"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Das Resultat Ihrer Suche:"
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Zulassen"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Sperren"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Zulassung hinzufgen"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Sperre hinzufgen"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Unterhaltungs-Mitschnitt"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Nach Buddies suchen"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Buddy nach Profil suchen"
 
 # E-Mail
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Buddy nach E-Mail-Adresse suchen"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Url hinzufgen"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Textfarbe auswhlen"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Hintergrundfarbe auswhlen"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importieren zu:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Buddy-Liste laden"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "Fgen Sie bitte einen Titel ein"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "Sie knnen keine leere Abwesenheitsmeldung erstellen"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Abwesenheits-Titel:"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "bernehmen"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Speichern & bernehmen"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Lchle!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Alias fr Buddy"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias fr Buddy"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "Keine Verbindung zum Host"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Mitschnitt speichern"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Datei %s kann nicht entfernt werden - %s"
-
-#: src/dialogs.c:4009
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "Konfigurationsdatei %s kann nicht geffnet werden."
+
+#: src/dialogs.c:4024
 msgid "Really clear log?"
 msgstr "Mitschnitt wirklich lschen?"
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Lschen"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Gruppe umbenennen"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Neuer Name:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Buddy umbenennen"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Buddy umbenennen"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Perl-Skript auswhlen"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Konfigurationsdatei %s kann nicht geffnet werden."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Einstellungen-Fehler"
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2750,10 +2852,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fehler: Verbindung kann nicht hergestellt werden.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr "Anmelde-Fehler"
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim konnte keine Nachricht senden"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2767,7 +2869,7 @@
 msgid "Browse"
 msgstr "Stbern"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Zurcksetzen"
 
@@ -2809,17 +2911,22 @@
 msgstr "Passwort eingeben"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Anmelde-Fehler"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Protokoll-Aktionen"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2828,40 +2935,40 @@
 "Protokoll nicht geladen haben oder da dieses Protokoll keine Anmelde-"
 "Funktion besitzt."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich lschen?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Konten-Editor"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Alles auswhlen"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "\"Auto\" auswhlen"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Nichts auswhlen"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "An-/Abmelden"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Lschen"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2870,28 +2977,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s konnte sich nicht anmelden"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Anmeldefehler"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "Hinweis"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s wurde abgemeldet"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perl-skripte"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim Plugin-Liste"
@@ -2900,10 +3007,12 @@
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
+#. Left side: frame with list of plugin file names
 #: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Geladene Plugins"
 
+#. Right side: frame with description and the filepath of plugin
 #: src/plugins.c:265
 #, fuzzy
 msgid "Selected Plugin"
@@ -2949,428 +3058,596 @@
 msgid "Close this window"
 msgstr "Dieses Fenster schlieen"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, fuzzy
+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:282
 #, fuzzy
-msgid "Windows"
-msgstr "Nachrichten-Fenster"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Debug-Fenster zeigen"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Randlose Knpfe benutzen"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Provinz/Bundesland"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Randlose Knpfe benutzen"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Fett"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Kursiv"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Unterstrichen"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Durchgestrichener Text"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Abbrechen"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "Smiley-Gesicht einfgen"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Smiley-Gesicht einfgen"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Auswhlen"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Text-Farbe"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Hintergrundfarbe"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Buddy-Anzeige"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "Text-Farbe"
+msgid "Show graphical _smileys"
+msgstr "Grafische Smileys anzeigen"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Zeit bei Nachrichten zeigen"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "URLs als Link zeigen"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Falsch geschriebene Wrter hervorheben"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Schriftfarben ignorieren"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Hintergrundfarbe"
+msgid "Ignore font _faces"
+msgstr "Schriftarten ignorieren"
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "Schriftgre ignorieren"
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "TiK-automatisierte Mitteilungen ignorieren"
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Enter-Taste verschickt Nachricht"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Strg+Enter-Taste verschickt Nachricht"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "Nachrichten-Fenster"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Esc schliet Fenster"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Esc schliet Fenster"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Strg-{B/I/U/S} fgt HTML-Tags ein"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Strg-(ziffer) fgt Smileys ein"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Unten"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Nachrichten/Info/Chat-Knpfe verstecken"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Grafische Smileys anzeigen"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Zeit bei Nachrichten zeigen"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Bild auf Knpfen anzeigen"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "URLs als Link zeigen"
+msgid "Buddy List Window"
+msgstr "Buddy-Listen-Fenster"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Falsch geschriebene Wrter hervorheben"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Fensterposition und -gre speichern"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Fenster bei Ereignis in Vordergrund bringen"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Gruppen-Anzeige"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Gruppen verstecken, wenn kein Buddy online ist"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Anzahl in Gruppe anzeigen"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Buddy-Anzeige"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "Typ-Icon fr Buddy anzeigen"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Warn-Stufen anzeigen"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Schriftfarben ignorieren"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Inaktivittszeiten anzeigen"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Schriftarten ignorieren"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Schriftgre ignorieren"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "TiK-automatisierte Mitteilungen ignorieren"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Enter-Taste verschickt Nachricht"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Strg+Enter-Taste verschickt Nachricht"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Inaktive Buddies grau anzeigen"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "Nachrichten-Fenster"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Neue Fensterbreite:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "Neue Fensterhhe:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Hhe des Eingabefelds:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Fenster bei Ereignis in Vordergrund bringen"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Fenster beim Senden verbergen"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Buddy-Icons"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Esc schliet Fenster"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Buddy-Icons verbergen"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Esc schliet Fenster"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Strg-{B/I/U/S} fgt HTML-Tags ein"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Strg-(ziffer) fgt Smileys ein"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Nachrichten/Info/Chat-Knpfe verstecken"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Bild auf Knpfen anzeigen"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Buddy-Liste automatisch beim Anmelden zeigen"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Buddy-Icon-Animation deaktivieren"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Anmeldungen im Fenster zeigen"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Popup-Benachrichtigung"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Buddies benachrichten, dass man Ihnen schreibt"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "Tabulator-Vervollstndigung"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Spitznamen vervollstndigen"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Alte Tabulator-Vervollstndigung"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Buddy-List beim Applet anzeigen"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Fensterposition und -gre speichern"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "Fenster bei Ereignis in Vordergrund bringen"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Gruppen verstecken, wenn kein Buddy online ist"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Anzahl in Gruppe anzeigen"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "Typ-Icon fr Buddy anzeigen"
+msgid "_Show people joining/leaving in window"
+msgstr "Eintretende im Fenster anzeigen"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Warn-Stufen anzeigen"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "Alle Chats in einem Reiter-Fenster zeigen"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Inaktivittszeiten anzeigen"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Inaktive Buddies grau anzeigen"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Neue Fensterbreite:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "Neue Fensterhhe:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Hhe des Eingabefelds:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Fenster bei Ereignis in Vordergrund bringen"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Fenster beim Senden verbergen"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Buddy-Icons verbergen"
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "Buddy-Icon-Animation deaktivieren"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Anmeldungen im Fenster zeigen"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Buddies benachrichten, dass man Ihnen schreibt"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Spitznamen vervollstndigen"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "Alte Tabulator-Vervollstndigung"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Eintretende im Fenster anzeigen"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "Aliase in Reitern/Titeln anzeigen"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "Chat"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "Alle Chats in einem Reiter-Fenster zeigen"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "Alle Chats in einem Reiter-Fenster zeigen"
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "Aliase in Reitern/Titeln anzeigen"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "Alle Chats in einem Reiter-Fenster zeigen"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Chats im selben Reiter-Fenster anzeigen"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Buddy-Liste"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Proxy-Typ"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Proxy-Server"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Rechner"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Benutzer"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Passwort"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "Proxy-Einstellungen"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "Per Vorgabe neues Fenster ffnen"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Nachrichten"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Alles mitschneiden"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "HTML aus Mitschnitt entfernen"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "System-Mitschnitt anzeigen"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "An/Abmeldung eines Buddies mitschneiden"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Mitschnitt, wenn Buddies in/aktiv werden"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Mitschneiden, wenn Buddys gehen oder wiederkommen"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Eigene Anmeldung/Leerlauf/Abwesenheit mitschneiden"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "Eigene Mitschnitts-Datei fr Anmeldung jedes Buddys"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Klang-Einstellungen"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "Kein Klang beim Anmelden"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Klnge bei Abwesenheit"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Klang-Ausgabesystem"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Klang-Abspielbefehl\n"
 "(%s fr Dateiname)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "Senden von Nachrichten hebt Abwesenheit auf"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Neue Nachrichten bei Abwesenheit sammeln"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "Neue Unterhaltungen bei Abwesenheit ignorieren"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "Keine automatische Antwort schicken"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "Keine automatische Antwort schicken"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Automatische Antwort nur bei Inaktivitt schicken"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "Inaktiv:"
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Abwesend"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Klang-Konfiguration"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "Testen"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Auswhlen..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Bearbeiten"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Instanz:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Schriftart"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Nachrichten"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "Nachrichten-Fenster"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Gruppenchat-Fenster"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Browser"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Klnge"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Klnge"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Abwesenheits-Titel:"
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Abwesenheits-Mitteilungen"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Einstellungen"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim Debug-Ausgabefenster"
 
 #: 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 "
@@ -3382,11 +3659,11 @@
 "leider nicht sagen, um welches es sich handelt. Unntz zu sagen, dass es "
 "nicht geladen werden konnte."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Protokoll-Fehler"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3394,42 +3671,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Protokoll-Aktionen"
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s benutze %s, welches entfernt wurde. %s ist jetzt offline."
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr "Trennen"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Akzeptieren?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - Anforderungszeichen"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Neue Post"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Mail ffnen"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s hat %s zum Buddy%s%s%s gemacht"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3440,7 +3708,7 @@
 "\n"
 "Mchten Sie sie zu Ihrer Buddy-List hinzufgen?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3448,15 +3716,15 @@
 "Sie haben momentan keine verfgbaren Protokolle, die das\n"
 "Registrieren neuer Benutzeraccounts ermglichen."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Anmeldung"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Anmeldungsinformationen"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "Anmelden"
 
@@ -3473,10 +3741,6 @@
 msgid "(1 message)"
 msgstr "(1 Nachricht)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Verwarnt"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Ja"
@@ -3533,12 +3797,172 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gadu-Gadu Fehler"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Gadu-Gadu Informationen"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "http-Anforderung konnten nicht versandt werden"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "Der Import der Buddy-Liste vom Server ist fehlgeschlagen (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "Der Export der Buddy-Liste zum Server ist fehlgeschlagen (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Das Lschen der Buddy-Liste vom Server ist fehlgeschlagen (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Die Verbindung mit dem Suchdienst ist fehlgeschlagen (%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "Das ndern des Passworts ist fehlgeschlagen (%s)"
+
+#~ msgid "No such nick/channel"
+#~ msgstr "Es gibt keinen solchen Spitznamen/Kanal"
+
+#~ msgid "IRC Error"
+#~ msgstr "Chat-Fehler"
+
+#~ msgid "No such server"
+#~ msgstr "Dieser Server existiert nicht"
+
+#~ msgid "IRC Part"
+#~ msgstr "IRC Part"
+
+#, fuzzy
+#~ msgid "Password Change Error!"
+#~ msgstr "Gaim - Passwort-nderung"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - Passwort-nderung"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Ungltiger Name"
+
+#~ msgid "MSN Error"
+#~ msgstr "MSN-Fehler"
+
+#~ msgid "Invalid name"
+#~ msgstr "Ungltiger Name"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Chat-Fehler!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Chat"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Fehler"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Oscar SNAC Fehler"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Grund unbekannt"
+
+#~ msgid "AOL error"
+#~ msgstr "AOL-Fehler"
+
+#~ msgid "Error"
+#~ msgstr "Fehler"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Benutzer warnen?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC Fortsetzung"
+
+#~ msgid "Chat Error"
+#~ msgstr "Chat-Fehler"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC Pause"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "Dateikopf konnte nicht geschrieben werden!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Anmeldeversuch..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Offline. Hier klicken, um das Anmeldefenster zu ffnen."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Abwesend: %d ausstehend."
+
+#~ msgid "Away."
+#~ msgstr "Abwesend."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Gaim-Applet kann nicht erstellt werden"
+
+# "Info" ist die offizielle GNOME-bersetzung
+#~ msgid "About..."
+#~ msgstr "Info..."
+
+#~ msgid "Message Error"
+#~ msgstr "Nachrichten-Fehler"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "Nachricht kann nicht gesendet werden: Unbekannter Grund"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Buddy-Alarmierungsfehler"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Fehler beim ndern des Passworts"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "Datei %s kann nicht entfernt werden - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "Einstellungen-Fehler"
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr "Anmelde-Fehler"
+
+#~ msgid "Login Error"
+#~ msgstr "Anmelde-Fehler"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl-skripte"
+
+#~ msgid "Select"
+#~ msgstr "Auswhlen"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Buddy-Liste automatisch beim Anmelden zeigen"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Buddy-List beim Applet anzeigen"
+
+#~ msgid "Edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Protokoll-Fehler"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Protokoll-Aktionen"
+
+#~ msgid "Disconnect"
+#~ msgstr "Trennen"
+
+#~ msgid "Warned"
+#~ msgstr "Verwarnt"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Buddy-Ticker zeigen"
 
-#~ msgid "General Options"
-#~ msgstr "Allgemeine Einstellungen"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr ""
 #~ "Alle Einstellungen werden sofort wirksam, wenn nicht anders angegeben."
@@ -3570,9 +3994,6 @@
 #~ msgid "Galeon"
 #~ msgstr "Galeon"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Proxy-Einstellungen"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3580,9 +4001,6 @@
 #~ "Nicht alle Protokolle knnen diese Proxy-Einstellungen nutzen. Bitte "
 #~ "lesen Sie die README-Datei."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Proxy-Typ"
-
 #~ msgid "No Proxy"
 #~ msgstr "Kein Proxy"
 
@@ -3598,24 +4016,12 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Einstellungen fr Buddy-Liste"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Buddy-Listen-Fenster"
-
 #~ msgid "Tab Placement:"
 #~ msgstr "Reiter-Platzierung:"
 
 #~ msgid "Top"
 #~ msgstr "Oben"
 
-#~ msgid "Bottom"
-#~ msgstr "Unten"
-
-#~ msgid "Group Displays"
-#~ msgstr "Gruppen-Anzeige"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Buddy-Anzeige"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Unterhaltungens-Einstellungen"
 
@@ -3658,18 +4064,12 @@
 #~ msgid "Right"
 #~ msgstr "Rechts"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Buddy-Icons"
-
 #~ msgid "Chat Options"
 #~ msgstr "Chat-Optionen"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Alle Unterhaltungen im selben Reiter-Fenster zeigen"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Tabulator-Vervollstndigung"
-
 #~ msgid "Font Options"
 #~ msgstr "Schriften-Optionen"
 
@@ -3682,12 +4082,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Schriftgre fr Text"
 
-#~ msgid "Sound Options"
-#~ msgstr "Klang-Einstellungen"
-
-#~ msgid "Sound method"
-#~ msgstr "Klang-Ausgabesystem"
-
 #~ msgid "Sound played when:"
 #~ msgstr "Klang abspielen bei:"
 
@@ -3700,9 +4094,6 @@
 #~ msgid "minutes using"
 #~ msgstr "Minuten und benutze"
 
-#~ msgid "Messages"
-#~ msgstr "Nachrichten"
-
 #~ msgid "Make Away"
 #~ msgstr "Jetzt abwesend"
 
--- a/po/es.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/es.po	Tue Aug 27 02:43:54 2002 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.60\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-02-23 18:05+0100\n"
 "Last-Translator: Alex Villar <alx5000@terra.es>\n"
 "Language-Team:  <es@li.org>\n"
@@ -25,9 +25,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Cerrar"
 
@@ -40,16 +40,17 @@
 msgid "Refresh"
 msgstr "Refrescar"
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Aadir"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Quitar"
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -91,7 +93,7 @@
 msgid "Change"
 msgstr "Canal:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "En lnea"
 
@@ -99,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "Disponible slo para los amigos"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Ausente"
 
@@ -116,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "Invisible slo para los amigos"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "No disponible"
 
@@ -150,7 +152,7 @@
 msgid "Unknown Error Code."
 msgstr "Cdigo de error desconocido."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
@@ -221,16 +223,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Se est intentando enviar un mensaje a un UIN invlido!"
 
-#: 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 "Error de Gadu-Gadu"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "No se pudieron obtener los resultados de la bsqueda"
@@ -276,109 +268,152 @@
 msgid "Sex"
 msgstr "Sexo"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Ciudad"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Lo sentimos! No hay una lista de amigos almacenada en el servidor."
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "No se pudo importar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:814
 #, fuzzy
-msgid "Buddy List successfully transferred to server"
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Se envo la lista de amigos correctamente al servidor"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Informacin de Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:821
+#: src/protocols/gg/gg.c:819
 #, fuzzy
-msgid "Couldn't transfer Buddy List to server"
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "No se pudo enviar la lista de amigos al servidor"
 
-#: src/protocols/gg/gg.c:827
+#: src/protocols/gg/gg.c:825
 #, fuzzy
-msgid "Buddy List sucessfully deleted from server"
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "La lista de amigos se borr correctamente del servidor"
 
-#: src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:830
 #, fuzzy
-msgid "Couldn't delete Buddy List from server"
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "No se pudo borrar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "La contrasea se cambi correctamente"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "No se pudo cambiar la contrasea"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "No se pudo enviar una peticin http"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "No se pudo importar la lista de amigos del servidor (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "No se pudo exportar la lista de amigos al servidor (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Fall el borrado de amigos en el servidor (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Fall la conexin al servicio de bsqueda (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Fall el cambio de Contrasea (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "No se pudo importar la lista de amigos del servidor"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "No se pudo conectar a IM"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "No se puede enviar la contrasea"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Bsqueda en el Directorio"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Cambiar Contrasea"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Importar Lista de Amigos del servidor"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Exportar Lista de Amigos al Servidor"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Borrar Lista de Amigos del Servidor"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "No se pudo leer archivo %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Enviar mensajes a travs del servidor"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Obtener Informacin"
@@ -394,20 +429,16 @@
 msgstr "<B>%s ha cambiado el topic a: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "No existe el apodo/canal"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "Error de IRC"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "No existe el servidor"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "No se indic un apodo"
 
 #: src/protocols/irc/irc.c:976
@@ -423,8 +454,8 @@
 msgstr "No se pudo escribir"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Ha sido expulsado de %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -437,10 +468,6 @@
 msgid "You have left %s"
 msgstr "Ha abandonado %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "Salir de IRC"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Canal:"
@@ -455,247 +482,268 @@
 msgstr "Hablar"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - Cambiar Contrasea"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "No se puede enviar la contrasea"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "No se puede enviar la contrasea"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 #, fuzzy
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Conectado"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "Ausencia Extendida"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "No Molestar"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Error de Mensaje"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Cdigo de error desconocido"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "El usuario %s (%s) quiere aadirle a su lista de amigos"
 
-#: src/protocols/jabber/jabber.c:1655
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
 #, fuzzy
-msgid "No such user"
+msgid "No such user."
 msgstr "No existe el usuario"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-#, fuzzy
-msgid "Jabber Error"
-msgstr "Error de Mensaje"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Amigos"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autorizando"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 #, fuzzy
 msgid "Unknown login error"
 msgstr "Cdigo de error desconocido."
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "La contrasea se cambi correctamente"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - Cambiar Contrasea"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 #, fuzzy
 msgid "Connection lost"
 msgstr "Conexin Cerrada"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 #, fuzzy
 msgid "Unable to connect"
 msgstr "No se pudo conectar."
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 #, fuzzy
 msgid "Connected"
 msgstr "Conectado"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "Fall la Autorizacin"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 #, fuzzy
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
 #, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "Usuario no vlido"
-
-#: src/protocols/jabber/jabber.c:2648
+msgid "Jabber Error"
+msgstr "Error de Mensaje"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Sala:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "Gestor:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "No se pudo conectar."
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Hablar"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Ver registro"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Mensaje de Ausencia"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Notificacin con un Popup"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 #, fuzzy
 msgid "Full Name"
 msgstr "Nombre Completo"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 #, fuzzy
 msgid "Family Name"
 msgstr "Nombre"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 #, fuzzy
 msgid "Given Name"
 msgstr "Apellido de Soltera"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 #, fuzzy
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Calle"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "Direccin extendida"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "Localidad"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Regin"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "Cdigo postal"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Pas"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 #, fuzzy
 msgid "Telephone"
 msgstr "Numero de telefono"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "Correo Electrnico"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Nombre de empresa"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Ttulo"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 #, fuzzy
 msgid "Role"
 msgstr "Papel"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 #, fuzzy
 msgid "Birthday"
 msgstr "Ao de nacimiento"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Descripcin"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -703,24 +751,24 @@
 "Todos los campos siguientes son opcionales. Introduzca solo la "
 "informacinque siente confortable compartir"
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 #, fuzzy
 msgid "User Identity"
 msgstr "Informacin de Usuario"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Editar datos en Jabber"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "Registro en el servidor efectuado exitosamente"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Error desconocido al registrar"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 #, fuzzy
 msgid "Set User Info"
 msgstr "Informacin de Usuario"
@@ -885,108 +933,126 @@
 msgid "Unknown Error Code"
 msgstr "Cdigo de error desconocido."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "Error de MSN"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+#, fuzzy
+msgid "An MSN message may not have been received."
 msgstr "Puede que no se haya recibido un mensaje"
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim no pudo envar el mensaje"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "El usuario %s (%s) quiere aadirle a su lista de amigos"
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "El usuario %s (%s) quiere aadirle a su lista de amigos"
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Ha sido desconectado al conectar desde otra ubicacin"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 msgid "Error reading from server"
 msgstr "Error al leer del servidor"
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr "Enviando contrasea"
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 msgid "Unable to send password"
 msgstr "No se puede enviar la contrasea"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 msgid "Password sent"
 msgstr "Contrasea enviada"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 msgid "Unable to write to server"
 msgstr "No se puede escribir al servidor"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 msgid "Synching with server"
 msgstr "Redirigiendo al servidor"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Busy"
 msgstr "No Disponible"
 
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr "Al telfono"
-
-#: src/protocols/msn/msn.c:1926
-msgid "Out To Lunch"
-msgstr "Sal a comer"
-
 #: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr "Al telfono"
+
+#: src/protocols/msn/msn.c:1928
+msgid "Out To Lunch"
+msgstr "Sal a comer"
+
+#: src/protocols/msn/msn.c:1929
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr "Actualizar nombre"
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+#, fuzzy
+msgid "New MSN friendly name too long."
 msgstr "Nombre demasiado largo"
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 msgid "Set Friendly Name"
 msgstr "Establecer nombre"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Establecer nombre"
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr "Actualizar todos los nombres"
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
-msgstr "Nombre no vlido"
-
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
+msgstr "Nombre de usuario no vlido"
+
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Unirse a qu grupo:"
@@ -1019,60 +1085,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala: %s"
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Error de Conversacin!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "La conversacin no est disponible"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Conversaciones"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al host"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Contrasea enviada, esperando respuesta\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "error interno de conexin\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Desconectado.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Conexin establecida, cookie enviada"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contrasea incorrecta."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Su cuenta est deshabilitada actualmente."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1081,26 +1142,49 @@
 "intntelo de nuevo. Si sigue intentndolo, necesitar esperar incluso ms "
 "tiempo."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 "La versin del cliente que usa es demasiado antigua. Por favor, actualcela "
 "en "
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Fall la Autorizacin"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim no pudo envar el mensaje"
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "Gaim no pudo envar el mensaje"
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Se estableci un IM Directo con %s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1111,123 +1195,111 @@
 "laSiguiente razon:\n"
 "\n"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "No se indic una razn"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - Autorizacin ICQ negada"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, fuzzy, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "El usuario %d ha autorizado su peticin de aadirlo a su lista de contactos"
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim - Autorizacion ICQ aceptada"
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Usted perdi el mensaje %d de %s porque era invlido."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Usted perdi %d mensajes de %s porque eran invlidos."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Usted perdi el mensaje %d de %s porque era demasiado grande."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Usted perdi %d mensajes de %s porque eran demasiado grandes."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Usted perdi el mensaje %d de %s porque se excedi el lmite de cadencia."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr ""
 "Usted perdi %d mensajes de %s porque se excedi el lmite de cadencia."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Usted perdi el mensaje %d de %s porque era demasiado malvado."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Usted perdi %d mensajes de %s porque son demasiado malvados."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Usted perdi %d mensajes de %s porque es demasiado malvado."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Usted perdi %d mensajes de %s porque es demasiado malvado."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Usted perdi el mensaje %d de %s por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Usted perdi %d mensajes de %s por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Error de Gaim"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC envi el error: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Error de OSCAR SNAC"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Su mensaje a %s no fu enviado: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Motivo desconocido"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "No se indic una razn"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Informacin de usuario de %s no disponible: %s"
@@ -1339,50 +1411,87 @@
 msgstr "<i>No se aport informacin</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Su conexin puede haberse perdido."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "Error de AOL"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "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:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Error"
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr "Gaim - Autorizacin ICQ negada"
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr "Gaim - Autorizacion ICQ aceptada"
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "No se pudo leer archivo %s."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim no pudo envar el mensaje"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - Advertir al usuario?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Intercambio:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a IM"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1393,30 +1502,30 @@
 "permitir ver su direccin IP y puede ser un riesgo de seguridad. Desea "
 "continuar?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Mensaje de Ausencia"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "IM Directo"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Obtener funcionalidades"
 
@@ -1551,49 +1660,43 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC ha terminado su pausa. Ya puede volver a mandar mensajes."
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "Continar con el TOC"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Error de Conversacin"
-
 #: src/protocols/toc/toc.c:782
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Se cambi la Contrasea con xito"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Cambiar Contrasea"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC ha enviado la orden de PAUSA. Cuando esto ocurre, TOC ignora todos los "
 "mensajes que se le envan y puede expulsarle si enva mensajes. Gaim evitar "
 "que le llegue nada. Esto es slo temporal, por favor, sea paciente."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "Pausa de TOC"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Obtener Informacin del Directorio"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "No se pudo conectar para realizar la transferencia!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "No se pudo conectar para realizar la transferencia!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "No se pudo escribir la cabecera del archivo!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1615,22 +1718,23 @@
 msgstr "%s le pide que le mande un archivo"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje no se envi."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Clase:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Instancia:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Destinatario:"
 
@@ -1655,10 +1759,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1703,6 +1808,9 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (autor original)      [ 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 "Pgina Web"
@@ -1712,13 +1820,10 @@
 msgstr "Desconectar"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Por favor, indique su nombre de cuenta"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Error de Conexin"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Conexin - Gaim"
@@ -1759,40 +1864,11 @@
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Auto Conectarse"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Tratando de conectar..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Desconectado. Haga click para abrir ventana para conectarse."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Ausente: %d en espera."
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Ausente."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Nuevo Mensaje de Ausencia"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "No pudo crearse el programa Gaim"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "Acerca de..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Ausente!"
@@ -1805,6 +1881,10 @@
 msgid "Back"
 msgstr "Retroceder"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Nuevo Mensaje de Ausencia"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Quitar Mensaje de Ausencia"
@@ -1813,7 +1893,7 @@
 msgid "Set All Away"
 msgstr "Ausente en todas las cuentas"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Grupo"
 
@@ -1823,12 +1903,13 @@
 msgstr "Mensaje"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Informacin"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1848,10 +1929,6 @@
 msgid "Un-Alias"
 msgstr "Quitar Alias"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "Aviso de Amigo"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "Nuevo Aviso de Amigo"
@@ -1908,7 +1985,7 @@
 msgid "Information on selected Buddy"
 msgstr "Informacin sobre el Amigo seleccionado"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Mandar Mensaje Instantneo"
 
@@ -1936,7 +2013,7 @@
 msgid "New Instant Message"
 msgstr "Nuevo Mensaje Instantneo"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Informacin de Usuario"
 
@@ -1948,6 +2025,10 @@
 msgid "Tools"
 msgstr "Herramientas"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "Aviso de Amigo"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Acciones del Protocolo"
@@ -1994,7 +2075,7 @@
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Lista de Amigos"
 
@@ -2027,12 +2108,12 @@
 msgstr "Unirse a Conversacin como:"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2045,7 +2126,7 @@
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Amigo"
 
@@ -2061,10 +2142,11 @@
 msgid "Un-Ignore"
 msgstr "No Ignorar"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "Ignorar"
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, c-format
@@ -2108,15 +2190,15 @@
 msgstr "Susurrar"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Enviar"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Advertir"
@@ -2131,16 +2213,14 @@
 msgstr "Gaim - Insertar Imagen"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "No se pudo enviar el mensaje: Demasiado grande"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Error de Mensaje"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "No se pudo enviar el mensaje: Motivo desconocido"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "No se pudo enviar el mensaje: Demasiado grande"
 
 #: src/conversation.c:1559
 #, fuzzy, c-format
@@ -2152,159 +2232,159 @@
 msgid "Setting position to %d\n"
 msgstr "Moviendo posicin a %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Texto en Negrita"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Negrita"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Texto Inclinado"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Inclinado"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Subrayar Texto"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Subrayar"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Tachar el Texto"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Tachar"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Disminuir tamao de fuente"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Pequeo"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Tamao de fuente normal"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Incrementar tamao de fuente"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Seleccionar fuente"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Fuente"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Color del texto"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Color"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Color del fondo"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Insertar Enlace"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Enlace"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Insertar smiley"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Imagen de IM"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Image"
 msgstr "Imagen"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Habilitar registro"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Registro"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Guardar Conversacin"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Guardar"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 #, fuzzy
 msgid "Toggle Sound"
 msgstr "Habilitar/Deshabilitar Registro"
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversaciones"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Enviar mensaje como:"
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Guardar Icono"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Deshabilitar Animaciones"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Habilitar Animaciones"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Ocultar Icono"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Guardar Icono Como..."
 
@@ -2348,386 +2428,407 @@
 "Est a punto de borrar a '%s' \n"
 "de su lista de amigos. Desea continuar?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Aceptar"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - Usuario de IM"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "Quien: "
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Usuario:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "Cuenta"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Obtener Informacin del Usuario"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Aadir Grupo"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Aadir Grupo"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Aadir Amigo"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Aadir Amigo"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Contacto"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Aadir a"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Ausente!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Privacidad para"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Permitir slo a los siguientes usuarios"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Lista de Usuarios Permitidos"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Negar a todos"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Bloquear los siguientes usuarios"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Lista de Bloqueados"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Por favor indique el amigo con aviso."
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Error en Aviso de Amigo"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuevo Aviso de Amigo"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Avisar a quin"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Avisar Cundo"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Aviso al conectarse"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Aviso al dejar de estar ausente"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Aviso al dejar de estar inactivo"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Aviso cuando el amigo le est escribiendo"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Accin del Aviso"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "Abrir Ventana de Mensage"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Notificacin con un Popup"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Enviar Mensaje"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Ejecutar orden para avisar"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Avisar mediante sonido"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Guardar este aviso tras la activacin"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Crear Informacin del directorio"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Informacin del Directorio"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dejar que bsquedas en la Web encuentren su informacin"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Segundo Nombre"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Apellido"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Apellido de Soltera"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Estado"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Las contraseas no coinciden"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Error cambiando la contrasea"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Rellene todos los campos completamente"
 
-#: src/dialogs.c:2172
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Cambiar Contrasea"
+
+#: src/dialogs.c:2186
 msgid "Original Password"
 msgstr "Contrasea Original"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Nueva Contrasea"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Nueva Contrasea (de nuevo)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Crear Informacin del Usuario"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "A continucacin, los resultados de su bsqueda: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Negar"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Aadir Permiso"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Aadir Negacin"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Guardar Conversacin"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Buscar un Amigo"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Encontrar amigo por informacin"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electrnico"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Aadir URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Seleccionar Color del Texto"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Seleccionar Color de Fondo"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importar a:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar Lista de Amigos"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "No se puede crear un mensaje sin ttulo"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "No se puede crear un mensaje de ausencia vaco"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Ttulo del mensaje de ausencia: "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Usar"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Guardar y Usar"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Sonrisa!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Aadir Alias al Amigo"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Aadir Alias al Amigo"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "No se pudo conectar al host"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Guardar Archivo de Registro"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "No se pudo borrar archivo %s - %s."
-
-#: src/dialogs.c:4009
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "No se pudo abrir el archivo de configuracin %s."
+
+#: src/dialogs.c:4024
 msgid "Really clear log?"
 msgstr "Limpiar el registro?"
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Fecha"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Conversacin"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Renombrar Grupo"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Renombrar Grupo"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Nuevo Nombre:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Renombrar Amigo"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Renombrar Amigo"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Seleccionar Script en Perl"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "No se pudo abrir el archivo de configuracin %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Error en las Preferencias"
-
 #: src/html.c:183
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
@@ -2737,9 +2838,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error abriendo la conexin. \n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
-msgid "Plugin Error"
-msgstr "Error de aadido"
+#: src/module.c:106 src/module.c:112
+#, fuzzy
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim no pudo envar el mensaje"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2753,7 +2855,7 @@
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Resetear"
 
@@ -2795,17 +2897,23 @@
 msgstr "Introduzca Contrasea"
 
 #: src/multi.c:948
+#, fuzzy
+msgid "TOC not found."
+msgstr "archivo no encontrado: %s\n"
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Error de Conexin"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Acciones del Protocolo"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2813,40 +2921,40 @@
 "No se puede conectar con esta cuenta; no se dispone del protocolo que usa, o "
 "el protocolo no dispone de la funcin de conexin."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Seguro que quiere borrar a %s?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor de Cuentas"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Seleccionar Todo"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Seleccionar Auto"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "No Seleccionar Nada"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Conectar/Desconectar"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2855,29 +2963,29 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s no pudo conectarse"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Error de Conexin"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "Aviso"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s no pudo conectarse"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 #, fuzzy
 msgid "Connection Error"
 msgstr "Error de Conexin"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Scripts de Perl"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista de Plugins"
@@ -2886,10 +2994,12 @@
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
+#. Left side: frame with list of plugin file names
 #: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Plugins cargados"
 
+#. Right side: frame with description and the filepath of plugin
 #: src/plugins.c:265
 #, fuzzy
 msgid "Selected Plugin"
@@ -2935,430 +3045,596 @@
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr "Opciones Generales"
+
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:282
 #, fuzzy
-msgid "Windows"
-msgstr "Ventana de Mensajes"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Mostrar ventana de Depuracin"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Usar botones sin bordes"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Estado"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Usar botones sin bordes"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Negrita"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Inclinado"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Subrayar"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Tachar el Texto"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Cancelar"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "Insertar smiley"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Insertar smiley"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Seleccionar"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Color del texto"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Color del fondo"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Amigos"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "Color del texto"
+msgid "Show graphical _smileys"
+msgstr "Mostar caritas grficas"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Mostar la hora de los mensajes"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "Mostrar URLs como enlaces"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Destacar las faltas de ortografa"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Ignorar colores"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Color del fondo"
+msgid "Ignore font _faces"
+msgstr "Ignorar estilos de fuente"
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "Ignorar tamaos de fuente"
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "Ignorar Mensaje automticos de TiK"
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Enter enva el mensaje"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Control-Enter enva el mensaje"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "Ventana de Mensajes"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Escape cierra la ventana"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Escape cierra la ventana"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Control-{B/I/U/S} inserta etiquetas HTML"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Control-(nmero) inserta smileys"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Abajo"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Ocultar Botones de IM/Info/Chat"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Mostar caritas grficas"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Mostar la hora de los mensajes"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Mostrar dibujos en los botones"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Mostrar URLs como enlaces"
+msgid "Buddy List Window"
+msgstr "Ventana de la Lista de Amigos"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Destacar las faltas de ortografa"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Guardar el Tamao/Posicin de las Ventanas"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Alzar ventanas cuando se reciba un evento"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Grupos"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Ocultar los grupos sin miembros conectados"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Mostar nmeros en los grupos"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Amigos"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "Mostar iconos de los tipos de amigos"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Mostrar niveles de aviso"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Ignorar colores"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Mostar el tiempo de inactividad"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Ignorar estilos de fuente"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Ignorar tamaos de fuente"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignorar Mensaje automticos de TiK"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Enter enva el mensaje"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Control-Enter enva el mensaje"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Poner en gris a los amigos inactivos"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "Ventana de Mensajes"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Ancho de la nueva ventana:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "Alto de la nueva ventana:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Alto del campo de texto:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Alzar ventanas cuando se reciba un evento"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Esconder la ventana al enviar"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Iconos de Amigos"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Escape cierra la ventana"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Ocultar Iconos de Amigos"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Escape cierra la ventana"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} inserta etiquetas HTML"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(nmero) inserta smileys"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Ocultar Botones de IM/Info/Chat"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Mostrar dibujos en los botones"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Mostrar automticamente la lista de amigos al conectarse"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Deshabilitar Animaciones"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Mostar cuando los amigos se conectan/desconectan en la ventana"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Notificacin con un Popup"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Notificar a los amigos cuando les este escribiendo"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "Tabulador"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Tabulador completa los Apodos"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Tabulador al estilo antiguo"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Mostar Lista de Amigos cerca del applet"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Guardar el Tamao/Posicin de las Ventanas"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "Alzar ventanas cuando se reciba un evento"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Ocultar los grupos sin miembros conectados"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Mostar nmeros en los grupos"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "Mostar iconos de los tipos de amigos"
+msgid "_Show people joining/leaving in window"
+msgstr "Mostrar la gente que se conecta/desconecta en la ventana"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Mostrar niveles de aviso"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "Mostar todos los Chats en una ventana con pestaas"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Mostar el tiempo de inactividad"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Poner en gris a los amigos inactivos"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Ancho de la nueva ventana:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "Alto de la nueva ventana:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Alto del campo de texto:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Alzar ventanas cuando se reciba un evento"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Esconder la ventana al enviar"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Ocultar Iconos de Amigos"
-
-#: src/prefs.c:578
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "Mostrar alias en las pestaas/ttulos"
+
+#: src/prefs.c:536
 #, fuzzy
-msgid "Disable Buddy Icon Animation"
-msgstr "Deshabilitar Animaciones"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Mostar cuando los amigos se conectan/desconectan en la ventana"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Notificar a los amigos cuando les este escribiendo"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Tabulador completa los Apodos"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "Tabulador al estilo antiguo"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Mostrar la gente que se conecta/desconecta en la ventana"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+msgid "Chat Tabs"
+msgstr "Hablar"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "Mostar todos los Chats en una ventana con pestaas"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "Mostar todos los Chats en una ventana con pestaas"
-
-#: src/prefs.c:675
-msgid "Show aliases in tabs/titles"
-msgstr "Mostrar alias en las pestaas/ttulos"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "Mostar todos los Chats en una ventana con pestaas"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Mostar todas los chats en una unica ventana con pestaas"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Lista de Amigos"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Tipo de Proxy"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Servidor Proxy"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Host"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Puerto"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Usuario"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Contrasea"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Selection"
+msgstr "Opciones del Navegador"
+
+#: src/prefs.c:697
+msgid "Browser Options"
+msgstr "Opciones del Navegador"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "Crear una nueva ventana por omisin"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Mensajes"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Guardar todas las conversaciones"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "Quitar HTML de los registros"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Ver Registro del Sistema"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "Registrar cundo se concetan/desconcetan los amigos"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Registrar cundo los amigos estn activos/inactivos"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Registrar cundo los amigos se ausentan o regresan"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Registrar sus propias conexiones/ausencias/inactividades"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "Un archivo de registro para la conexin de cada Amigo"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Opciones de Sonido"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "Sin sonido al conectarse"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Sonidos mientras se est ausente"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Metodo para reproducin de Sonido"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Comando para sonido\n"
 "(%s para nombre de archivo"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "El envo de un mensaje quita el estado de ausencia"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Encolar nuevos mensajes durante las ausencias"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "Ignorar nuevas conversaciones mientras es ausente"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "No enviar respuesta automtica"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "No enviar respuesta automtica"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Slo enviar respuesta automtica en Inactivo"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+msgid "Idle"
+msgstr "Ausente"
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Ausente"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Configuracin del Sonido"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 #, fuzzy
 msgid "Test"
 msgstr "Probar"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Seleccionar..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Editar"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Editar"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Instancia:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Fuente"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Mensaje"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "Ventana de Mensajes"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Ventana del Chat en Grupo"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Eventos"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Ttulo del mensaje de ausencia: "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Mensajes de Ausencia"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
-#: src/prefs.c:1842
-#, fuzzy
-msgid "Apply"
-msgstr "Aplique"
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim ventana de respuestas del programa"
 
 #: 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 "
@@ -3369,11 +3645,11 @@
 "esta aplicacin. Por desgracia, al no ser la misma versin, no se puede "
 "determinar cul es. No hace falta decir que no se pudo usar con xito"
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Error de Protocolo"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3381,42 +3657,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Acciones del Protocolo"
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s usaba %s, que fue eliminado. %s ahora est desconectado."
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr "Desconectado"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Aceptar?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - Preguntar"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Correo Nuevo"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Abrir Correo"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s ha hecho %s a sus amigos %s%s%s"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3427,21 +3694,21 @@
 "\n"
 "Desea aadirlos a su lista de amigos?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "No dispone de ningn protocolo que permita registrar cuentas nuevas."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Registro"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Informacin de Registro"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "Registrar"
 
@@ -3458,10 +3725,6 @@
 msgid "(1 message)"
 msgstr "(1 mensaje)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Advertido"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "S"
@@ -3519,15 +3782,177 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Error de Gadu-Gadu"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Informacin de Gadu-Gadu"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "No se pudo enviar una peticin http"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "No se pudo importar la lista de amigos del servidor (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "No se pudo exportar la lista de amigos al servidor (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Fall el borrado de amigos en el servidor (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Fall la conexin al servicio de bsqueda (%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "Fall el cambio de Contrasea (%s)"
+
+#~ msgid "No such nick/channel"
+#~ msgstr "No existe el apodo/canal"
+
+#~ msgid "IRC Error"
+#~ msgstr "Error de IRC"
+
+#~ msgid "No such server"
+#~ msgstr "No existe el servidor"
+
+#~ msgid "IRC Part"
+#~ msgstr "Salir de IRC"
+
+#, fuzzy
+#~ msgid "Password Change Error!"
+#~ msgstr "Gaim - Cambiar Contrasea"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - Cambiar Contrasea"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Usuario no vlido"
+
+#~ msgid "MSN Error"
+#~ msgstr "Error de MSN"
+
+#~ msgid "Invalid name"
+#~ msgstr "Nombre no vlido"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Error de Conversacin!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Conversaciones"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Error de Gaim"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Error de OSCAR SNAC"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Motivo desconocido"
+
+#~ msgid "AOL error"
+#~ msgstr "Error de AOL"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Advertir al usuario?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "Continar con el TOC"
+
+#~ msgid "Chat Error"
+#~ msgstr "Error de Conversacin"
+
+#~ msgid "TOC Pause"
+#~ msgstr "Pausa de TOC"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "No se pudo escribir la cabecera del archivo!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Tratando de conectar..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Desconectado. Haga click para abrir ventana para conectarse."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Ausente: %d en espera."
+
+#~ msgid "Away."
+#~ msgstr "Ausente."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "No pudo crearse el programa Gaim"
+
+#~ msgid "About..."
+#~ msgstr "Acerca de..."
+
+#~ msgid "Message Error"
+#~ msgstr "Error de Mensaje"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "No se pudo enviar el mensaje: Motivo desconocido"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Error en Aviso de Amigo"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Error cambiando la contrasea"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "No se pudo borrar archivo %s - %s."
+
+#~ msgid "Preferences Error"
+#~ msgstr "Error en las Preferencias"
+
+#~ msgid "Plugin Error"
+#~ msgstr "Error de aadido"
+
+#~ msgid "Login Error"
+#~ msgstr "Error de Conexin"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Scripts de Perl"
+
+#~ msgid "Select"
+#~ msgstr "Seleccionar"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Mostrar automticamente la lista de amigos al conectarse"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Mostar Lista de Amigos cerca del applet"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#, fuzzy
+#~ msgid "Apply"
+#~ msgstr "Aplique"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Error de Protocolo"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Acciones del Protocolo"
+
+#~ msgid "Disconnect"
+#~ msgstr "Desconectado"
+
+#~ msgid "Warned"
+#~ msgstr "Advertido"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Mostrar ventana de noticias"
 
 #~ msgid "Away from the computer"
 #~ msgstr "Ausente"
 
-#~ msgid "Idle"
-#~ msgstr "Ausente"
-
 #~ msgid "Be right back"
 #~ msgstr "Vuelvo enseguida"
 
@@ -3540,9 +3965,6 @@
 #~ msgid "Enable sounds"
 #~ msgstr "Habilitar Sonidos"
 
-#~ msgid "General Options"
-#~ msgstr "Opciones Generales"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr ""
 #~ "Todas la opciones toman efecto inmediatamente si no se indica lo contrario"
@@ -3590,9 +4012,6 @@
 #~ "No todos los protocolos pueden usar estas opciones del proxy. Por favor, "
 #~ "lea el archivo README para ver los detalles."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Tipo de Proxy"
-
 #~ msgid "No Proxy"
 #~ msgstr "Sin Proxy"
 
@@ -3608,9 +4027,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Opciones de la Lista de Amigos"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Ventana de la Lista de Amigos"
-
 #, fuzzy
 #~ msgid "Tab Placement:"
 #~ msgstr "Ubicacin de las pestaas"
@@ -3618,15 +4034,6 @@
 #~ msgid "Top"
 #~ msgstr "Arriba"
 
-#~ msgid "Bottom"
-#~ msgstr "Abajo"
-
-#~ msgid "Group Displays"
-#~ msgstr "Grupos"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Amigos"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Opciones de Conversacin"
 
@@ -3669,15 +4076,9 @@
 #~ msgid "Right"
 #~ msgstr "Derecha"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Iconos de Amigos"
-
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Mostar todas las conversaciones en una ventana con pestaas"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Tabulador"
-
 #~ msgid "Font Options"
 #~ msgstr "Opciones de Fuente"
 
@@ -3690,13 +4091,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Tamao de Fuente para el Texto"
 
-#~ msgid "Sound Options"
-#~ msgstr "Opciones de Sonido"
-
-#, fuzzy
-#~ msgid "Sound method"
-#~ msgstr "Metodo para reproducin de Sonido"
-
 #, fuzzy
 #~ msgid "Sound played when:"
 #~ msgstr "Reproducir Sonidos en:"
@@ -3754,9 +4148,6 @@
 #~ msgid "Gaim - Buddy"
 #~ msgstr "Gaim - Amigo"
 
-#~ msgid "file not found: %s\n"
-#~ msgstr "archivo no encontrado: %s\n"
-
 #~ msgid "by Email"
 #~ msgstr "por Correo Electronico"
 
@@ -3820,9 +4211,6 @@
 #~ msgid "couldn't resolve host\n"
 #~ msgstr "no se pudo resolver la direccin\n"
 
-#~ msgid "Browser Options"
-#~ msgstr "Opciones del Navegador"
-
 #~ msgid "Logging Options"
 #~ msgstr "Options de Conexin"
 
--- a/po/fi.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/fi.po	Tue Aug 27 02:43:54 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.59\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-03-23 20:32+0200\n"
 "Last-Translator: Tero Kuusela <teroajk@subdimension.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -24,9 +24,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Sulje"
 
@@ -38,16 +38,17 @@
 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:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Lis"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Poista"
 
@@ -71,6 +72,7 @@
 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
 msgid "Check this box to display only symbols and price:"
 msgstr "Nyt vain symbolit ja hinta:"
@@ -87,7 +89,7 @@
 msgid "Change"
 msgstr "Vaihda"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Tavoitettavissa"
 
@@ -95,8 +97,8 @@
 msgid "Available for friends only"
 msgstr "Tavoitettavissa vain ystville"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Poissa"
 
@@ -112,7 +114,7 @@
 msgid "Invisible for friends only"
 msgstr "Nkymtn vain ystville"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Tavoittamattomissa"
 
@@ -144,7 +146,7 @@
 msgid "Unknown Error Code."
 msgstr "Tuntematon virhekoodi."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
@@ -214,16 +216,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Yritt lhett viesti epkelvolle Gadu-Gadu-UIN:lle!"
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu-virhe"
-
 # src/message.c:76
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
@@ -270,104 +262,151 @@
 msgid "Sex"
 msgstr "Sukupuoli"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Kunta"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Palvelimelle ei ole tallennettu tuttavalistaa. Pahoittelen!"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "Ei voitu tuoda tuttavalistaa palvelimelta"
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Tuttavalista siirretty onnistuneesti palvelimelle"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Gadu-Gadu-tietoja"
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Ei voitu siirt tuttavalistaa palvelimelle"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "Tuttavalista onnistuneesti poistettu palvelimelta"
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Ei voitu poistaa tuttavalistaa palvelimelta"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "Salasanaa ei voitu muuttaa"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "Ei voitu lhett http-pyynt"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "Tuttavalistan tuominen palvelimelta eponnistui (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "Tuttavalistan vieminen palvelimelle eponnistui (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Tuttavalistan poistaminen palvelimelta eponnistui (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Yhteyden muodostaminen hakupalveluun eponnistui (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Salasanan vaihtaminen eponnistui (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Ei voitu tuoda tuttavalistaa palvelimelta"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Ei kyetty avaamaan suoraa pikaviestint"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Ei kyetty lhettmn salasanaa"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Ei kyetty lukemaan tiedostoa %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Lhet viesti palvelimen kautta"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Hae tiedot"
@@ -383,20 +422,16 @@
 msgstr "<B>%s on vaihtanut aiheeksi: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "Kutsumanime/kanavaa ei ole olemassa"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "IRC-virhe"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "Palvelinta ei ole olemassa"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Kutsumanime ei annettu"
 
 #: src/protocols/irc/irc.c:976
@@ -411,8 +446,8 @@
 msgstr "Ei kyetty kirjoittamaan"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "%s: Sinut on potkaistu pois: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -425,10 +460,6 @@
 msgid "You have left %s"
 msgstr "%s: Olet poistunut"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "IRC Poistu"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Kanava:"
@@ -442,223 +473,248 @@
 msgstr "DCC-keskustelu"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr "Vr nykyinen salasana! Salasanaa EI vaihdettu!"
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
-msgid "Password Change Error!"
-msgstr "Virhe vaihdettaessa salasanaa!"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
-msgstr "Uusi salasana sama kuin vanha salasana! Salasanaa EI vaihdettu!"
-
-#: src/protocols/jabber/jabber.c:1115
+#, fuzzy
+msgid "Unable to change password."
+msgstr "Ei kyetty lhettmn salasanaa"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Ei kyetty lhettmn salasanaa"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "l hiritse"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Jabber-virhe"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr "Virhe %s: %s"
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, 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:1655
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "Palvelinta ei ole olemassa"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-msgid "Jabber Error"
-msgstr "Jabber-virhe"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Tuttavat"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "Tuntematon sisnkirjautumisvirhe"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 msgid "Password successfully changed."
 msgstr "Salasanan vaihto onnistui."
 
-#: src/protocols/jabber/jabber.c:2035
-msgid "Password Change"
-msgstr "Salasanan vaihto"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "Yhteys kadotettu"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen eponnistui"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "Yhdistettyn"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "Pyydetn todennusmuotoa"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "Yhdistetn"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-msgid "Invalid Jabber I.D."
-msgstr "Epkelpo Jabber I.D."
-
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
+msgid "Jabber Error"
+msgstr "Jabber-virhe"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Huone:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "Kdensija:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Yhteyden muodostaminen eponnistui"
+
+#: src/protocols/jabber/jabber.c:2718
 msgid "Chats"
 msgstr "Ryhmkeskustelut"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 msgid "View Error Msg"
 msgstr "Nyt virheviesti"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr "Poista tuttavalistalta"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Nyt ilmoitus"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "Alue"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Seutu"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "Postinumero"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Maa"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "Shkposti"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "Organisaatioyksikk"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Arvonimi"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr "Asema"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "Syntympiv"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -666,23 +722,23 @@
 "Kaikki allaolevat kentt ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidt sopivana."
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "Kyttjn henkilllisyys"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Muokkaa Jabberin vCardia"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "Palvelimelle rekisterityminen onnistui!"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Tunnistamaton rekisterintivirhe"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "Aseta kyttjtiedot"
 
@@ -835,107 +891,125 @@
 msgid "Unknown Error Code"
 msgstr "Tuntematon virhekoodi"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "MSN-virhe"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+#, fuzzy
+msgid "An MSN message may not have been received."
 msgstr "Viesti ei ehk ole saatu vastaan"
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim ei kyennyt lhettmn viesti"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Kyttj %s (%s) haluaa list kyttjn %s tuttavalistalleen."
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "Kyttj %s (%s) haluaa list sinut tuttavalistalleen"
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Yhteytesi on katkennut. Olet kirjautunut sisn toisesta paikasta."
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 msgid "Error reading from server"
 msgstr "Virhe luettaessa palvelimelta"
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr "Pyydetn salasanan lhettmist"
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 msgid "Unable to send password"
 msgstr "Ei kyetty lhettmn salasanaa"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 msgid "Password sent"
 msgstr "Salasana lhetetty"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 msgid "Unable to write to server"
 msgstr "Palvelimelle ei kyetty kirjoittamaan"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 msgid "Synching with server"
 msgstr "Synkronoidaan palvelimen kanssa"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Busy"
 msgstr "Varattu"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr "Nollaa tuttavanimi"
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+#, fuzzy
+msgid "New MSN friendly name too long."
 msgstr "Tuttavanimi liian pitk."
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 msgid "Set Friendly Name"
 msgstr "Aseta tuttavanimi"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 msgid "Set Friendly Name:"
 msgstr "Aseta tuttavanimi: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr "Nollaa kaikki tuttavanimet"
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
-msgstr "Epkelpo nimi"
-
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
+msgstr "Epkelpo kyttjnimi"
+
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Mihin ryhmn liitytn:"
@@ -968,60 +1042,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Ryhmkeskusteluvirhe!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Ryhmkeskustelu ei ole parhaillaan kytettviss"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Ryhmkeskustelu"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "Yhteytt isntn ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Salasana lhetetty, odotetaan vastausta\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "sisinen yhteysvirhe\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan sisn AIM:iin"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Sisnkirjaus: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Kirjauduttu ulos.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Yhteytt ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, evste lhetetty"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Kyttjtilisi palvelu on parhaillaan keskeytetty."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1030,24 +1099,47 @@
 "ja yrit uudestaan. Jos jatkat yrittmist, joudut odottamaan viel "
 "pidempn."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Asiakasohjelmasi versio on liian vanha. Pivit "
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Todennus eponnistui"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Sisinen virhe"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim 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
+#, 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
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviesti %s:n kanssa muodostettu"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1058,119 +1150,107 @@
 "syyst:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "Syyt ei annettu"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ valtuutus evtty"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, 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:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim - ICQ valtuutus hyvksytty"
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Et saanut %d viesti %s:lta koska se oli epkelpo."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Et saanut %d viesti %s:lta koska ne olivat epkelpoja."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Et saanut %d viesti %s:lta koska se oli liian suuri."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Et saanut %d viesti %s:lta koska ne olivat liian suuria."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "Et saanut %d viesti %s:lta koska taajuusraja ylittyi."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Et saanut %d viesti %s:lta koska taajuusraja ylittyi."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Et saanut %d viesti %s:lta koska se oli liian hirve."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Et saanut %d viesti %s:lta koska ne ovat liian hirveit."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Et saanut %d viesti %s:lta koska olet liian hirve."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Et saanut %d viesti %s:lta koska olet liian hirve."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Et saanut %d viesti %s:lta tuntemattomista syist."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Et saanut %d viesti %s:lta tuntemattomista syist."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Virhe"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Tila:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>Tila:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC heitti virheen: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Oscar SNAC Virhe"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Viestisi %s:lle ei lhetetty: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Tuntematon syy"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "Syyt ei annettu"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "%s:n kyttjtiedot eivt ole saatavilla: %s"
@@ -1281,30 +1361,72 @@
 msgstr "<i>Ei tietoja annettu</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Yhteytesi voi olla kadonnut."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL-virhe"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "Viimeist viesti ei lhetetty koska olet ylittnyt taajuusrajan. Odota 10 "
 "sekuntia ja yrit uudelleen."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Virhe"
-
-#: src/protocols/oscar/oscar.c:3207
+#: 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
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Ei kyetty lukemaan tiedostoa %s."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim ei kyennyt lhettmn viesti"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1313,19 +1435,15 @@
 "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:3210
-msgid "Gaim - Warning"
-msgstr "Gaim - Varoitus"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vaihto:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Ei kyetty avaamaan suoraa pikaviestint"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1336,7 +1454,7 @@
 "antaa vastapuolen nhd IP-osoitteesi ja voi olla turvallisuusriski. "
 "Haluatko jatkaa?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1345,7 +1463,7 @@
 "<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:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1354,15 +1472,15 @@
 "<B>UIN:</B> %s<BR><B>Tila:</B> %s<BR><HR><BR><I>Kyttjll ei ole "
 "tilaviestia.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Hae kyvyt"
 
@@ -1495,49 +1613,43 @@
 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:599
-msgid "TOC Resume"
-msgstr "TOC Jatka"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Ryhmkeskusteluvirhe"
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Salasanan vaihto"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC on lhettnyt PAUSE-komennon. Kun tm tapahtuu, TOC ei vlit mistn "
 "sille lhetetyist viesteist ja voi potkaista sinut ulos jos lhett "
 "viestin. Gaim est kaiken lpimenon. Tm on vain vliaikaista, ole "
 "krsivllinen."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC Tauko"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "Yhteytt siirtoa varten ei voitu muodostaa!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "Yhteytt siirtoa varten ei voitu muodostaa!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "Ei voitu kirjoittaa tiedoston otsikkoa!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1559,22 +1671,23 @@
 msgstr "%s pyyt sinua lhettmn hnelle tiedoston"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Viestisi ei lhetetty."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Luokka:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Ilmentym:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Vastaanottaja:"
 
@@ -1599,10 +1712,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1646,6 +1760,9 @@
 "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"
@@ -1655,13 +1772,10 @@
 msgstr "Kirjaudu ulos"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Anna sisnkirjautumistietosi"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Sisnkirjautumisvirhe"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - Sisnkirjautuminen"
@@ -1703,39 +1817,10 @@
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 msgid "Auto-login"
 msgstr "Automaattinen sisnkirjautuminen"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Yritetn kirjautua sisn..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Ei linjoilla. Napsauta avataksesi sisnkirjautumisruutu."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Poissa: %d odottamassa."
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Poissa."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Uusi poissaoloviesti"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Ei voitu luoda Gaim-sovelmaa!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "Tietoja..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Poissa!"
@@ -1749,6 +1834,10 @@
 msgid "Back"
 msgstr "Palaa"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Uusi poissaoloviesti"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Poista poissaoloviesti"
@@ -1757,7 +1846,7 @@
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Ryhm"
 
@@ -1767,12 +1856,13 @@
 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:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1792,10 +1882,6 @@
 msgid "Un-Alias"
 msgstr "Poista alias"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "Tuttavailmoitin"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
@@ -1852,7 +1938,7 @@
 msgid "Information on selected Buddy"
 msgstr "Tietoja valitusta tuttavasta"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Lhet pikaviesti"
 
@@ -1880,7 +1966,7 @@
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Hae kyttjtiedot"
 
@@ -1892,6 +1978,10 @@
 msgid "Tools"
 msgstr "Tykalut"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "Tuttavailmoitin"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Protokollatoiminnot"
@@ -1936,7 +2026,7 @@
 msgid "About Gaim"
 msgstr "Gaim:ista"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -1969,12 +2059,12 @@
 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:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -1987,7 +2077,7 @@
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Tuttava"
 
@@ -2004,10 +2094,11 @@
 msgid "Un-Ignore"
 msgstr "Vlit"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "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
 #, c-format
@@ -2051,15 +2142,15 @@
 msgstr "Kuiskaa"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Lhet"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Est"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Varoita"
@@ -2073,16 +2164,14 @@
 msgstr "Gaim - Liit kuva"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "Viesti ei voitu lhett: liian suuri"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Viestivirhe"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "Viesti ei voitu lhett: Tuntematon syy"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "Viesti ei voitu lhett: liian suuri"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2094,157 +2183,157 @@
 msgid "Setting position to %d\n"
 msgstr "Asetetaan sijainniksi %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Lihavoi teksti"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Kursivoi teksti"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Kursivoi"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Alleviivaa teksti"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Yliviivaa teksti"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Yliviivaa"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Pienenn fonttikokoa"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Pieni"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Normaali fonttikoko"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Suurenna fonttikokoa"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Suuri"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Valitse fontti"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Fontti"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Tekstin vri"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Vri"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Taustavri"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Lis linkki"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Linkki"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Lis hymi"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Hymi"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "Lis pikaviestikuva"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr "Kuva"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Ota kyttn kirjaaminen lokiin"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
 # src/menus.c:280
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "ni"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Keskustelut"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Lhet viesti nimell: "
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Tallenna kuvake"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Poista animaatio kytst"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Ota animaatio kyttn"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimell..."
 
@@ -2288,384 +2377,405 @@
 "Olet poistamassa '%s':n tuttavalistaltasi.\n"
 "Haluatko jatkaa?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Hyvksy"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - Pikaviestimen kyttj"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "Pikaviesti kenelle:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Kyttj:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 msgid "Account:"
 msgstr "Kyttjtili:"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Hae kyttjtiedot"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Lis ryhm"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Lis ryhm"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Lis tuttava"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Lis tuttava"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Kontakti"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Lis"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Poissa!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Salli kaikkien kyttjien ottaa minuun yhteytt"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Salli vain allaolevat kyttjt"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Sallittujen lista"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Kiell kaikki kyttjt"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Kiell allaolevia kyttji"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Kiellettyjen lista"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Syt ilmoitettava tuttava."
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Tuttavailmoitinvirhe"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Uusi tuttavailmoitin"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Kenest ilmoitetaan"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Kyttjtili"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Milloin ilmoitetaan"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Ilmoita sisnkirjautuessa"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Ilmoita palatessa oltuaan poissa"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Ilmoita palatessa oltuaan jouten"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "Ilmoitin kun tuttava kirjoittaa sinulle"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Ilmoittimen toiminto"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "Avaa pikaviesti-ikkuna"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Nyt ilmoitus"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Lhet viesti"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Suorita komento ilmoitettaessa"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Soita ni ilmoitettaessa"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Tallenna tm ilmoitin aktivoinnin jlkeen"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Aseta hakemistotiedot"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Hakemistotiedot"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Salli verkkohaut tietojesi lytmiseksi"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Etunimi"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Entinen nimi"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Lni"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Uudet salasanat eivt tsm"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Salasanan muuttamisvirhe"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Tyt kaikki kentt kokonaan"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "Vanha salasana"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Salasanan vaihto"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "Vanha salasana"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Uusi salasana"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Aseta kyttjtiedot"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Alla ovat hakusi tulokset: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Salli"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Kiell"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Salli lis"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Kiell lis"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Kirjaa keskustelu lokiin"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Etsi tuttavaa"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Etsi tuttava tietojen perusteella"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Etsi tuttava shkpostin perusteella"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Lis URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Valitse tekstin vri"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Valitse taustavri"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Tuo:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Tuo tuttavalista"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "Et voi luoda poissaoloviesti tyhjll otsikolla"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhj poissaoloviesti"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Uusi poissaoloviesti"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Kyt"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Tallenna ja kyt"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Anna tuttavalle alias"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "Yhteytt isntn ei voitu muodostaa"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Tallenna lokitiedosto"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Ei kyetty poistamaan tiedostoa %s - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "Tyhjenn loki?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "Ei voitu avata asetustiedostoa %s."
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "Tyhjenn loki?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "Selv"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Ajankohta"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Tyhjenn"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Nime ryhm uudelleen"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Nime ryhm uudelleen"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Uusi nimi:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Nime tuttava uudelleen"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Nime tuttava uudelleen"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Valitse Perlskripti"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ei voitu avata asetustiedostoa %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Asetusvirhe"
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2675,9 +2785,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteytt.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
-msgid "Plugin Error"
-msgstr "Liitnnisvirhe"
+#: 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
 msgid "Gaim - Load Buddy Icon"
@@ -2691,7 +2802,7 @@
 msgid "Browse"
 msgstr "Selaa"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -2732,17 +2843,22 @@
 msgstr "Anna salasana"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Sisnkirjautumisvirhe"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Protokollatoiminnot"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2750,40 +2866,40 @@
 "Et voi kirjata tt kyttjtili sisn. Et ole ladannut protokollaa, jota "
 "se kytt, tai protokollassa ei ole sisnkirjautumisfunktiota."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Tilin muokkaus"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Valitse automaattiset"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Poista valinnat"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Muuta"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Kirjaa sisn/ulos"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Poista"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2792,28 +2908,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s ei kyennyt kirjautumaan sisn"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Sisnkirjautumisvirhe"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "Ilmoitus"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s on kirjautunut ulos"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perlskripti"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Liitnnislista"
@@ -2822,10 +2938,12 @@
 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"
@@ -2871,428 +2989,596 @@
 msgid "Close this window"
 msgstr "Sulje tm ikkuna"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, 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 "Windows"
-msgstr "Pikaviesti-ikkuna"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Nyt testausikkuna"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Kyt reunattomia painikkeita"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Lni"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Kyt reunattomia painikkeita"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Lihavoi"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Kursivoi"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Alleviivaa"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Yliviivaa teksti"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Peruuta"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "Kyttj on liian aktiivinen"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Kyttj on liian aktiivinen"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Valitse"
-
-#: src/prefs.c:341
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Tekstin vri"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Taustavri"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Tuttavien nytt"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Use custom size"
-msgstr "Kyttj on liian aktiivinen"
-
-#: src/prefs.c:359
+msgid "Show graphical _smileys"
+msgstr "Nyt graafiset hymit"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Nyt aikaleimat viesteiss"
+
+#: src/prefs.c:376
 #, fuzzy
-msgid "Text color"
-msgstr "Tekstin vri"
+msgid "Show _URLs as links"
+msgstr "Nyt URL:t linkkein"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Korosta vrinkirjoitetut sanat"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "l vlit vreist"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Taustavri"
+msgid "Ignore font _faces"
+msgstr "l vlit fonttien tyypist"
+
+#: src/prefs.c:382
+#, 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
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "\"Enter\" lhett viestin"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "\"Control-Enter\" lhett viestin"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "Pikaviesti-ikkuna"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "\"Escape\" sulkee ikkunan"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "\"Control-W\" sulkee ikkunan"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "\"Control-{B/I/U/S}\" lis HTML-lapun"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "\"Control-(numero)\" lis hymin"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Alhaalla"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Piilota pikaviesti-/tiedot- ja ryhmkeskustelupainikkeet"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Nyt graafiset hymit"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Nyt aikaleimat viesteiss"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Nyt kuvat painikkeissa"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Nyt URL:t linkkein"
+msgid "Buddy List Window"
+msgstr "Tuttavalistaikkuna"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Korosta vrinkirjoitetut sanat"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Tallenna ikkunan koko/sijainti"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Nosta ikkuna tapahtumahetkin"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Ryhmien nytt"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Piilota ryhmt joissa ei ole tuttavia linjoilla"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Nyt mrt ryhmiss"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Tuttavien nytt"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "Nyt tuttavatyyppien kuvakkeet"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Nyt varoitustasot"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "l vlit vreist"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Nyt joutenoloajat"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "l vlit fonttien tyypist"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "l vlit fonttien koosta"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "l vlit automatisoiduista TiK-viesteist"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "\"Enter\" lhett viestin"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "\"Control-Enter\" lhett viestin"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Nyt jouten olevat tuttavat harmaina"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "Pikaviesti-ikkuna"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Uuden ikkunan leveys:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "Uuden ikkunan korkeus:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Kirjoitusalueen korkeus:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Nosta ikkuna tapahtumahetkin"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Piilota ikkuna lhetettess"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Tuttavakuvakkeet"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "\"Escape\" sulkee ikkunan"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Piilota tuttavakuvakkeet"
 
 #: src/prefs.c:466
-msgid "Control-W closes window"
-msgstr "\"Control-W\" sulkee ikkunan"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "\"Control-{B/I/U/S}\" lis HTML-lapun"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "\"Control-(numero)\" lis hymin"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Piilota pikaviesti-/tiedot- ja ryhmkeskustelupainikkeet"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Nyt kuvat painikkeissa"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Nyt automaattisesti tuttavalista kirjauduttaessa sisn"
+#, fuzzy
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Poista tuttavakuvakkeen animaatio kytst"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Nyt sisnkirjautumiset ikkunassa"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Nyt ilmoitus"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Ilmoita tuttaville kun kirjoitat heille"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "\"Tab\"-tydennys"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "\"Tab\"-tydenn lempinimet"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Vanhanmallinen \"Tab\"-tydennys"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Nyt tuttavalista lhell sovelmaa"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Tallenna ikkunan koko/sijainti"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "Nosta ikkuna tapahtumahetkin"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Piilota ryhmt joissa ei ole tuttavia linjoilla"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Nyt mrt ryhmiss"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "Nyt tuttavatyyppien kuvakkeet"
+msgid "_Show people joining/leaving in window"
+msgstr "Nyt ihmisten saapuminen/poistuminen ikkunassa"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Nyt varoitustasot"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "Nyt kaikki ryhmkeskustelut yhdess jaetussa ikkunassa"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Nyt joutenoloajat"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Nyt jouten olevat tuttavat harmaina"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Uuden ikkunan leveys:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "Uuden ikkunan korkeus:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Kirjoitusalueen korkeus:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Nosta ikkuna tapahtumahetkin"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Piilota ikkuna lhetettess"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Piilota tuttavakuvakkeet"
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "Poista tuttavakuvakkeen animaatio kytst"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Nyt sisnkirjautumiset ikkunassa"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Ilmoita tuttaville kun kirjoitat heille"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "\"Tab\"-tydenn lempinimet"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "Vanhanmallinen \"Tab\"-tydennys"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Nyt ihmisten saapuminen/poistuminen ikkunassa"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "Nyt aliakset vlilehdiss/otsikoissa/vierittimess"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "Ryhmkeskustelut"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "Nyt kaikki ryhmkeskustelut yhdess jaetussa ikkunassa"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "Nyt kaikki ryhmkeskustelut yhdess jaetussa ikkunassa"
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "Nyt aliakset vlilehdiss/otsikoissa/vierittimess"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "Nyt kaikki ryhmkeskustelut yhdess jaetussa ikkunassa"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Nyt ryhmkeskustelut samassa jaetussa ikkunassa"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Tuttavalista"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Vlityspalvelimen tyyppi"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Vlityspalvelin"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Verkkoasema"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Portti"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Kyttj"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Salasana"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "Vlityspalvelimen valinnat"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "Avaa uusi ikkuna oletuksena"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Viestit"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Kirjaa kaikki keskustelut lokiin"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "Poista HTML lokitiedostoista"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Nyt jrjestelmn loki"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "Kirjaa lokiin tuttavien kirjautumiset sisn/ulos"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Kirjaa lokiin tuttavien siirtymiset jouten-/paikallaoleviksi"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Kirjaa lokiin tuttavien poistumiset/palaamiset"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Kirjaa lokiin omat sisnkirjautumiset/joutenolot/poissaolot"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "Oma lokitiedosto joka tuttavan sisnkirjautumisille"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "nivalinnat"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "Ei ni kun kirjaudut sisn"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "net poissaollessasi"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "nimenetelm"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "nikomento\n"
 "(%s tiedostonimeksi)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "Viestien lhettminen poistaa poissaolotilan"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Laita uudet viestit jonoon poissaollessa"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "l vlit uusista keskusteluista poissaollessa"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "l lhet automaattista vastausta"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "l lhet automaattista vastausta"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Lhet automaattinen vastaus vain jouten ollessa"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "Jouten: "
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Poissa"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - niasetukset"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "Kokeilu"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Muokkaa"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Ilmentym:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Fontti"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Viesti lhetetty"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "Pikaviesti-ikkuna"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Ryhmkeskustelu-ikkuna"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Vlityspalvelin"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Selain"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "net"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "net"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Poissaolon otsikko: "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Asetukset"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim-virheidenetsinnn tulostusikkuna"
 
 #: 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 "
@@ -3304,11 +3590,11 @@
 "voi sanoa varmasti mik se oli. Lienee tarpeetonta sanoakaan, ettei sit "
 "kyetty onnistuneesti lataamaan."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Protokollavirhe"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3316,42 +3602,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Protokollatoiminnot"
-
-#: src/prpl.c:103
+#: 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:106
-msgid "Disconnect"
-msgstr "Katkaise yhteys"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Hyvksy?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - Kehote"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Uusi shkposti"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Avaa shkposti"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, 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:588
+#: src/prpl.c:590
 msgid ""
 "\n"
 "\n"
@@ -3361,7 +3638,7 @@
 "\n"
 "Haluatko list hnet tuttavalistallesi?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3369,15 +3646,15 @@
 "Sinulla ei ole tll hetkell kytettviss yhtn protokollaa joka kykenisi "
 "rekisterimn uusia kyttjtilej."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Rekisterinti"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Rekisterintitiedot"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "Rekisteri"
 
@@ -3394,10 +3671,6 @@
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Varoitettu"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Kyll"
@@ -3450,12 +3723,172 @@
 msgid "Someone says your name in chat"
 msgstr "Joku sanoo nimesi ryhmkeskustelussa"
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gadu-Gadu-virhe"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Gadu-Gadu-tietoja"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "Ei voitu lhett http-pyynt"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "Tuttavalistan tuominen palvelimelta eponnistui (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "Tuttavalistan vieminen palvelimelle eponnistui (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Tuttavalistan poistaminen palvelimelta eponnistui (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Yhteyden muodostaminen hakupalveluun eponnistui (%s)"
+
+#~ 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!"
+
+#~ msgid "Password Change Error!"
+#~ msgstr "Virhe vaihdettaessa salasanaa!"
+
+#~ msgid "New password same as old password! Password NOT Changed!"
+#~ msgstr "Uusi salasana sama kuin vanha salasana! Salasanaa EI vaihdettu!"
+
+#~ msgid "Password Change"
+#~ msgstr "Salasanan vaihto"
+
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Epkelpo Jabber I.D."
+
+#~ msgid "MSN Error"
+#~ msgstr "MSN-virhe"
+
+#~ msgid "Invalid name"
+#~ msgstr "Epkelpo nimi"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Ryhmkeskusteluvirhe!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Ryhmkeskustelu"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Virhe"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Oscar SNAC Virhe"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Tuntematon syy"
+
+#~ msgid "AOL error"
+#~ msgstr "AOL-virhe"
+
+#~ msgid "Error"
+#~ msgstr "Virhe"
+
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Varoitus"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC Jatka"
+
+#~ msgid "Chat Error"
+#~ msgstr "Ryhmkeskusteluvirhe"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC Tauko"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "Ei voitu kirjoittaa tiedoston otsikkoa!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Yritetn kirjautua sisn..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Ei linjoilla. Napsauta avataksesi sisnkirjautumisruutu."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Poissa: %d odottamassa."
+
+#~ msgid "Away."
+#~ msgstr "Poissa."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Ei voitu luoda Gaim-sovelmaa!"
+
+#~ msgid "About..."
+#~ msgstr "Tietoja..."
+
+#~ msgid "Message Error"
+#~ msgstr "Viestivirhe"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "Viesti ei voitu lhett: Tuntematon syy"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Tuttavailmoitinvirhe"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Salasanan muuttamisvirhe"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "Ei kyetty poistamaan tiedostoa %s - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "Asetusvirhe"
+
+#~ msgid "Plugin Error"
+#~ msgstr "Liitnnisvirhe"
+
+#~ msgid "Login Error"
+#~ msgstr "Sisnkirjautumisvirhe"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perlskripti"
+
+#~ msgid "Select"
+#~ msgstr "Valitse"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Nyt automaattisesti tuttavalista kirjauduttaessa sisn"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Nyt tuttavalista lhell sovelmaa"
+
+#~ msgid "Edit"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Protokollavirhe"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Protokollatoiminnot"
+
+#~ msgid "Disconnect"
+#~ msgstr "Katkaise yhteys"
+
+#~ msgid "Warned"
+#~ msgstr "Varoitettu"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Nyt rullaava tuttavataulu"
 
-#~ msgid "General Options"
-#~ msgstr "Yleiset valinnat"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "Kaikki muutokset tapahtuvat vlittmsti ellei muuta ole mainittu."
 
@@ -3496,9 +3929,6 @@
 #~ msgid "Manual (%s for URL)"
 #~ msgstr "Kyttohje (URL:ksi %s)"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Vlityspalvelimen valinnat"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3506,9 +3936,6 @@
 #~ "Kaikki protokollat eivt voi kytt nit vlityspalvelinvalintoja. Lue "
 #~ "README-tiedostosta yksityiskohdat."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Vlityspalvelimen tyyppi"
-
 #~ msgid "No Proxy"
 #~ msgstr "Ei vlityspalvelinta"
 
@@ -3524,27 +3951,15 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Tuttavalistan valinnat"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Tuttavalistaikkuna"
-
 #~ msgid "Tab Placement:"
 #~ msgstr "Vlilehtien sijoitus:"
 
 #~ msgid "Top"
 #~ msgstr "Ylhll"
 
-#~ msgid "Bottom"
-#~ msgstr "Alhaalla"
-
 #~ msgid "Raise Buddy List on Signons and Signoffs"
 #~ msgstr "Nosta tuttavalista sisn- ja uloskirjautumisten kohdalla"
 
-#~ msgid "Group Displays"
-#~ msgstr "Ryhmien nytt"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Tuttavien nytt"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Keskusteluvalinnat"
 
@@ -3587,18 +4002,12 @@
 #~ msgid "Right"
 #~ msgstr "Oikealla"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Tuttavakuvakkeet"
-
 #~ msgid "Chat Options"
 #~ msgstr "Ryhmkeskusteluvalinnat"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Nyt keskustelut samassa jaetussa ikkunassa"
 
-#~ msgid "Tab Completion"
-#~ msgstr "\"Tab\"-tydennys"
-
 #~ msgid "Font Options"
 #~ msgstr "Fonttivalinnat"
 
@@ -3611,12 +4020,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Tekstin fonttikoko"
 
-#~ msgid "Sound Options"
-#~ msgstr "nivalinnat"
-
-#~ msgid "Sound method"
-#~ msgstr "nimenetelm"
-
 #~ msgid "Sound played when:"
 #~ msgstr "ni soitetaan kun:"
 
@@ -3630,9 +4033,6 @@
 #~ msgid "minutes using"
 #~ msgstr "minuutin jlkeen viestill"
 
-#~ msgid "Messages"
-#~ msgstr "Viestit"
-
 #~ msgid "Make Away"
 #~ msgstr "Luo poissaolo"
 
--- a/po/fr.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/fr.po	Tue Aug 27 02:43:54 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-07-10 13:17GMT\n"
 "Last-Translator: sebfrance <sebfrance@ifrance.com>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -28,9 +28,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Fermer"
 
@@ -43,16 +43,17 @@
 msgid "Refresh"
 msgstr "Rafraichir"
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Ajouter"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Enlever"
 
@@ -76,6 +77,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr "Saisissez des symboles dlimitant avec \"+\" dans la boite suivante"
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr "Vrifier que cette boite affiche seulement les symboles et les prix:"
@@ -94,7 +96,7 @@
 msgid "Change"
 msgstr "Changer"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Disponible"
 
@@ -102,8 +104,8 @@
 msgid "Available for friends only"
 msgstr "Disponible pour les amis seulement"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Absent"
 
@@ -119,7 +121,7 @@
 msgid "Invisible for friends only"
 msgstr "Invisible pour les amis seulement"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Non disponible"
 
@@ -153,7 +155,7 @@
 msgid "Unknown Error Code."
 msgstr "Code d'Erreur Inconnu"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -225,16 +227,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Vous essayez d'envoyer un message a un UIN Gadu-Gadu invalide"
 
-#: 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 "Erreur de Gadu-Gadu"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Ne peut obtenir les resultats de la recherche"
@@ -280,109 +272,152 @@
 msgid "Sex"
 msgstr "Sexe"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Ville"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Il n'y a pas de liste de contacts stoque sur le serveur, Dsol"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "Ne peut importer la liste de contacts depuis le serveur"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:814
 #, fuzzy
-msgid "Buddy List successfully transferred to server"
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Liste de contacts transfre sur le serveur avec succs"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Information de Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:821
+#: src/protocols/gg/gg.c:819
 #, fuzzy
-msgid "Couldn't transfer Buddy List to server"
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Ne peut transferer la liste de contacts sur le serveur"
 
-#: src/protocols/gg/gg.c:827
+#: src/protocols/gg/gg.c:825
 #, fuzzy
-msgid "Buddy List sucessfully deleted from server"
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "Liste de contacts efface du serveur avec succs"
 
-#: src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:830
 #, fuzzy
-msgid "Couldn't delete Buddy List from server"
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Ne peut effacer la liste de contacts du serveur"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "Changement de mot de passe effectu"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "Le mot de passe ne peut etre chang"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "Ne peut envoyer la requete http"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "Importation de la liste de contacts depuis le Serveur choue (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "Exportation de la liste de contacts sur le Serveur choue (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Effacement de la liste de contacts sur le Serveur chou (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Connection au service de recherche chou (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Changement de Mot de Passe chou (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Ne peut importer la liste de contacts depuis le serveur"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Impossible d'ouvrir une connection directe"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Incapable de lire le socket"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Recherche dans l'annuaire"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Changer de Mot de Passe"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Importer la Liste de Contacts depuis le Serveur"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Exporter la Liste de Contacts sur le Serveur"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Effacement de la Liste de Contacts sur le Serveur"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Impossible de lire le fichier %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Envoyer le message par le serveur"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Obtenir des informations"
@@ -398,20 +433,16 @@
 msgstr "<B>%s a chang le sujet pour: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "Pas de tel pseudo/canal"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "Erreur d'IRC"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "Pas de tel serveur"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Pas de pseudonyme donn"
 
 #: src/protocols/irc/irc.c:976
@@ -428,8 +459,8 @@
 msgstr "Impossible d'crire"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Vous avez t expuls de %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -442,10 +473,6 @@
 msgid "You have left %s"
 msgstr "Vous avez quitt %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "Sortir D'IRC"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Canal:"
@@ -459,236 +486,255 @@
 msgstr "Chat (Connection Directe)"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr "Mot de passe actuel incorrect! Le mot de passe n'a pas chang"
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - Changement de mot de passe"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "Incapable de lire le socket"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
-"Le nouveau mot de passe est le mme que l'ancien! Le mot de passe n'a pas "
-"chang"
-
-#: src/protocols/jabber/jabber.c:1115
+
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Incapable de lire le socket"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 #, fuzzy
 msgid "Unknown"
 msgstr "Inconnu ICQ"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "En Ligne"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "Absent depuis longtemps"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "Ne Pas Dranger"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Erreur de Message"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr "Erreur %s: %s"
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Code d'Erreur Inconnu"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "L'utilisateur %s veut vous ajouter a sa liste d'amis"
 
-#: src/protocols/jabber/jabber.c:1655
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
 #, fuzzy
-msgid "No such user"
+msgid "No such user."
 msgstr "Pas de tel serveur"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-#, fuzzy
-msgid "Jabber Error"
-msgstr "Erreur de Message"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Contacts"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "Authentication"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "Erreur de Connection Inconnue"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Changement de mot de passe effectu"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - Changement de mot de passe"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "Connection Perdu"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
-#: src/protocols/jabber/jabber.c:2085
-msgid "Connected"
-msgstr "Connect."
-
 #: src/protocols/jabber/jabber.c:2088
+msgid "Connected"
+msgstr "Connect."
+
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "Requete de Mthode d'authentication"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "Connection"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
 #, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "Nom invalide"
-
-#: src/protocols/jabber/jabber.c:2648
+msgid "Jabber Error"
+msgstr "Erreur de Message"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Salle:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Serveur"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 #, fuzzy
 msgid "Handle:"
 msgstr "Gestionaire:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Impossible de se connecter"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Voir les Logs"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Obtenir le Message d'absence"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr "Supprimer depuis Roster"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "faire apparaitre la Notification"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "Nom Complet"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "Nom de Famille"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "Nom Donn"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Rue"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "Rue (suite)"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "Localit"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Rgion"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "Code Postal"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Pays"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "Tlphone"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Nom de la companie"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "Dpartement"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Titre"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr "Rle"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Description"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -696,23 +742,23 @@
 "Tout les champs sont optionnels. Entrez uniquement les informations que vous "
 "desirez"
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "Identit de l'utilisateur"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Editez la carte de visite Jabber"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "Enregistrement auprs du serveur russi"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Erreur d'enregistrement inconnue"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "Editer les Informations sur l'utilisateur"
 
@@ -880,117 +926,135 @@
 msgid "Unknown Error Code"
 msgstr "Code d'Erreur Inconnu"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "Erreur MSN"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+#, fuzzy
+msgid "An MSN message may not have been received."
 msgstr "Un message ne peut pas avoir t reu."
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim n'a pas russi a envoyer le message"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "L'utilisateur %s (%s) veut ajouter %s a son ou sa liste d'amis."
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "L'utilisateur %s (%s) veut vous ajouter a sa liste"
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 "Vous avez t dconnect, vous vous tes connect depuis un autre endroit"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Erreur  la lecture du socket"
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr "Demande pour envoyer le mot de passe"
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Incapable de lire le socket"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "Mot de Passe: "
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Incapable de se connecter au server"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "S'enregistrer sur le serveur"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr "Occup"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr "Revient dans quelques minutes"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 #, fuzzy
 msgid "Busy"
 msgstr "Contact"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "On The Phone"
 msgstr "Au tlphone"
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr "Parti(e) manger"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "Cacher l'Icone"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr "Remettez  l'tat initial le nom"
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+#, fuzzy
+msgid "New MSN friendly name too long."
 msgstr "Le nom est trop long."
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Deuxime Prnom"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Pseudonyme: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr "Remettez  l'tat initial tout les noms"
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "Nom invalide"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Joindre quel groupe:"
@@ -1023,60 +1087,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez t dconnect de la salle du Chat %s."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Erreur de Chat!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Le Chat est actuellement inaccessible."
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Chat"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "incapable de se connecter a l'hote"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Mot de passe envoy, en attente de rponse\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "erreur interne de connection\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Impossible de se connecter  AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Connection: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Dconnect.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Ne peut se Connecter"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Connection tablie, cookie envoy"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Pseudonyme ou Mot de Passe incorrect."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Votre accompte est actuellement suspendu"
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1085,26 +1144,49 @@
 "Ressayez. Si vous continuez d'essayer, il vous faudra attendre encore plus "
 "longtemps."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 "La version du client que vous utilisez est trop ancienne. Veillez la mettre "
 " jour"
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Echec de l'Authentication"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Erreur Interne"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim n'a pas russi a envoyer le message"
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "Gaim n'a pas russi a envoyer le message"
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Connection directe avec %s tablie"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1115,122 +1197,110 @@
 "contact pour la raison suivante:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "Pas de pseudonyme donn"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - Authorisation ICQ refuse"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "L'utilisateur %lu a accord votre requete de le rajouter  votre liste de "
 "contact."
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim - Authorisation accorde"
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Vous avez rat %d message de %s car il etait invalide."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Vous avez rat %d messages de %s car ils etaient invalides."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Vous avez rat %d message de %s car il etait trop volumineux."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Vous avez rat %d messages de %s car ils etaient trop volumineux."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "Vous avez rat %d message de %s car le quota limite a t dpass."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Vous avez rat %d messages de %s car le quota limite a t dpass."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Vous avez rat %d message de %s car il a t trop mchant(?)."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Vous avez rat %d messages de %s car ils ont t trop mchants(?)."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Vous avez rat %d message de %s car vous avez t trop mchant(?)."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Vous avez rat %d messages de %s car vous avez t trop mchant(?)."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Vous avez rat %d message de %s pour des raisons inconnues."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Vous avez rat %d messages de %s pour des raisons inconnues."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Erreur"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC a envoy l'erreur: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Erreur SNAC d'Oscar"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Votre message vers %s n'a pas t envoy: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Raison inconnue"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "Pas de pseudonyme donn"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Les Informations sur l'utilisateur %s ne sont pas disponibles: %s"
@@ -1341,30 +1411,72 @@
 msgstr "<i>Pas d'information fournies</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Votre connection risque d'etre coupe"
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "erreur d'AOL"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "Le dernier message n'a pas t envoy car vous avez depass le quota limite "
 "Veuillez attendre 10 secondes et ressayez"
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Erreur"
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr "Gaim - Authorisation ICQ refuse"
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr "Gaim - Authorisation accorde"
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Impossible de lire le fichier %s."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim n'a pas russi a envoyer le message"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1374,20 +1486,15 @@
 "%d. Jusqu' ce que vous soyez en dessous de la limite, certains amis ne "
 "s'afficheront pas online"
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - Donner un Avertissement?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Echange:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Impossible d'ouvrir une connection directe"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1398,7 +1505,7 @@
 "permettre de voir votre ip, et rsulter en un risque de scurit. Voulez "
 "vous continuer?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1407,7 +1514,7 @@
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Le client distant ne "
 "supporte pas l'envoi de message."
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1416,16 +1523,16 @@
 "<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:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Obtenir le Message d'absence"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "Connection directe"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Obtenir les Possibilits"
 
@@ -1562,50 +1669,44 @@
 "TOC est revenu de sa pause. Vous pouvez dsormais renvoyer des messages  "
 "nouveau."
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "TOC retour"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Erreur de Chat"
-
 #: src/protocols/toc/toc.c:782
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Changement de mot de passe effectu"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Changement de mot de passe"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC a envoy la commande PAUSE. Lorsque ceci arrive TOC ignore tous les "
 "messages envoys et peux vous dconnecter si vous en envoyer un. Gaim "
 "empchera ceci. Ce n'est que temporaire, soyez patient."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC en Pause"
-
 #: src/protocols/toc/toc.c:1225
 #, fuzzy
 msgid "Get Dir Info"
 msgstr "Obtenir Info Annuaire"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "N'a pu se connecter pour le transfert!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "N'a pu se connecter pour le transfert!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "N'a pu crire l'en tte du fichier"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1627,22 +1728,23 @@
 msgstr "%s vous demande de leur envoyer un fichier"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Votre message n'a pas t envoy."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "Localisation (ZLocate)"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Classe:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Instance:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Destinataire:"
 
@@ -1666,10 +1768,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1713,6 +1816,9 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (auteur original)   [ 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 "Site Web"
@@ -1722,13 +1828,10 @@
 msgstr "Dconnection"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Entrez votre login"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Erreur de connection"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - Connection"
@@ -1769,40 +1872,11 @@
 msgid "Preferences"
 msgstr "Prfrences"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Connection automatique"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Tentative de connection..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Dconnect. Cliquer pour ouvrir la fentre de connection."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Absent: %d en attente"
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Absent"
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Nouveau Message d'absence"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Impossible de crer l'applet Gaim"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr " Propos..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Absent!"
@@ -1815,6 +1889,10 @@
 msgid "Back"
 msgstr "De retour"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Nouveau Message d'absence"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Enlever le message d'absence"
@@ -1823,7 +1901,7 @@
 msgid "Set All Away"
 msgstr "Mettre le message d'absence sur tous les comptes"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Groupe"
 
@@ -1833,12 +1911,13 @@
 msgstr "IM"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1858,10 +1937,6 @@
 msgid "Un-Alias"
 msgstr "Retirer l'alias"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "Alerte"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "Nouvelle Alerte"
@@ -1918,7 +1993,7 @@
 msgid "Information on selected Buddy"
 msgstr "Information sur le contact slectionn"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Envoyer un message"
 
@@ -1946,7 +2021,7 @@
 msgid "New Instant Message"
 msgstr "Nouveau message"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Obtenir les Informations Utilisateur"
 
@@ -1958,6 +2033,10 @@
 msgid "Tools"
 msgstr "Outils"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "Alerte"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Actions du Protocol"
@@ -2004,7 +2083,7 @@
 msgid "About Gaim"
 msgstr " propos de Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Liste de Contacts"
 
@@ -2037,12 +2116,12 @@
 msgstr "Joindre le Chat en tant que:"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -2055,7 +2134,7 @@
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Contact"
 
@@ -2071,10 +2150,11 @@
 msgid "Un-Ignore"
 msgstr "Ne plus Ignorer"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "Ignorer"
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, c-format
@@ -2118,15 +2198,15 @@
 msgstr "Murmurer"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Donner un Avertissement"
@@ -2140,16 +2220,14 @@
 msgstr "Gaim - Inserer Image"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "Impossible d'envoyer le message: trop volumineux"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Erreur de Message"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "Incapable d'envoyer le message: raison inconnue."
+#, fuzzy
+msgid "Unable to send message"
+msgstr "Impossible d'envoyer le message: trop volumineux"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2161,156 +2239,156 @@
 msgid "Setting position to %d\n"
 msgstr "Positionn  %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Texte en Gras"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Gras"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Texte en Italique"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Italique"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Texte Soulign"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Soulign"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Texte Barr"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Barr"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Police plus Petite"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Petit"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Police Normale"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Police plus Grande"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Grand"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Sectionner une police"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Police"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Couleur de texte"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Couleur"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Couleur de fond"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Insrer un Lien"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Lien"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Insrer un smiley"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "Inserer une d'image"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr "Image"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Activer l'enregistrement(Log)"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Enregistrement"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Sauver la conversations"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Son"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversations"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Envoyer le message en tant que: "
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Sauvegarder l'icone"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Dsactiver l'Animation"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Activer l'animation"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Cacher l'Icone"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Sauvegarder l'Icone sous..."
 
@@ -2354,386 +2432,407 @@
 "Vous tes sur le point d'enlever '%s'\n"
 "de votre liste de contacts, Voulez vous continer?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Accepter"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - Message  Utilisateur"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 #, fuzzy
 msgid "IM who:"
 msgstr "Envoyer un message  qui:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Utilisateur:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "Comptes"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Obtenir les informations de l'utilisateur"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Ajouter un Groupe"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Ajouter un Groupe"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ajouter un Contact"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Ajouter un Contact"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Contact"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Ajouter "
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Absent!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Mettre en place un filtre pour:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Permettre  tous les utiliseurs de me contacter"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Permettre aux utiliseurs ci dessous"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "List de Permission"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Interdire  tous"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Bloquer les utilisateurs ci dessous"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Bloquer la liste"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Entrez un Contact pour la cration d'une alerte"
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Erreur d'Alerte"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nouvelle Alerte"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Alerter qui"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Comptes"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Alerter Quand"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Alerter  la connection"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Alerter lorsque le contact revient"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Alerter lorsque le contact redeviens actif"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "Alerter quand le contact vous crit"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Action de l'Alerte"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "Ouvrir la Fentre de message"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "faire apparaitre la Notification"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Envoyer le message"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Executer une commande lors d'une alerte"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Jouer un son lors d'une alerte"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Sauvegarder cette alerte pour un usage ultrieur"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Donner vos informations personnelles"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Information de l'annuaire"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Autoriser les recherches sur le web  trouver vos informations"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Prnom"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Deuxime prnom"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Nom de jeune-fille"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Etat"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Les nouveaux password diffrent"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Erreur au changement de Mot de Passe"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Remplissez tous les champs"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "Mot de Passe courant"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Changement de mot de passe"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "Mot de Passe courant"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Nouveau Mot de Passe"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Nouveau Mot de passe (confirmation)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - regler les informations de l'utilisateur"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Voici les rsultats de votre recherche: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Autoriser"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Refuser"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ajouter Authorisation"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ajouter Refus"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Enregistrer la Conversation"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Rechercher un Contact"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - trouver un Contact d'aprs ses Infos."
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Trouver un Contact d'aprs son Email"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Ajouter une adresse internet"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Selectionner la Couleur de Fond"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importer dans:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importer la liste de Contact"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "Vous ne pouvez crer un message d'absence avec un titre vide"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "Vous ne pouvez crer un message d'absence vide"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Nouveau message d'absence"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Nouveau Message d'absence"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Titre du Message d'absence: "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Sauvegarder et Utiliser"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Souriez!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "surnommer un Contact"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - surnommer un Contact"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "incapable de se connecter a l'hote"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Sauver les fichiers de log"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Impossible de suprimer le fichier %s - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "Effacer les logs?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "Ne peux ouvrir le fichier de configuration %s."
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "Effacer les logs?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "Ok"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Date"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Conversation"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Renommer groupe"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Renommer un groupe"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Nouveau Nom:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Renommer un Contact"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Renommer un Contact"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Selectionnez un script perl"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ne peux ouvrir le fichier de configuration %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Erreur de Prfrences"
-
 #: src/html.c:183
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
@@ -2743,10 +2842,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erreur  l'ouverture de la connection.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr "Erreur de Connection"
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim n'a pas russi a envoyer le message"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2760,7 +2859,7 @@
 msgid "Browse"
 msgstr "Navigue"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Remise  zro"
 
@@ -2802,17 +2901,22 @@
 msgstr "Entrer le Mot de Passe"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Erreur de Connection"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Actions du Protocol"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2820,40 +2924,40 @@
 "Vous ne pouvez vous connecter; vous n'avez pas charg le protocole employ, "
 "ou le protocole n'a pas de fonction permettant la connection."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Etes vous sur de vouloir effacer %s?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Liste des Comptes"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Selectionner tous"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Sectionner les connections automatiques"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Sectionner aucun"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Modifier"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Connection/Dconnection"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Effacer"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2862,28 +2966,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s n'a pas pu se connecter"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Erreur de connection"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "Notification"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s a t dconnect"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "Erreur de Connection"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Scripts Perl"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Liste des Plugins"
@@ -2892,10 +2996,12 @@
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
+#. Left side: frame with list of plugin file names
 #: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Plugins Chargs"
 
+#. Right side: frame with description and the filepath of plugin
 #: src/plugins.c:265
 #, fuzzy
 msgid "Selected Plugin"
@@ -2941,429 +3047,596 @@
 msgid "Close this window"
 msgstr "Fermer cette fentre"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr "Options Gnrales"
+
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:282
 #, fuzzy
-msgid "Windows"
-msgstr "Fentre de message"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Afficher la fenetre de debug"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Utiliser des boutons sans bordures"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Etat"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Utiliser des boutons sans bordures"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Gras"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Italique"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Soulign"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Texte Barr"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Annuler"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "L'utilisateur est dj actif"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "L'utilisateur est dj actif"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Sectionner"
-
-#: src/prefs.c:341
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Couleur de texte"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Couleur de fond"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Liste de Contacts"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Use custom size"
-msgstr "L'utilisateur est dj actif"
-
-#: src/prefs.c:359
+msgid "Show graphical _smileys"
+msgstr "Afficher graphiquement les smileys"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Afficher l'heure sur les messages"
+
+#: src/prefs.c:376
 #, fuzzy
-msgid "Text color"
-msgstr "Couleur de texte"
+msgid "Show _URLs as links"
+msgstr "Envoyer les URLs comme des liens"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Surligner les mots mal orthographis"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Ignorer les couleurs"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Couleur de fond"
+msgid "Ignore font _faces"
+msgstr "Ignorer les polices"
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "Ignorer la taille des Polices"
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "Ignorer les messages automatiques TiK"
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "La touche Entre envoie les messages"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Ctrl-Entre envoie les messages"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "Fentre de message"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Echap ferme la fentre"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Ctrl-W ferme la fentre"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Ctrl-{B/I/U/S} insert des balises HTML"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Ctrl-(nombre) insert un smiley"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Bas"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Cacher Message/Infos/Bouttons du Chat"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Afficher graphiquement les smileys"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Afficher l'heure sur les messages"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Afficher les images sur les boutons"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Envoyer les URLs comme des liens"
+msgid "Buddy List Window"
+msgstr "Fentre de la Liste de Contacts"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Surligner les mots mal orthographis"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Mmoriser la Taille/Position des fentres"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Montrer les fentres recevant un message"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Affichage des groupes"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Cacher les groupes ne contenant aucun contact connect"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Afficher le nombre de contacts dans les groupes"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Liste de Contacts"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "afficher les icones des contacts"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Afficher le niveau d'Avertissement"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Ignorer les couleurs"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Afficher les temps d'inactivit"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Ignorer les polices"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Ignorer la taille des Polices"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignorer les messages automatiques TiK"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "La touche Entre envoie les messages"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Ctrl-Entre envoie les messages"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Griser les contacts inactifs"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "Fentre de message"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Largeur de la nouvelle fentre"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "Hauteur de la nouvelle fentre"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Hauteur de la zone de texte ( envoyer)"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Montrer les fentres recevant un message"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Cacher la fentre lors de l'envoi"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Icones du contact"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Echap ferme la fentre"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Cacher l'Icone du Contact"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Ctrl-W ferme la fentre"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Ctrl-{B/I/U/S} insert des balises HTML"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Ctrl-(nombre) insert un smiley"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Cacher Message/Infos/Bouttons du Chat"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Afficher les images sur les boutons"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Afficher la liste des Contact automatiquement"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Dsactiver l'animation de l'icone du Contact"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Afficher les connections dans la fentre"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "faire apparaitre la Notification"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Notifier les contacts que vous tes en train de leur crire"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "Compltion de mots"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Compltion des Pseudos"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Compltion de mots (ancien style)"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Positionner la Liste des Contact prs de l'applet"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Mmoriser la Taille/Position des fentres"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "Montrer les fentres recevant un message"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Cacher les groupes ne contenant aucun contact connect"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Afficher le nombre de contacts dans les groupes"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "afficher les icones des contacts"
+msgid "_Show people joining/leaving in window"
+msgstr "Afficher les arrive/dpart dans la fentre"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Afficher le niveau d'Avertissement"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "Afficher tous les chats dans une fentre avec onglets"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Afficher les temps d'inactivit"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Griser les contacts inactifs"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Largeur de la nouvelle fentre"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "Hauteur de la nouvelle fentre"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Hauteur de la zone de texte ( envoyer)"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Montrer les fentres recevant un message"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Cacher la fentre lors de l'envoi"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Cacher l'Icone du Contact"
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "Dsactiver l'animation de l'icone du Contact"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Afficher les connections dans la fentre"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Notifier les contacts que vous tes en train de leur crire"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Compltion des Pseudos"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "Compltion de mots (ancien style)"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Afficher les arrive/dpart dans la fentre"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "Montre les alias dans les onglets/titres"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "Chat"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "Afficher tous les chats dans une fentre avec onglets"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "Afficher tous les chats dans une fentre avec onglets"
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "Montre les alias dans les onglets/titres"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "Afficher tous les chats dans une fentre avec onglets"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Afficher les Chats dans la mme fentre avec onglets"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Liste de Contacts"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Type de Proxy"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Serveur de Proxy"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Hte"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Utilisateur"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Mot de Passe"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "Options du proxy"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "Afficher une nouvelle fentre par dfaut"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Messages"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Enregistrer toutes les conversations"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "Enlever l'HTML des journaux"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Voir les Logs du systme"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "Enregistrer les connections/dconnection des contacts"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Enregistrer lorsque les contacts deviennent actif/inactif"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Enregistrer lorsque les contacts sont absent/de retour"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Enregistrer vos propres connections, inactivits, absences"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "Journal individuel pour chaque contact"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Options sonores"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "Aucun son lors de votre connection"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Jouer les sons mme lorsque vous tes absent"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Methode Utilise"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Commande  utiliser\n"
 "(%s pour le nom de fichier)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "L'envoi de message change le statut d'absence"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Mise en attente des messages quand absent"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "Ignorer les nouvelles conversations lors des absences"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "Ne pas envoyer de rponse automatique"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "Ne pas envoyer de rponse automatique"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "envoyer la rponse automatique uniquement lors de l'inactivit"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "Inactif: "
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Absent"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Configuration Sonore"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "Tester"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Choisir..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Editer"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Editer"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Instance:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Police"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Message envoy"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "Fentre de message"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Fentre de discution en groupe"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Navigateur"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Sons"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Titre du Message d'absence: "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Messages d'absence"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Prfrences"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "fentre de debug 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 "
@@ -3375,11 +3648,11 @@
 "de cette diffrence, je ne peux vous dire laquelle c'tait. Evidement, le "
 "chargement a chou."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Erreur de Protocole"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3387,43 +3660,34 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Actions du Protocol"
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s utilisait %s, qui a t enlev. %s est maintenant hors ligne."
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr "Dconnecter"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Accepter?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 #, fuzzy
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nouveau Courrier"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Ouvrir le courrier"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s a fait de %s leur contact%s%s%s"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3434,7 +3698,7 @@
 "\n"
 "Voulez vous l'ajouter  votre liste de contacts?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3442,15 +3706,15 @@
 "Vous n'avez pas de protocole disponible vous permettant de crer de nouveaux "
 "comptes"
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Enregistrement d'un nouvel utilisateur"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Information d'enregistrement"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "S'enregistrer"
 
@@ -3467,10 +3731,6 @@
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Avertit"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Oui"
@@ -3527,12 +3787,179 @@
 msgid "Someone says your name in chat"
 msgstr "Quelqu'un a dit votre pseudo dans le chat"
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Erreur de Gadu-Gadu"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Information de Gadu-Gadu"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "Ne peut envoyer la requete http"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "Importation de la liste de contacts depuis le Serveur choue (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "Exportation de la liste de contacts sur le Serveur choue (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Effacement de la liste de contacts sur le Serveur chou (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Connection au service de recherche chou (%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "Changement de Mot de Passe chou (%s)"
+
+#~ msgid "No such nick/channel"
+#~ msgstr "Pas de tel pseudo/canal"
+
+#~ msgid "IRC Error"
+#~ msgstr "Erreur d'IRC"
+
+#~ msgid "No such server"
+#~ msgstr "Pas de tel serveur"
+
+#~ msgid "IRC Part"
+#~ msgstr "Sortir D'IRC"
+
+#~ msgid "Incorrect current password! Password NOT Changed!"
+#~ msgstr "Mot de passe actuel incorrect! Le mot de passe n'a pas chang"
+
+#, fuzzy
+#~ msgid "Password Change Error!"
+#~ msgstr "Gaim - Changement de mot de passe"
+
+#~ msgid "New password same as old password! Password NOT Changed!"
+#~ msgstr ""
+#~ "Le nouveau mot de passe est le mme que l'ancien! Le mot de passe n'a pas "
+#~ "chang"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - Changement de mot de passe"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Nom invalide"
+
+#~ msgid "MSN Error"
+#~ msgstr "Erreur MSN"
+
+#~ msgid "Invalid name"
+#~ msgstr "Nom invalide"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Erreur de Chat!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Chat"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Erreur"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Erreur SNAC d'Oscar"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Raison inconnue"
+
+#~ msgid "AOL error"
+#~ msgstr "erreur d'AOL"
+
+#~ msgid "Error"
+#~ msgstr "Erreur"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Donner un Avertissement?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC retour"
+
+#~ msgid "Chat Error"
+#~ msgstr "Erreur de Chat"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC en Pause"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "N'a pu crire l'en tte du fichier"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Tentative de connection..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Dconnect. Cliquer pour ouvrir la fentre de connection."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Absent: %d en attente"
+
+#~ msgid "Away."
+#~ msgstr "Absent"
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Impossible de crer l'applet Gaim"
+
+#~ msgid "About..."
+#~ msgstr " Propos..."
+
+#~ msgid "Message Error"
+#~ msgstr "Erreur de Message"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "Incapable d'envoyer le message: raison inconnue."
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Erreur d'Alerte"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Erreur au changement de Mot de Passe"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "Impossible de suprimer le fichier %s - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "Erreur de Prfrences"
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr "Erreur de Connection"
+
+#~ msgid "Login Error"
+#~ msgstr "Erreur de Connection"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Scripts Perl"
+
+#~ msgid "Select"
+#~ msgstr "Sectionner"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Afficher la liste des Contact automatiquement"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Positionner la Liste des Contact prs de l'applet"
+
+#~ msgid "Edit"
+#~ msgstr "Editer"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Erreur de Protocole"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Actions du Protocol"
+
+#~ msgid "Disconnect"
+#~ msgstr "Dconnecter"
+
+#~ msgid "Warned"
+#~ msgstr "Avertit"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Afficher la barre de Contact (Ticker)"
 
-#~ msgid "General Options"
-#~ msgstr "Options Gnrales"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr ""
 #~ "Toutes les options sont prises en compte immdiatement sauf prcision du "
@@ -3574,9 +4001,6 @@
 #~ msgid "Manual (%s for URL)"
 #~ msgstr "Manuel (%s pour URL)"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Options du proxy"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3584,9 +4008,6 @@
 #~ "Les protocoles ne peuvent pas tous utiliser les options de proxy. "
 #~ "Veuillez lire le fichier READMEpour plus d'informations."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Type de Proxy"
-
 #~ msgid "No Proxy"
 #~ msgstr "pas de Proxy"
 
@@ -3602,27 +4023,15 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Options de la Liste de Contacts"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Fentre de la Liste de Contacts"
-
 #~ msgid "Tab Placement:"
 #~ msgstr "Placement des onglets"
 
 #~ msgid "Top"
 #~ msgstr "Haut"
 
-#~ msgid "Bottom"
-#~ msgstr "Bas"
-
 #~ msgid "Raise Buddy List on Signons and Signoffs"
 #~ msgstr "Liste des copains qui se connectent ou se dconnectent"
 
-#~ msgid "Group Displays"
-#~ msgstr "Affichage des groupes"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Liste de Contacts"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Options de Conversation"
 
@@ -3665,18 +4074,12 @@
 #~ msgid "Right"
 #~ msgstr "Droite"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Icones du contact"
-
 #~ msgid "Chat Options"
 #~ msgstr "Options du Chat"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Afficher les conversations dans une mme fentre avec onglets"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Compltion de mots"
-
 #~ msgid "Font Options"
 #~ msgstr "Options de police"
 
@@ -3689,12 +4092,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Taille de la police pour le Texte"
 
-#~ msgid "Sound Options"
-#~ msgstr "Options sonores"
-
-#~ msgid "Sound method"
-#~ msgstr "Methode Utilise"
-
 #~ msgid "Sound played when:"
 #~ msgstr "Son jou lorsque:"
 
@@ -3707,9 +4104,6 @@
 #~ msgid "minutes using"
 #~ msgstr "minutes en utilisant"
 
-#~ msgid "Messages"
-#~ msgstr "Messages"
-
 #~ msgid "Make Away"
 #~ msgstr "Passer en mode 'absent'"
 
--- a/po/hu.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/hu.po	Tue Aug 27 02:43:54 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.60\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-05-12 19:00+0100\n"
 "Last-Translator: Zoltan Sutto <suttozoltan@broadband.hu>\n"
 "Language-Team: HU <hu@li.org>\n"
@@ -25,9 +25,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Bezr"
 
@@ -40,16 +40,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Hozzad"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Elvtolt"
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -91,7 +93,7 @@
 msgid "Change"
 msgstr "Csatorna:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Elrhet"
 
@@ -99,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "Elrhet csak bartoknak"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Tvol"
 
@@ -116,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "Lthatatlan csak bartoknak"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Nem elrhet"
 
@@ -148,7 +150,7 @@
 msgid "Unknown Error Code."
 msgstr "Ismeretlen hiba kd"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "llapot: %s"
@@ -218,16 +220,6 @@
 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:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu hiba"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Nem sikerl a keress eredmnyt lekrdezni"
@@ -273,104 +265,151 @@
 msgid "Sex"
 msgstr "Frfi/n"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Vros"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Nincs trolva partner lista a kiszolgln. Sajnlom!"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "Nem tudom a partner listt importlni a kiszolglrl"
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Partner lista sikeresen tovbbtva a kiszolglra"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Gadu-Gadu Informci"
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Nem sikerl a partner lista tovbbtsa a kiszolglra"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "Partner lista sikeresen trlve a kiszolglrl"
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Nem sikerl a partner lista trlse a kiszolglrl"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "Jelsz sikeresen megvltoztatva"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "Jelszt nem sikerlt megvltoztatni"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "Nem sikerlt a http krst elkldeni"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "Partner lista importlsa megszakadt (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "Partner lista exportlsa megszakadt (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Partner lista trlse megszakadt (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Kapcsolds a keres szolgltatshoz megszakadt (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Jelszvltoztats megszakadt (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Nem tudom a partner listt importlni a kiszolglrl"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Nem sikerlt megnyitni a kzvetlen IM-et"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Foglalatot nem lehet olvasni"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Knyvtr keresse"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Jelsz megvltoztatsa"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Partner lista importlsa a kiszolglrl"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Partner lista exportlsa a kiszolglra"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Partner lista trlse a kiszolglrl"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Nem sikerl olvasni a fjlt %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "zenet kldse a kiszolgln keresztl"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Informcigyjts"
@@ -386,20 +425,16 @@
 msgstr "<B>%s megvltoztatta a tmt a kvetkezre: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "Nincs ilyen becenv/csatorna"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "IRC hiba"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "Nincs ilyen kiszolgl"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Nincs becenv megadva"
 
 #: src/protocols/irc/irc.c:976
@@ -415,8 +450,8 @@
 msgstr "Sikertelen rs"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Kizrtak a kvetkezrl %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -429,10 +464,6 @@
 msgid "You have left %s"
 msgstr "Elhagytad a kvetkezt csatornt %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "IRC terlet"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Csatorna:"
@@ -446,230 +477,252 @@
 msgstr "DCC csevegs"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - Jelsz megvltoztatsa"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "Foglalatot nem lehet olvasni"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Foglalatot nem lehet olvasni"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Elrhet"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "Tvol a gptl"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "Ne zavarj"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Jabber hiba"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Ismeretlen hiba kd"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, 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:1655
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "Nincs ilyen felhasznl"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-msgid "Jabber Error"
-msgstr "Jabber hiba"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Partnerek"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "Azonosts"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "Ismeretlen bejelentkezsi hiba"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Jelsz sikeresen megvltoztatva"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - Jelsz megvltoztatsa"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "Kapcsolat megszakadt"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "Nem sikerl kapcsoldni"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "Kapcsoldva"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "Azonostsi mdszer lekrdezse"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "Kapcsolatfelvtel"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-#, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "rvnytelen nv"
-
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
+msgid "Jabber Error"
+msgstr "Jabber hiba"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Szoba:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Kiszolgl:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "Kezel:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Nem sikerl kapcsoldni"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Csevegs"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Napl"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Tvol zenet lekrdezse"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Elugr figyelmeztets"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "Teljes nv"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "Csaldnv"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "Keresztnv"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "Becenv"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Utca"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "Tovbbi cm"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "Helysg"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Rgi"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "Irnytszm"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Orszg"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "Telefonszm"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Szervezet neve"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "Szervezeti egysg"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Titulus"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "Szletett"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Lers"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -677,23 +730,23 @@
 "A kvetkez krdsek kzl csak azokra adj vlaszt, melyek nem rintenek "
 "knyelmetlenl."
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "Azonost"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCard szerkesztse"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "Kiszolgl regisztrci sikerlt!"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Ismeretlen regisztrcis hiba"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "Felhasznli adatok"
 
@@ -861,116 +914,132 @@
 msgid "Unknown Error Code"
 msgstr "Ismeretlen hiba kd"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "MSn hiba"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim nem tudta az zenetet elkldeni"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, 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:1076
+#: src/protocols/msn/msn.c:1078
 #, 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:1177
+#: src/protocols/msn/msn.c:1179
 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:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Hiba a foglalat olvassakor."
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Foglalatot nem lehet olvasni"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "Jelsz: "
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Nem sikerl a kiszolglhoz kapcsoldni"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "Regisztrci a kiszolglval"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
-#, fuzzy
-msgid "Busy"
-msgstr "Partner"
-
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1926
+#, fuzzy
+msgid "Busy"
+msgstr "Partner"
+
+#: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "Ikon elrejtse"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Vezetknv"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Kperny neve: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "rvnytelen nv"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Melyik csoporthoz kapcsoldsz"
@@ -1003,60 +1072,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Kilptl a kvetkez cseveg szobbl %s."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Hiba csevegs kzben!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Csevegs jelenleg nem elrhet"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Csevegs"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "Nem sikerlt a tvoli gphez kapcsoldni"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Jelsz elkldve, vlaszra vrok\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "bels kapcsolat hiba\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Nem sikerlt az AIM-re bejelentkezni"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Bejelentkezve: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Kijelentkezve.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Nem sikerlt kapcsoldni"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Kapcsolat ltrejtt, cookie elkldve"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Hibs becenv vagy jelsz."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Fik jelenleg felfggesztve."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1064,24 +1128,47 @@
 "Gyakran jelentkezel ki/be. Vrj 10 percig s prbld jra. Ha tovbb "
 "folytatod,mg tbbet kell majd vrnod."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Az gyfl program verzja rgi. Krlek frisstsd"
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Azonosts megszakadt"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Bels hiba"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim 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
+#, 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
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Kzvetlen IM kapcsolat %s-(val/vel) ltrejtt"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1091,39 +1178,36 @@
 "%lu felhasznl elutastotta a krsed a kvetkez magyarzattal:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "Nincs magyarzat."
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ azonosts elutastva"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "%lu felhasznl elfogadta a krsed."
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim - ICQ azonosts elfogadva"
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Nem kaptl meg %d zenetet %s-tl mert rvnytelen volt."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Nem kaptl meg %d zeneteket %s-tl mert rvnytelenek voltak."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Nem kaptl meg %d zenetet %s-tl mert tl hossz volt."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Nem kaptl meg %d zenetet %s-tl mert tl hosszak voltak."
@@ -1132,7 +1216,7 @@
 # #, 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:1605
+#: src/protocols/oscar/oscar.c:1607
 #, fuzzy, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "Nem kaptl meg %d zenetet %s-tl,mert meghaladta a korltot."
@@ -1141,77 +1225,68 @@
 # #, 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:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Nem kaptl meg %d zenetet %s-tl,mert meghaladta a korltot."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Nem kaptl meg %d zenetet %s-tl,mert nagyon durva szveg."
 
-#: src/protocols/oscar/oscar.c:1616
+#: 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:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Nem kaptl meg %d zenetet %s-tl, mert nagyon gonosz vagy."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, 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:1634
+#: 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:1635
+#: 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:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Hiba"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>llapot:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>llapot:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC hiba: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Oscar SNAC hiba"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "zeneted %s-nak/nek nem lett elkldve: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Ismeretlen ok"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "Nincs magyarzat."
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Felhasznl informci %s nem elrhet: %s"
@@ -1322,30 +1397,72 @@
 msgstr "<i>Nincs informci megadva</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "A kapcsolat valsznleg megszakadt."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL hiba"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "Az utols zenet nem lett elkldve mert a korltot meghaladtad. Krlek vrj "
 "10 msodpercet s prbld jra."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Hiba"
-
-#: src/protocols/oscar/oscar.c:3207
+#: 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
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Nem sikerl olvasni a fjlt %s."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim nem tudta az zenetet elkldeni"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1354,19 +1471,15 @@
 "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:3210
-msgid "Gaim - Warning"
-msgstr "Gaim - figyelmeztets"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vlts:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Nem sikerlt megnyitni a kzvetlen IM-et"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1376,7 +1489,7 @@
 "Kzvetlen IM kapcsolatot vlasztottl %s-(val/vel). Ezzel lthatv vlik az "
 "IP cmed. Folytatni akarod?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1385,7 +1498,7 @@
 "<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:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1394,15 +1507,15 @@
 "<B>UIN:</B> %s<BR><B>Sttusz:</B> %s<BR><HR><BR><I>Felhasznlnak nincs "
 "sttusz zenete.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 msgid "Get Status Msg"
 msgstr "Sttsz zenet lekrdezse"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "Kzvetlen IM"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Lehetsgek lekrdezse"
 
@@ -1534,48 +1647,42 @@
 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:599
-msgid "TOC Resume"
-msgstr "TOC folytatsa"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Csevegs hiba"
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "Jelsz vltoztats sikeres"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Jelsz megvltoztatsa"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC egy PAUSE parancsot kldtt. Ebben az esetben a TOC figyelmen kvl hagy "
 "minden neki kldtt zenetet s kizrhat hogyha kldesz egy zenetet Gaim "
 "megakadlyozza ezt. Ez csak ideiglenes, lgy trelemmel."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC sznet"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Knyvtr lekrdezse"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "tvitelhez nem sikerlt kapcsolatot ltrehozni!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "tvitelhez nem sikerlt kapcsolatot ltrehozni!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "Fjl fejlcnek irsa nem sikerlt!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1597,22 +1704,23 @@
 msgstr "%s felkr hogy kldj neki egy fjlt"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "zeneted nem lett elkldve."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZHely:"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Osztly:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Pldny:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Cmzett:"
 
@@ -1636,10 +1744,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1683,6 +1792,9 @@
 "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"
@@ -1692,13 +1804,10 @@
 msgstr "Kijelentkezs"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Add meg a belpsi neved"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Bejelentkezsi hiba"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - Bejelentkezs"
@@ -1739,40 +1848,11 @@
 msgid "Preferences"
 msgstr "Preferencik"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Automatikus bejelentkezs"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Prblok bejelentkezni ..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Kilpve. Kattints a bejelentkezsi ablak megjelenshez."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Tvol: %d"
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Tvol."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "j zenet tvollt esetre"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Nem sikerl ltrehozni a Gaim appletet!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "Nvjegy..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Tvol!"
@@ -1785,6 +1865,10 @@
 msgid "Back"
 msgstr "Vissza"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "j zenet tvollt esetre"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Tvollt zenetnek eltvoltsa"
@@ -1793,7 +1877,7 @@
 msgid "Set All Away"
 msgstr "Tvol mindenhonnan"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Csoport"
 
@@ -1803,12 +1887,13 @@
 msgstr "IM"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Informci"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "lnv"
 
@@ -1828,10 +1913,6 @@
 msgid "Un-Alias"
 msgstr "lnv trlse"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr ""
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "j"
@@ -1888,7 +1969,7 @@
 msgid "Information on selected Buddy"
 msgstr "Partner adatai"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Azonnali zenet kldse"
 
@@ -1916,7 +1997,7 @@
 msgid "New Instant Message"
 msgstr "j azonnali zenet"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Felhasznl adatai"
 
@@ -1928,6 +2009,10 @@
 msgid "Tools"
 msgstr "Eszkzk"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr ""
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Protokol esemnyek"
@@ -1972,7 +2057,7 @@
 msgid "About Gaim"
 msgstr "Gaim nvjegy"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Partner lista"
 
@@ -2005,12 +2090,12 @@
 msgstr "Csatlakozs mint:"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Mgsem"
 
@@ -2023,7 +2108,7 @@
 msgid "Invite"
 msgstr "Invitl"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Partner"
 
@@ -2039,10 +2124,11 @@
 msgid "Un-Ignore"
 msgstr "Vissza"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "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
 #, c-format
@@ -2086,15 +2172,15 @@
 msgstr "Pletyka"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Kld"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Tilt"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Figyelmeztet"
@@ -2108,16 +2194,14 @@
 msgstr "Gaim - Kp beszrsa"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "zenetet nem lehet elkldeni: tl nagy"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "zenet hiba"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "zenetet nem lehet elkldeni: ismeretlen hiba"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "zenetet nem lehet elkldeni: tl nagy"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2129,156 +2213,156 @@
 msgid "Setting position to %d\n"
 msgstr "Pozci belltsa %d-(ra/re)\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Kvr szveg"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Kvr"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Dlt szveg"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Dlt"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Alhzott szveg"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Alhzott"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "thzott szveg"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "thzott"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Betmret cskkentse"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Kicsi"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Norml mret"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Norml"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Betmret nvelse"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Nagy"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Bettpus vlaszts"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Bettpus"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Szveg szne"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Szn"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Httr szn"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Hivatkozs beszrsa"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Hivatkozs"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Mosolyg arc beszrsa"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Mosolyg"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "IM kp beszrsa"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr "Kp"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Naplzs bekapcsolsa"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Naplzs"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Trsalgs mentse"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Ments"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Hang"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Trsalgsok"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "zenet kldse mint: "
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Ikon mentse"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Animci kikapcsolsa"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Animci bekapcsolsa"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Ikon elrejtse"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Ikon mentse mint"
 
@@ -2322,384 +2406,405 @@
 "Elkvnod tvoltani '%s'-t a partnereid kzl.\n"
 "Folytatni akarod?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Elfogad"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "Rendben"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - IM felhasznl"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "IM kicsoda:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Felhasznl:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 msgid "Account:"
 msgstr "Fik:"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim -  Felhasznl adatai"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Csoport felvtele"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Csoport felvtele"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Partner felvtele"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Partner felvtele"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Kapcsolattart"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Hozzad a kvetkezhz"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Tvol!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Biztonsgi belltsa a kvetkez?re"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Mindenki kapcsolatba lphet velem"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Csak a kvetkez felhasznlk engedlyezse"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Engedlyezettek"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Minden felhasznl elutastsa"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "A kvetkez felhasznlk tiltsa"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Tilt lista"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Add meg a figyelmeztetst"
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Figyelmeztetsi hiba"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - j figyelmeztets"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Kit figyelmeztetsz"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Fik"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Mikor"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Bejelentkezskor"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Ha a tvollt megsznik"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Ha az inaktv llapot megsznik"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "Ha a partner szveget r nekem"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Figyelmeztetskor"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "IM ablak megnyitsa"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Elugr figyelmeztets"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "zenet kldse"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Parancs vgrehajtsa"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Hang lejtszsa"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Figyelmeztets mentse aktivls utn"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Knyvtr adatainak belltsa"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Knyvtr adatai"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Web keresk megtallhatjk az adataimat"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Keresztnv"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Kzps nv"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Vezetknv"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Lenykori nv"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "llam"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "j jelszavak nem egyeznek"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Jelsz vltoztatsi hiba"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Minden mezt ki kell tlteni"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "Eredeti jelsz"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Jelsz megvltoztatsa"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "Eredeti jelsz"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "j jelsz"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "j jelsz (mgegyszer)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Felhasznli adatok belltsa"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "A keress eredmnyei a kvetkezk: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Engedlyez"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Elutast"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Engedly felvtele"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Elutasts felvtele"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Trsalgs naplzsa"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Partner keresse"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Partner keresse adatok alapjn"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Partner keresse email cm alapjn"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - URL felvtele"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Szveg sznnek kivlasztsa"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Httr szn kivlasztsa"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importls a kvetkezbe:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Partner lista importlsa"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "Cm nlkl zenetet nem hozhatsz ltre"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "res zenetet nem hozhatsz ltre"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - j tvollt zenet"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "j tvollt zenet"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Tvollt fejlce: "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Alkalmaz"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Ment s alkalmaz"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Mosolyog!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Partner lneve"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Partner lneve"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "Nem sikerlt a tvoli gphez kapcsoldni"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Napl mentse"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Nem sikerl a %s fjl eltvoltsa - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "Tnyleg trlni akarod a naplt?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "Nem lehet a konfigurcis fjlt %s megnyitni."
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "Tnyleg trlni akarod a naplt?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "Rendben"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Dtum"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Trsalgs"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Trlse"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Csoport tnevezse"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Csoport tnevezse"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "j nv:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Partner tnevezse"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Partner tnevezse"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Perl sciprt kivlasztsa"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nem lehet a konfigurcis fjlt %s megnyitni."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Preferencik hiba"
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2709,10 +2814,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Hiba a kapcsolat megnyitsa kzben.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr "Bejelentkezsi hiba"
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim nem tudta az zenetet elkldeni"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2726,7 +2831,7 @@
 msgid "Browse"
 msgstr "Tallz"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Trl"
 
@@ -2767,17 +2872,22 @@
 msgstr "Jelsz megadsa"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Bejelentkezsi hiba"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Protokol esemnyek"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2785,40 +2895,40 @@
 "Nem jelentkezhetsz be ezzel a fikkal. Nincs vagy nem a megfelel protokol "
 "van betltdve ami ezt a funckit vgrehajtan."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Biztos hogy trlni akarod %s?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Fik szerkesztse"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Mindent kivlaszt"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Automatikus kivlaszts"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Nincs kivlaszts"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Mdost"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Be/Ki jelentkezs"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Trls"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2827,28 +2937,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nem tudott bejelentkezni"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Bejelentkezsi hiba"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "Figyelmeztets"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s kilpett"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "Hiba a kapcsolatban"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perl scriptek"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Plugin lista"
@@ -2857,10 +2967,12 @@
 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"
@@ -2906,427 +3018,596 @@
 msgid "Close this window"
 msgstr "Ablak bezrsa"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, 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 "Windows"
-msgstr "IM ablak"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Nyomkvet ablak mutatsa"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Szegly nlkli gombok hasznlata"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "llam"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Szegly nlkli gombok hasznlata"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Kvr"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Dlt"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Alhzott"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "thzott szveg"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Mgsem"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "Mosolyg arc beszrsa"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Mosolyg arc beszrsa"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Kivlaszt"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Szveg szne"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Httr szn"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Partnerek megjelentsei"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "Szveg szne"
+msgid "Show graphical _smileys"
+msgstr "Mosoly megjelentse kpknt"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Id?pont megjelentse zeneteknl"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "URL-ek mutatsa hivatkozsknt"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Helytelen szavak kiemelse"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Szinek figyelmenkvl hagysa"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Httr szn"
+msgid "Ignore font _faces"
+msgstr "Bettpus figyelmenkvl hagysa"
+
+#: src/prefs.c:382
+#, 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
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Enter zenetet kld"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Control-Enter zenet kld"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "IM ablak"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Escape ablakot bezrja"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Control-W ablak bezrsa"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Control-{B/I/U/S} HTML cmkket szr be"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Control-(szm) mosoly beszrsa"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Alul"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "IM/Informci/Csevegs gombok elrejtse"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Mosoly megjelentse kpknt"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Id?pont megjelentse zeneteknl"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Kpek mutatsa gombokon"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "URL-ek mutatsa hivatkozsknt"
+msgid "Buddy List Window"
+msgstr "Partner lista"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Helytelen szavak kiemelse"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Ablak mretek/pozck mentse"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Csoportok megjelentsei"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Elrhet partnerek nlkli csoportok elrejtse"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Szmok megjelentse a csoportokban"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Partnerek megjelentsei"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "Partner tpusnak megfelel? ikonok hasznlata"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Figyelmeztetsi szint megjelentse"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Szinek figyelmenkvl hagysa"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Inaktv id? megjelentse"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Bettpus figyelmenkvl hagysa"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Betmretek figyelmenkivl hagysa"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "TiK zenetek figyelmenkvl hagysa"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Enter zenetet kld"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Control-Enter zenet kld"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Inaktv partnerek szrkn"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "IM ablak"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "j ablak szlessge:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "j ablak magassga:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Input doboz magassga:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Ablak elrejtse kldskor"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Ikonok"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Escape ablakot bezrja"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Ikon elrejtse"
 
 #: src/prefs.c:466
-msgid "Control-W closes window"
-msgstr "Control-W ablak bezrsa"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} HTML cmkket szr be"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(szm) mosoly beszrsa"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "IM/Informci/Csevegs gombok elrejtse"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Kpek mutatsa gombokon"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Partner lista automatikus megjelentse bejelentkezskor"
+#, fuzzy
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Ikon animci tiltsa"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Bejelentkezsek megjelentse ablakban"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Elugr figyelmeztets"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Partnerek figyelmeztetse gpelskor"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "Kiegszts"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Becenv kiegsztse TAB-al"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Rgi stlus kiegszts TAB-al"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Partner lista megjelentse az applet mellett"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Ablak mretek/pozck mentse"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Elrhet partnerek nlkli csoportok elrejtse"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Szmok megjelentse a csoportokban"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "Partner tpusnak megfelel? ikonok hasznlata"
+msgid "_Show people joining/leaving in window"
+msgstr "Csatlakoz=kilp pertnerek mutatsa ablakban"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Figyelmeztetsi szint megjelentse"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "Minden egy ablakban trtn megjelentse"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Inaktv id? megjelentse"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Inaktv partnerek szrkn"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "j ablak szlessge:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "j ablak magassga:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Input doboz magassga:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Ablak elrejtse kldskor"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Ikon elrejtse"
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "Ikon animci tiltsa"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Bejelentkezsek megjelentse ablakban"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Partnerek figyelmeztetse gpelskor"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Becenv kiegsztse TAB-al"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "Rgi stlus kiegszts TAB-al"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Csatlakoz=kilp pertnerek mutatsa ablakban"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "lnevek megjelentse a cmben/fleken"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "Csevegs"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "Minden egy ablakban trtn megjelentse"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "Minden egy ablakban trtn megjelentse"
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "lnevek megjelentse a cmben/fleken"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "Minden egy ablakban trtn megjelentse"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Csevegsek megjelentse ugyabban az ablakban"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Partner lista"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Proxy tpusa"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Proxy kiszolgl"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Gpnv"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Felhasznl"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Jelsz"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "Proxy belltsok"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "j ablak el?ugrik (alaprtelmezsben)"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "zenetek"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Trsalgsok naplzsa"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "HTML elemek nem kerljenek a naplzsra"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Napl megtekintse"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "Partnerek be/kilpsnek naplzsa"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Partnerek (in)aktivitsnak naplzsa"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Partnerek jelen/tvolltnek naplzsa"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Belps/tvollt/inaktivits naplzsa"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "Minden belp partner kln naplfjlba"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Hangok belltsa"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "Nincs hang bejelentkezskor"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Hang lejtszsa mialatt tvol van"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Lejtszs mdja"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Parancs\n"
 "(%s fjl nv megadshoz)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "zenet kldse megsznteti a tvollt llapott"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "j zenetk vrakozsi sorba kerljenek ha tvol van"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "j trsalgs figyelmenkvl hagysa ha tvol van"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "Nem kld automatikus vlaszokat"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "Nem kld automatikus vlaszokat"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Automatikus vlaszok kldse csak inaktv llapotban"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "Inaktv: "
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Tvol"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Hangok belltsa"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "Prba"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Kivlaszt..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Szerkeszt"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Szerkeszt"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Pldny:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Bettpus"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "zenetek"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "IM ablak"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Csoportos cseveg ablak"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Bngsz?"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Hangok"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Hangok"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Tvollt fejlce: "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Tvollt zenetek"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencik"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: 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 "
@@ -3336,11 +3617,11 @@
 "A olyan protokolt prblt meg betlteni melynek verzija nem egyezik meg a "
 "program verzival."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Protokol hiba"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3348,42 +3629,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Protokol esemnyek"
-
-#: src/prpl.c:103
+#: 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:106
-msgid "Disconnect"
-msgstr "Kilps"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Elfogadja?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - "
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - j levl"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Level megnyitsa"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, 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:588
+#: src/prpl.c:590
 msgid ""
 "\n"
 "\n"
@@ -3393,21 +3665,21 @@
 "\n"
 "Fel kvnod venni ezt a partnert a listdra?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "Nem rendelkezik j fik regisztrlshoz szksges protokollal."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Regisztrci"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Regisztrcis adatok"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "Regisztrci"
 
@@ -3424,10 +3696,6 @@
 msgid "(1 message)"
 msgstr "(1 zenet)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Figyelmeztetve"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Igen"
@@ -3484,12 +3752,170 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gadu-Gadu hiba"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Gadu-Gadu Informci"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "Nem sikerlt a http krst elkldeni"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "Partner lista importlsa megszakadt (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "Partner lista exportlsa megszakadt (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Partner lista trlse megszakadt (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Kapcsolds a keres szolgltatshoz megszakadt (%s)"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - Jelsz megvltoztatsa"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "rvnytelen nv"
+
+#~ msgid "MSN Error"
+#~ msgstr "MSn hiba"
+
+#~ msgid "Invalid name"
+#~ msgstr "rvnytelen nv"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Hiba csevegs kzben!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Csevegs"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Hiba"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Oscar SNAC hiba"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Ismeretlen ok"
+
+#~ msgid "AOL error"
+#~ msgstr "AOL hiba"
+
+#~ msgid "Error"
+#~ msgstr "Hiba"
+
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - figyelmeztets"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC folytatsa"
+
+#~ msgid "Chat Error"
+#~ msgstr "Csevegs hiba"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC sznet"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "Fjl fejlcnek irsa nem sikerlt!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Prblok bejelentkezni ..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Kilpve. Kattints a bejelentkezsi ablak megjelenshez."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Tvol: %d"
+
+#~ msgid "Away."
+#~ msgstr "Tvol."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Nem sikerl ltrehozni a Gaim appletet!"
+
+#~ msgid "About..."
+#~ msgstr "Nvjegy..."
+
+#~ msgid "Message Error"
+#~ msgstr "zenet hiba"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "zenetet nem lehet elkldeni: ismeretlen hiba"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Figyelmeztetsi hiba"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Jelsz vltoztatsi hiba"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "Nem sikerl a %s fjl eltvoltsa - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "Preferencik hiba"
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr "Bejelentkezsi hiba"
+
+#~ msgid "Login Error"
+#~ msgstr "Bejelentkezsi hiba"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl scriptek"
+
+#~ msgid "Select"
+#~ msgstr "Kivlaszt"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Partner lista automatikus megjelentse bejelentkezskor"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Partner lista megjelentse az applet mellett"
+
+#~ msgid "Edit"
+#~ msgstr "Szerkeszt"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Protokol hiba"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Protokol esemnyek"
+
+#~ msgid "Disconnect"
+#~ msgstr "Kilps"
+
+#~ msgid "Warned"
+#~ msgstr "Figyelmeztetve"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Partner ra mutatsa"
 
-#~ msgid "General Options"
-#~ msgstr "ltalnos belltsok"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "Minden opci azonnal rvnybe lp mg msok figyelmeztetnek."
 
@@ -3520,9 +3946,6 @@
 #~ msgid "Galeon"
 #~ msgstr "Galeon"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Proxy belltsok"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3530,9 +3953,6 @@
 #~ "Nem mindegyik protokol tudja ezeket a proxy belltsokat hasznlni. "
 #~ "Olvasd el a README fjlt a rszletekrt."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Proxy tpusa"
-
 #~ msgid "No Proxy"
 #~ msgstr "Nincs Proxy"
 
@@ -3548,27 +3968,15 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Partnet lista belltsai"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Partner lista"
-
 #~ msgid "Tab Placement:"
 #~ msgstr "Fl elhelyezse"
 
 #~ msgid "Top"
 #~ msgstr "Fell"
 
-#~ msgid "Bottom"
-#~ msgstr "Alul"
-
 #~ msgid "Raise Buddy List on Signons and Signoffs"
 #~ msgstr "Partner lista megjelentse be/kijelentkezskor"
 
-#~ msgid "Group Displays"
-#~ msgstr "Csoportok megjelentsei"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Partnerek megjelentsei"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Trsalgsi belltsok"
 
@@ -3611,18 +4019,12 @@
 #~ msgid "Right"
 #~ msgstr "Jobb oldalon"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Ikonok"
-
 #~ msgid "Chat Options"
 #~ msgstr "Csevegs belltsai"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Trsalgsok megjelents ugyanabban az ablakban"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Kiegszts"
-
 #~ msgid "Font Options"
 #~ msgstr "Bettpusok belltsa"
 
@@ -3635,12 +4037,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Szveg betmrete"
 
-#~ msgid "Sound Options"
-#~ msgstr "Hangok belltsa"
-
-#~ msgid "Sound method"
-#~ msgstr "Lejtszs mdja"
-
 #~ msgid "Sound played when:"
 #~ msgstr "Hang lejtszsa akkor, ha:"
 
@@ -3653,9 +4049,6 @@
 #~ msgid "minutes using"
 #~ msgstr "perc utn a kvetkez?vel"
 
-#~ msgid "Messages"
-#~ msgstr "zenetek"
-
 #~ msgid "Make Away"
 #~ msgstr "Nincs a gpnl"
 
--- a/po/it.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/it.po	Tue Aug 27 02:43:54 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.53\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-03-13 19:26+0100\n"
 "Last-Translator: Salvatore di Maggio <titanicus@libero.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -25,9 +25,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Chiudi"
 
@@ -40,16 +40,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Aggiungi"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Elimina"
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -91,7 +93,7 @@
 msgid "Change"
 msgstr "Canale:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Presente"
 
@@ -99,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "Presente solo per gli amici"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Assente"
 
@@ -116,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "Invisibile solo per gli amici"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Occupato"
 
@@ -150,7 +152,7 @@
 msgid "Unknown Error Code."
 msgstr "Codice di errore sconosciuto."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
@@ -221,16 +223,6 @@
 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: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 "Errore Gadu-Gadu"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Risultati della ricerca non disponibili"
@@ -276,109 +268,152 @@
 msgid "Sex"
 msgstr "Sesso :9"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Citt"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Sul server non c' nessuna lista contatti :("
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "Non posso importare lista contatti dal server"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:814
 #, fuzzy
-msgid "Buddy List successfully transferred to server"
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Lista contatti trasferita sul server"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Informazione Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:821
+#: src/protocols/gg/gg.c:819
 #, fuzzy
-msgid "Couldn't transfer Buddy List to server"
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Impossibile trasferire lista contatti nel server"
 
-#: src/protocols/gg/gg.c:827
+#: src/protocols/gg/gg.c:825
 #, fuzzy
-msgid "Buddy List sucessfully deleted from server"
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "Lista contatti eliminata dal server"
 
-#: src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:830
 #, fuzzy
-msgid "Couldn't delete Buddy List from server"
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Impossibile eliminare lista contatti dal server"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "Password cambiata!"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "Impossibile cambiare password"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "Impossibile inviare una richiesta http"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "Lista NON importata dal server (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "Lista NON esportata sul server (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Lista NON eliminata dal server (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "La connessione al servizio di ricerca  fallito (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Password NON cambiata (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Non posso importare lista contatti dal server"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Impossibile aprire un canale diretto di IM"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Non riesco a leggere il socket"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Cerca directory"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Cambia password"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Importa lista contatti da server"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Esporta lista contatti sul server"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Elimina lista contatti dal server"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Impossibile leggere il file %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Spedisci il messaggio attraverso il server"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Prendi informazioni"
@@ -394,20 +429,16 @@
 msgstr "<B>%s ha cambiato l'argomento in: %s<B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "Non esiste quel soprannome/canale"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "Errore IRC"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "Il server non esiste"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Nessun soprannome dato"
 
 #: src/protocols/irc/irc.c:976
@@ -422,8 +453,8 @@
 msgstr "Impossibile scrivere"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Sei stato cacciato da %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -436,10 +467,6 @@
 msgid "You have left %s"
 msgstr "Disconnesso da %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "Parte IRC"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Canale:"
@@ -454,47 +481,61 @@
 msgstr "Chat"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - Cambio password"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "Non riesco a leggere il socket"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Non riesco a leggere il socket"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 #, fuzzy
 msgid "Unknown"
 msgstr "ICQ sconosciuto"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Presente"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "Assente ovunque"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Errore messaggio"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Codice di errore sconosciuto."
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -502,189 +543,196 @@
 "\n"
 "Vuoi aggiungerli alla tua lista dei contatti?"
 
-#: src/protocols/jabber/jabber.c:1655
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
 #, fuzzy
-msgid "No such user"
+msgid "No such user."
 msgstr "Il server non esiste"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-#, fuzzy
-msgid "Jabber Error"
-msgstr "Errore messaggio"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Contatti"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "Autentificazione"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "Errore di login sconosciuto"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Password cambiata!"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - Cambio password"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 #, fuzzy
 msgid "Connection lost"
 msgstr "Connessione chiusa."
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "Impossibile connettersi"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "Connesso"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "Richiesta metodo autentificazione in corso"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
 #, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "Nome non valido"
-
-#: src/protocols/jabber/jabber.c:2648
+msgid "Jabber Error"
+msgstr "Errore messaggio"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Stanza:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "Gestisci:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Impossibile connettersi"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Vedi i log"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Prendi messaggio di Assente"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Notifica Popup"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "Nome al secolo"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "Cognome"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "Nome assegnato"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Indirizzo"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "Indirizzo per esteso"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "Localit"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Regione"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "Codice Postale"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Paese"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "Telefono"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Nome dell'organizzazione"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "Divisione"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Titolo"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr "Posizione"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -692,23 +740,23 @@
 "Tutti i dati qui sotto sono opzionali. Inserisci solo le informazioni che "
 "ritieni opportune"
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "Identit"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Edita la vCard Jabber"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "Sei stato registrato sul server!"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Errore di registrazione sconosciuto"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "Imposta informazioni utente"
 
@@ -876,116 +924,132 @@
 msgid "Unknown Error Code"
 msgstr "Codice di errore sconosciuto."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "Errore MSN"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim non riesce a spedire il messaggio"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Sei stato disconnesso. Ti sei gi connesso da un'altra locazione."
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Errore di lettura dal socket."
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Non riesco a leggere il socket"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "Password: "
 
-#: src/protocols/msn/msn.c:1750
+#: 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:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "Registro dal server"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
-#, fuzzy
-msgid "Busy"
-msgstr "Contatto"
-
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1926
+#, fuzzy
+msgid "Busy"
+msgstr "Contatto"
+
+#: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "Nascondi icona"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Cognome"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Account: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "Nome non valido"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Con quale gruppo vuoi ciattare:"
@@ -1018,60 +1082,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Sei stato disconnesso dalla chat room %s."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Errore di chat!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "La chat al momento non  disponibile"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Chat"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "Impossibile connettersi all'host"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Password inviata; attendo la risposta\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "errore interno di connessione\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Impossibile entrare in AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Collegato: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Scollegato.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Impossibile connettersi"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Connessione effettuata: spedito il cookie"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Soprannome o password sbagliati."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Il tuo account al momento  sospeso"
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1079,26 +1138,49 @@
 "Ti sei connesso e disconnesso troppo frequentemente. Aspetta dieci minuti e "
 "dopo riprova. Se continui, dovrai aspettare anche pi a lungo."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 "La versione del client che stai usando  troppo vecchia. Aggiornalo alla "
 "versione "
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Autentificazione fallita"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Errore interno"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim 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
+#, 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
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Aperto il canale diretto con %s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1106,52 +1188,48 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "Nessun soprannome dato"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, 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:1586
+#: 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:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Hai perso %d messaggio da %s perch era troppo lungo."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Hai perso %d messaggi da %s perch troppo lunghi."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Hai perso %d messaggio da %s perch  stato superata la frequenza massima "
 "dei messaggi."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
@@ -1159,71 +1237,62 @@
 "Hai perso %d messaggi da %s perch  stato superata la frequenza massima di "
 "messaggi."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Hai perso %d messaggio da %s perch era troppo cattivo."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Hai perso %d messaggi da %s perch erano troppo cattivi."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Hai perso %d messaggio da %s perch sei troppo molesto."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Hai perso %d messaggi da %s perch volevo farti i dispetti."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Hai perso %d messaggio da %s: non chiedermi perch, non lo so."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Non  Winzozz, per hai perso %d messaggi da %s e non so il perch."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Errore"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC ha inviato un errore: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Errore SNAC di Oscar"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Il tuo messaggio a %s non  stato spedito: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Motivo sconosciuto."
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "Nessun soprannome dato"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Le informazioni dell'utente %s non sono disponibili: %s"
@@ -1334,50 +1403,87 @@
 msgstr "<i>Nessuna informazione fornita</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "La connessione potrebbe essersi interrotta."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "Errore AOL"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "L'ultimo messaggio non  stato inviato perch ne hai spediti con troppa "
 "frequenza. Aspetta 10 secondi e riprova."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Errore"
-
-#: src/protocols/oscar/oscar.c:3207
+#: 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
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Impossibile leggere il file %s."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim non riesce a spedire il messaggio"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - Avvisa l'utente?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Scambia:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Impossibile aprire un canale diretto di IM"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1388,30 +1494,30 @@
 "permetterai di vedere il tuo indirizzo IP, rischiando per la sicurezza del "
 "tuo sistema. Vuoi continuare?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Prendi messaggio di Assente"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "IM diretto"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Prendi le potenzialit"
 
@@ -1546,50 +1652,44 @@
 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:599
-msgid "TOC Resume"
-msgstr "Ravviva TOC"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Errore di chat"
-
 #: src/protocols/toc/toc.c:782
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Cambio password effettuato"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Cambio password"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC ha inviato un segnale PAUSE. Quando succede questo. TOC ignora qualsiasi "
 "messaggio inviatogli e pu anche sbatterti fuori se gli spedisci un "
 "messaggio. Gaim previene la continuazione. Questo  solo temporaneo, basta "
 "attendere un po'."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "Pausa TOC"
-
 #: src/protocols/toc/toc.c:1225
 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:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "Impossibile connettersi per trasferire file!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "Impossibile connettersi per trasferire file!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "Impossibile scrivere le intestazioni dei file!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1611,22 +1711,23 @@
 msgstr "%s ti chiede di mandargli un file"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Il tuo messaggio non  stato inviato."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "Zlocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Classe:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Istanza:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Recipiente:"
 
@@ -1652,10 +1753,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1699,6 +1801,9 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
+#. this makes the sizes not work.
+#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Sito Web"
@@ -1708,13 +1813,10 @@
 msgstr "Abbandona"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Inserisci il tuo account"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Errore di iscrizione"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - Login"
@@ -1755,40 +1857,11 @@
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Auto Login"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Cerco di entrare..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Sei sconnesso. Clicca per la finestra di connessione."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Assente: %d in attesa."
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Assente."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Nuovo msg di Assente"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Impossibile creare l'applet di Gaim!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "Informazioni su..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Assente!"
@@ -1801,6 +1874,10 @@
 msgid "Back"
 msgstr "Tornato"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Nuovo msg di Assente"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Rimuovi msg di Assente"
@@ -1809,7 +1886,7 @@
 msgid "Set All Away"
 msgstr "Tutti come Assente"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Gruppo"
 
@@ -1819,12 +1896,13 @@
 msgstr "IM"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Informazioni"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1844,10 +1922,6 @@
 msgid "Un-Alias"
 msgstr "Cancella Alias"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "Salto a Contatto"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "Nuovo salto a Contatto"
@@ -1904,7 +1978,7 @@
 msgid "Information on selected Buddy"
 msgstr "Informazioni Contatto selezionato."
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Invia un messaggio"
 
@@ -1932,7 +2006,7 @@
 msgid "New Instant Message"
 msgstr "Nuovo messaggio"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Vedi info utente"
 
@@ -1944,6 +2018,10 @@
 msgid "Tools"
 msgstr "Strumenti"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "Salto a Contatto"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Azioni protocollo"
@@ -1990,7 +2068,7 @@
 msgid "About Gaim"
 msgstr "Informazioni su Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Lista contatti"
 
@@ -2023,12 +2101,12 @@
 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:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -2041,7 +2119,7 @@
 msgid "Invite"
 msgstr "Invita"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Contatto"
 
@@ -2057,10 +2135,11 @@
 msgid "Un-Ignore"
 msgstr "Rimuovi Ignora"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "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
 #, c-format
@@ -2104,15 +2183,15 @@
 msgstr "Msg privato"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Invia"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Blocca"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Avviso"
@@ -2127,16 +2206,14 @@
 msgstr "Gaim - Utente IM"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "Messaggio non spedito: troppo lungo"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Errore messaggio"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "Impossibile spedire messaggio: motivo sconosciuto."
+#, fuzzy
+msgid "Unable to send message"
+msgstr "Messaggio non spedito: troppo lungo"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2148,158 +2225,158 @@
 msgid "Setting position to %d\n"
 msgstr "Imposta posizione a %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Testo Grassetto"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Grassetto"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Testo Corsivo"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Corsivo"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Testo Sottolineato"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Testo barrato"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Barrato"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Riduci font"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Piccolo"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Font normale"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normale"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Ingrandisci font"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Seleziona font"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Font"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Colore testo"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Colore"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Colore sfondo"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Inserisci link"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Inserisci faccina"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Faccine"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Immagine di IM"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Image"
 msgstr "Immagine di IM"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Abilita i log"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Log"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Salva la conversazione"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Salva"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Suoni"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversazioni"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Manda messaggio come: "
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Salva icona"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Disabilita animazione"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Abilita animazione"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Nascondi icona"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Salva icona come..."
 
@@ -2343,385 +2420,406 @@
 "Stai per rimuovere '%s' dalla\n"
 "lista dei contatti. Vuoi continuare?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Accetta"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - Utente IM"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "IM chi:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Utente:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "Account"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Vedi info utente"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Aggiungi Gruppo"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Aggiungi Gruppo"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Aggiungi Contatto"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Aggiungi Contatto"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Contatto"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Aggiungi a"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Assente!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Imposta privacy per:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Permetti a tutti di contattarmi"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Permetti solo agli utenti sotto"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Permetti alla lista"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Nega a tutti"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Blocca gli utenti qui sotto"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Lista dei bloccati"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Inserisci un contatto al salto."
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Errore di salto a contatto"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuovo Salto a Contatto"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Salto a chi"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Account"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Salto dove"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Salto appena entrato"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Salto appena tornato da Assente"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Salto appena tornato da Riposo"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "Salta quando Contatto ti scrive"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Azioni di salto"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "Apri finestra di IM"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Notifica Popup"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Invia messaggio"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Esegui il comando al salto"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Suona al salto"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Salva questo salto dopo attivazione"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Imposta Dir Info"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Info Directory"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Metti le tue info a disposizione nel Web"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Nome"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Secondo nome"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Cognome"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Nome da nubile"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Stato civile"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Le nuove password non coincidono"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Errore di cambio Password"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Riempi completamente i campi"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "Password attuale"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Cambio password"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "Password attuale"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Nuova password"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Nuova password (di nuovo)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Imposta info utente"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Sotto i risultati della ricerca: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Autorizza"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Nega"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Aggiugni Autorizzazione"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Aggiungi Diniego"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Registro Conversazione"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Cerca Contatto"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Cerca Contatto da Info"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Cerca Contatto da E-mail"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Aggiungi URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Seleziona colore testo"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Seleziona colore sfondo"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importa in:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importa lista dei contatti"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "Non puoi creare un messaggio di Assente con titolo vuoto"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "Non puoi creare un messaggio di Assente vuoto"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuovo messaggio di Assente"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Nuovo messaggio di Assente"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Titolo di Assente: "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Utilizzo"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Salva & Usa"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Sorridi!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Alias Contatto"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias Contatto"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "Impossibile connettersi all'host"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Salva file di log"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Impossibile rimuovere il file %s - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "Cancello davvero il log?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "File di configurazione %s non aperto."
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "Cancello davvero il log?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "Va bene!"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Conversazione"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Rinomina Gruppo"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Nuovo nome:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Rinomina Contatto"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Rinomina Contatto"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Seleziona script Perl"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "File di configurazione %s non aperto."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Errore di Preferenze"
-
 #: src/html.c:183
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
@@ -2731,10 +2829,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Errore apertura connessione.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr "Errore di login"
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim non riesce a spedire il messaggio"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2748,7 +2846,7 @@
 msgid "Browse"
 msgstr "Esamina"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -2790,17 +2888,22 @@
 msgstr "Inserisci password"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Errore di login"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Azioni protocollo"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2808,40 +2911,40 @@
 "Non puoi entrare con questo account; non hai caricato il protocollo giusto "
 "oppure quel protocollo non ha una funzione di login."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sei sicuro che vuoi eliminare %s?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editore Account"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Seleziona tutti"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Seleziona gli Auto"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Annulla selezione"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Modifica"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Entra/Esci"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2850,29 +2953,29 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s non riesce a entrare"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Errore di iscrizione"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "Notifica"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s non riesce a entrare"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 #, fuzzy
 msgid "Connection Error"
 msgstr "Connessione chiusa."
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Script Perl"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista Plugins"
@@ -2881,11 +2984,13 @@
 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"
@@ -2931,430 +3036,597 @@
 msgid "Close this window"
 msgstr "Chiudi finestra"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, 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 "Windows"
-msgstr "Finestra di IM"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Mostra finestra debug"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Bottoni senza bordo"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Stato civile"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Bottoni senza bordo"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Grassetto"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Corsivo"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Sottolineato"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Testo barrato"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Annulla"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "Inserisci faccina"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Inserisci faccina"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Seleziona"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Colore testo"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Colore sfondo"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Visualizzazioni Contatto"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "Colore testo"
+msgid "Show graphical _smileys"
+msgstr "Mostra faccine grafiche"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Mostra tempo nei messaggi"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "Mostra URL come link"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Evidenzia parole errate"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Ignora i colori"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Colore sfondo"
+msgid "Ignore font _faces"
+msgstr "Ignora il seme dei font"
+
+#: src/prefs.c:382
+#, 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
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Tasto 'Invio' manda messaggio"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Ctrl-Invio manda messaggio"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "Finestra di IM"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Esc chiude la finestra"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Esc chiude la finestra"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Ctrl-{B/I/U/S} inserisce tag HTML"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Ctrl-(numero) inserisce faccina"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "In basso"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Nascondi bottoni IM/Info/Chat"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Mostra faccine grafiche"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Mostra tempo nei messaggi"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Mostra figure su bottoni"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Mostra URL come link"
+msgid "Buddy List Window"
+msgstr "Finestra lista contatti"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Evidenzia parole errate"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Salva posiz./dimens. finestra"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Evidenzia finestra ad un evento"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Visualizzazioni Gruppo"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Nascondi gruppi senza contatti collegati"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Mostra numeri nei gruppi"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Visualizzazioni Contatto"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "Mostra tipo icone di contatto"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Mostra livelli di avviso"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Ignora i colori"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Mostra tempi di Riposo"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Ignora il seme dei font"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Ignora la dimensione dei font"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignora messaggi automatizzati TiK"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Tasto 'Invio' manda messaggio"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Ctrl-Invio manda messaggio"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Ingrigisci contatti in Riposo"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "Finestra di IM"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Nuova larghezza finestra:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "Nuova altezza finestra:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Altezza campo di testo:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Evidenzia finestra ad un evento"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Nascondi finestra dopo l'invio"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Icone Contatti"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Esc chiude la finestra"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Nascondi Icone Contatti"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Esc chiude la finestra"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Ctrl-{B/I/U/S} inserisce tag HTML"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Ctrl-(numero) inserisce faccina"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Nascondi bottoni IM/Info/Chat"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Mostra figure su bottoni"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Mostra lista contatti all'entrata"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Disabilita animazione"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Mostra account nella finestra"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Notifica Popup"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Notifica a contatti che stai scrivendo"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "Completamento col TAB"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Il tasto TAB completa il nome"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Completamento di TAB all'antica"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Mostra lista contatti vicino applet"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Salva posiz./dimens. finestra"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "Evidenzia finestra ad un evento"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Nascondi gruppi senza contatti collegati"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Mostra numeri nei gruppi"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "Mostra tipo icone di contatto"
+msgid "_Show people joining/leaving in window"
+msgstr "Mostra chi entra/esce dalla finestra"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Mostra livelli di avviso"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "Tutte le chat in una finestra a schede"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Mostra tempi di Riposo"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Ingrigisci contatti in Riposo"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Nuova larghezza finestra:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "Nuova altezza finestra:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Altezza campo di testo:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Evidenzia finestra ad un evento"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Nascondi finestra dopo l'invio"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Nascondi Icone Contatti"
-
-#: src/prefs.c:578
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "Alias nelle linguette/titoli schede"
+
+#: src/prefs.c:536
 #, fuzzy
-msgid "Disable Buddy Icon Animation"
-msgstr "Disabilita animazione"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Mostra account nella finestra"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Notifica a contatti che stai scrivendo"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Il tasto TAB completa il nome"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "Completamento di TAB all'antica"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Mostra chi entra/esce dalla finestra"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+msgid "Chat Tabs"
+msgstr "Chat"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "Tutte le chat in una finestra a schede"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "Tutte le chat in una finestra a schede"
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "Alias nelle linguette/titoli schede"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "Tutte le chat in una finestra a schede"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Tutte le chat in una finestra a schede"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Lista contatti"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Tipo di Proxy"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Server Proxy"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Host"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Porta"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Utente"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Password"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "Opzioni Proxy"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "Crea nuova finestra di default"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Messaggi"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Log di tutte le conversazioni"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "Elimina HTML da log"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Vedi log di sistema"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "Log quando i contatti entrano/escono"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Log quando contatti dis/attivano Riposo"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Log quando contatti dis/attivano Assente"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Log tuoi stati di Ingresso/Riposo/Assente"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "File di log individuale per ogni contatto"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Opzioni suoni"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "Nessun suono quando entri"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Suona quando Assente"
 
-#: src/prefs.c:990
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Opzioni suoni"
+
+#: src/prefs.c:777
 #, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Comando per suonare i file dei suoni\n"
 "(%s per il nome del file, interno se vuoto)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "Spedire un messaggio rimuove stato Assente"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Accoda nuovi messaggi se sei Assente"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "Ignora nuove conversazioni se Assente"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "Non rispondere in automatico"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "Non rispondere in automatico"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Auto-rispondi solo quando a Riposo"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "A riposo: "
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Assente"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Configurazione Suoni"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 #, fuzzy
 msgid "Test"
 msgstr "Testo"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Scegli..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Modifica"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Modifica"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Istanza:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Font"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Messaggi"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "Finestra di IM"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Finestra chat gruppo"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Browser"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Suoni"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Eventi"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Titolo di Assente: "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Messaggio di Assente"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferenze"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: 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 "
@@ -3366,11 +3638,11 @@
 "questo motivo non ti posso dire con certezza qual'. Inutile dire che non  "
 "stato caricato."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Errore di Protocollo"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3378,42 +3650,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Azioni protocollo"
-
-#: src/prpl.c:103
+#: 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:106
-msgid "Disconnect"
-msgstr "Disconnetti"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Accetti?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nuova mail"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Apri la mail"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s ha fatto %s il loro contatto %s%s%s"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3424,7 +3687,7 @@
 "\n"
 "Vuoi aggiungerli alla tua lista dei contatti?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3432,15 +3695,15 @@
 "Attualmente c' nessun protocollo che ti permetta di registrarti con nuovi "
 "account."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrazione"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Informazioni sulla registrazione"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "Registra"
 
@@ -3457,10 +3720,6 @@
 msgid "(1 message)"
 msgstr "(1 messaggio)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Avvisato"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Si"
@@ -3518,12 +3777,171 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Errore Gadu-Gadu"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Informazione Gadu-Gadu"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "Impossibile inviare una richiesta http"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "Lista NON importata dal server (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "Lista NON esportata sul server (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Lista NON eliminata dal server (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "La connessione al servizio di ricerca  fallito (%s)"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - Cambio password"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Nome non valido"
+
+#~ msgid "MSN Error"
+#~ msgstr "Errore MSN"
+
+#~ msgid "Invalid name"
+#~ msgstr "Nome non valido"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Errore di chat!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Chat"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Errore"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Errore SNAC di Oscar"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Motivo sconosciuto."
+
+#~ msgid "AOL error"
+#~ msgstr "Errore AOL"
+
+#~ msgid "Error"
+#~ msgstr "Errore"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Avvisa l'utente?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "Ravviva TOC"
+
+#~ msgid "Chat Error"
+#~ msgstr "Errore di chat"
+
+#~ msgid "TOC Pause"
+#~ msgstr "Pausa TOC"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "Impossibile scrivere le intestazioni dei file!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Cerco di entrare..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Sei sconnesso. Clicca per la finestra di connessione."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Assente: %d in attesa."
+
+#~ msgid "Away."
+#~ msgstr "Assente."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Impossibile creare l'applet di Gaim!"
+
+#~ msgid "About..."
+#~ msgstr "Informazioni su..."
+
+#~ msgid "Message Error"
+#~ msgstr "Errore messaggio"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "Impossibile spedire messaggio: motivo sconosciuto."
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Errore di salto a contatto"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Errore di cambio Password"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "Impossibile rimuovere il file %s - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "Errore di Preferenze"
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr "Errore di login"
+
+#~ msgid "Login Error"
+#~ msgstr "Errore di login"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Script Perl"
+
+#~ msgid "Select"
+#~ msgstr "Seleziona"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Mostra lista contatti all'entrata"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Mostra lista contatti vicino applet"
+
+#~ msgid "Edit"
+#~ msgstr "Modifica"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Errore di Protocollo"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Azioni protocollo"
+
+#~ msgid "Disconnect"
+#~ msgstr "Disconnetti"
+
+#~ msgid "Warned"
+#~ msgstr "Avvisato"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Mostra segnalini Contatti"
 
-#~ msgid "General Options"
-#~ msgstr "Opzioni generali"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr ""
 #~ "Tutte le opzioni hanno effetto immediato se non altrimenti specificato."
@@ -3555,9 +3973,6 @@
 #~ msgid "Galeon"
 #~ msgstr "Galeon"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Opzioni Proxy"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3565,9 +3980,6 @@
 #~ "Non tutti i protocolli usano queste opzioni proxy. Leggi il file README "
 #~ "per i dettagli."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Tipo di Proxy"
-
 #~ msgid "No Proxy"
 #~ msgstr "Nessun Proxy"
 
@@ -3583,9 +3995,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Opzioni lista contatti"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Finestra lista contatti"
-
 #, fuzzy
 #~ msgid "Tab Placement:"
 #~ msgstr "Posizione linguetta"
@@ -3593,15 +4002,6 @@
 #~ msgid "Top"
 #~ msgstr "In alto"
 
-#~ msgid "Bottom"
-#~ msgstr "In basso"
-
-#~ msgid "Group Displays"
-#~ msgstr "Visualizzazioni Gruppo"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Visualizzazioni Contatto"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Opzioni conversazione"
 
@@ -3644,18 +4044,12 @@
 #~ msgid "Right"
 #~ msgstr "A destra"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Icone Contatti"
-
 #~ 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 "Tab Completion"
-#~ msgstr "Completamento col TAB"
-
 #~ msgid "Font Options"
 #~ msgstr "Opzioni font"
 
@@ -3668,13 +4062,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Dimensione font del testo"
 
-#~ msgid "Sound Options"
-#~ msgstr "Opzioni suoni"
-
-#, fuzzy
-#~ msgid "Sound method"
-#~ msgstr "Opzioni suoni"
-
 #, fuzzy
 #~ msgid "Sound played when:"
 #~ msgstr "Programma che suona:"
@@ -3688,9 +4075,6 @@
 #~ msgid "minutes using"
 #~ msgstr "minuti usando"
 
-#~ msgid "Messages"
-#~ msgstr "Messaggi"
-
 #~ msgid "Make Away"
 #~ msgstr "Metti Assente"
 
--- a/po/ja.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/ja.po	Tue Aug 27 02:43:54 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim version 0.56\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-04-22 13:12+0900\n"
 "Last-Translator: Ryosuke Kutsuna <ryosuke@cool.email.ne.jp>\n"
 "Language-Team: Japanese\n"
@@ -25,9 +25,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Ĥ"
 
@@ -40,16 +40,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "ä"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr ""
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -91,7 +93,7 @@
 msgid "Change"
 msgstr "³:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Ļ"
 
@@ -99,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "ͧã˲Ļ"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Υ"
 
@@ -116,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "ͧã鱣"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr ""
 
@@ -148,7 +150,7 @@
 msgid "Unknown Error Code."
 msgstr "ǽʥ"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -218,16 +220,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "̵Gadu-Gadu UIN˥åȤƤޤ"
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu 顼"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "̤ޤǤ"
@@ -273,104 +265,151 @@
 msgid "Sex"
 msgstr ""
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Į"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "о˳Ǽ줿֥ꥹȤϤޤ󡣻ǰǤ!"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "Ф֥ꥹȤǤޤǤ"
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Ф֥ꥹȤžޤ"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Gadu-Gadu "
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "֥ꥹȤΥФؤžǤޤ"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "Ф֥ꥹȤޤ"
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Ф֥ꥹȤǤޤ"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "ѥѹǤޤ"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "ѥѹǤޤǤ"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "HTTPꥯȤޤǤ"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "Ф֥ꥹȤΥݡȤ˼ (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "Фؤ֥ꥹȤΥݡȤ˼ (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Ф֥ꥹȤκ˼ (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "ӥ³ (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "ѥɤѹ˼ (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Ф֥ꥹȤǤޤǤ"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "ľIM򳫤ޤ"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "åȤɤޤ"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "ǥ쥯ȥ긡"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "ѥѹ"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Ф֥ꥹȤΥݡ"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Ф֥ꥹȤ򥨥ݡ"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Ф֥ꥹȤ"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "%sեɤ߹ޤ"
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "зͳǥå"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr ""
@@ -386,20 +425,16 @@
 msgstr "<B>%sΥȥԥåѤޤ: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "Τ褦ʥ˥å/ͥϤޤ"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "IRC顼"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "Τ褦ʥФϤޤ"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "˥åͿƤޤ"
 
 #: src/protocols/irc/irc.c:976
@@ -414,8 +449,8 @@
 msgstr "񤭹ޤ"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "ʤ%s˽ޤ: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -428,10 +463,6 @@
 msgid "You have left %s"
 msgstr "%s༼ޤ"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "IRCѡ"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "³:"
@@ -445,46 +476,60 @@
 msgstr "DCCå"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - ѥѹ"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "åȤɤޤ"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "åȤɤޤ"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "饤"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "ƨ"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "⤹"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Jabber 顼"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "ǽʥ"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -492,209 +537,217 @@
 "\n"
 "֥ꥹȤɲäޤ?"
 
-#: src/protocols/jabber/jabber.c:1655
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "Τ褦ʥ桼Ϥޤ"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-msgid "Jabber Error"
-msgstr "Jabber 顼"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "֤"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "ǧ"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "ʥ󥨥顼"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "ѥѹǤޤ"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - ѥѹ"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "³ڤޤ"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "³Ǥޤ"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "³ޤ"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "ǧ׵"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "³"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-#, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "̵̾"
-
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
+msgid "Jabber Error"
+msgstr "Jabber 顼"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "ϥɥ:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "³Ǥޤ"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "å"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "򸫤"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Υʥå"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "ݥåץå"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "̾"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "²̾"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "Ϳ줿̾"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "˥å͡"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "¾"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "͹ֹ"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "ֹ"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "ȿ̾"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "°"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "̾"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 "ΥƥϤ٤ƥץǤŬ˴Ϥޤ"
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "桼ID"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCardˤäƳȯ줿"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "ФϿޤ"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Ͽ顼"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "桼Ͽ"
 
@@ -862,116 +915,132 @@
 msgid "Unknown Error Code"
 msgstr "ǽʥ"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "MSN顼"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaimϥåޤ"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "ǤƤޤ 㤦³Ƥޤ"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "åȤɤ߹ߤ˼"
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "åȤɤޤ"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "ѥ"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Ф³Ǥޤ"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "ФϿ"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
-#, fuzzy
-msgid "Busy"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1926
+#, fuzzy
+msgid "Busy"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "쥢"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "̾"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "꡼͡: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "̵̾"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "롼פؤλ:"
@@ -1004,60 +1073,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "åȥ롼%sǤޤ"
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "åȥ顼"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "åȤ³Ǥޤ"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - å"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "ۥȤ³ǤޤǤ"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "ѥԤǤ\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "³顼Ǥ\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "AIMإǤޤ"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "󥪥: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "󥪥\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "³Ǥޤ"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "³Ǥޤcookie"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "ְä˥å͡फѥɤǤ"
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "ʤΥȤϸǤ"
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1065,24 +1129,47 @@
 "ˤ³ƤʬΥƤޤ10ʬԤäơƤӻߤƤ"
 "³СĹԤɬפǤ礦"
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "饤ȤΥС󤬸Ťޤ åץǡȤޤ礦"
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "ǧڤ˼"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "顼"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaimϥåޤ"
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "Gaimϥåޤ"
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s ȤľIMΩޤ"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1092,121 +1179,109 @@
 "桼%dϡͳΤˤʤܿꥹȤˤä뤢ʤΥꥯ"
 "Ȥꤷޤ\n"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "ͳ"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - ICQǧڤ˵ݤޤ"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, fuzzy, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "桼%dϡʤΥꥯȤʤΥ󥿥ȥꥹȤä뤳Ȥ"
 "ǧޤ"
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim - ICQǧ"
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "%2$sΥå%1$d̵Ǥ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "%2$sΥå%1$d̵Ǥ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "%2$s%1$dåϤǤ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "%2$s%1$dåϤǤ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "³ĶᤷΤ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "³ĶᤷΤ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Ǥ%2$s%1$dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - 顼"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 롼顼: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Oscar SNAC 顼"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "%sؤΥåǤޤǤ:%s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "ͳ"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "%sΥ桼󤬸ޤ: %s"
@@ -1316,50 +1391,87 @@
 msgstr "<i>󶡤ƤϤޤ</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "³ޤ"
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL顼"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "³ãƤ뤿åޤǤ10äޤäƺƤ"
 ""
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "顼"
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr "Gaim - ICQǧڤ˵ݤޤ"
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr "Gaim - ICQǧ"
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "%sեɤ߹ޤ"
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaimϥåޤ"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - 桼ٹ𤷤ޤ?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "ľIM򳫤ޤ"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1369,30 +1481,30 @@
 "%sȤľIM򤷤ޤ ʤIPɥ쥹˸褦ˤޤ"
 "ƥŪޤ³ޤ?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Υʥå"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "ľIM"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "ǽ"
 
@@ -1524,48 +1636,42 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOCϵٻߤɤޤ åκǤޤ"
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "TOC"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "åȥ顼"
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "ѥѹ"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - ѥѹ"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOCϵٻߥޥɤޤ 줬ȯTOCϥå̵"
 "ʤåäƤ⽳ޤ GaimϤˤɤΥå"
 "ȴ뤳Ȥ⤢ޤ ŪǤΤDzƤ"
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOCٻ"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "ǥ쥯ȥ"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "ž³Ǥޤ"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "ž³Ǥޤ"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "եإå񤯤ȤǤޤ!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1587,22 +1693,23 @@
 msgstr "%sե褦׵ᤷƤޤ"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "åޤǤ"
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "饹:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "󥹥:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr ""
 
@@ -1625,10 +1732,11 @@
 "URL:"
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1672,6 +1780,9 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
+#. this makes the sizes not work.
+#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Web"
@@ -1681,13 +1792,10 @@
 msgstr "󥪥"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "󤷤Ƥ"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "󥪥󥨥顼"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - "
@@ -1728,40 +1836,11 @@
 msgid "Preferences"
 msgstr ""
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "ư"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "󥪥ξǧ"
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "ե饤 ܥå򥯥åƤ"
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Υ: %d ڥǥ"
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Υ"
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Υʥå"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "GaimץåȤĤޤ!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "About..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Υ!"
@@ -1774,6 +1853,10 @@
 msgid "Back"
 msgstr ""
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Υʥå"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Υʥåκ"
@@ -1782,7 +1865,7 @@
 msgid "Set All Away"
 msgstr "Υʤ"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "롼"
 
@@ -1792,12 +1875,13 @@
 msgstr "IM"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr ""
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "ꥢ"
 
@@ -1817,10 +1901,6 @@
 msgid "Un-Alias"
 msgstr "ꥢ"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "֤Ϥ"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "֤Ϥ"
@@ -1877,7 +1957,7 @@
 msgid "Information on selected Buddy"
 msgstr "򤷤֤ξ"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "ʰץå"
 
@@ -1905,7 +1985,7 @@
 msgid "New Instant Message"
 msgstr "ʰץå"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "桼"
 
@@ -1917,6 +1997,10 @@
 msgid "Tools"
 msgstr "ġ"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "֤Ϥ"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "ץȥ"
@@ -1963,7 +2047,7 @@
 msgid "About Gaim"
 msgstr "GaimˤĤ"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "֥ꥹ"
 
@@ -1996,12 +2080,12 @@
 msgstr "̾ꤷƥåȤ˲"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr ""
 
@@ -2014,7 +2098,7 @@
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr ""
 
@@ -2030,10 +2114,11 @@
 msgid "Un-Ignore"
 msgstr "̵"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "̵"
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, c-format
@@ -2077,15 +2162,15 @@
 msgstr "䤯"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "ٹ"
@@ -2099,16 +2184,14 @@
 msgstr "Gaim - "
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "åޤ: Ǥ"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "å顼"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "åޤ: "
+#, fuzzy
+msgid "Unable to send message"
+msgstr "åޤ: Ǥ"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2120,156 +2203,156 @@
 msgid "Setting position to %d\n"
 msgstr "֤%dˤޤ\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "ܡɥƥ"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "ܡ"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "åƥ"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "å"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "ƥ"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "ƥ"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr ""
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "̤Υեȥ"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr ""
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "礭"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "եȤ"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "ե"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "ʸ"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "طʿ"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "󥯤"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "ޥ꡼"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "ޥ꡼"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "IM"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "ͭ"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "ä¸"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "¸"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "̾դƥå:"
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - ¸"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "˥᡼̵"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "˥᡼ͭ"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "쥢"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "̾դƥ¸"
 
@@ -2311,385 +2394,406 @@
 "your buddylist. Do you want to continue?"
 msgstr "֥ꥹȤ'%s'뤳ȤˤĤ³ޤ?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "λ"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "λ"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - IM桼"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "IM ï:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "桼:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr ""
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 桼"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "롼ɲ"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - 롼ɲ"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - ɲ"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "ɲ"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "󥿥"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "ɲ"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Υ!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Ŀ;:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "ܿ"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "ʲΥ桼Τߵ"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "ĥꥹ"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "ïʤ"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "ʲΥ桼Τߵ"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "ݥꥹ"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Ϥߤ֤򤤤Ƥ"
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Ϥߥ顼"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ֤Ϥ"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "ïϤ"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr ""
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "ĤĤߤ"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "󥪥λ"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Υʤä"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "ٻߤä"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "ʤ֤Ϥ"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Ϥ"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "IMɥ򳫤"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "ݥåץå"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "å"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Ϥॳޥɤμ¹"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Ϥ಻"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Ϥߤ¸"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - ǥ쥯ȥ"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "ǥ쥯ȥ"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Web餢ʤξդ뤳ȤĤ"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr ""
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "ߥɥ͡"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "̾"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr ""
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr ""
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "ѥɤϥޥåޤ"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - ѥѹ顼"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "ƤϤƤ"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "ꥸʥѥ"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - ѥѹ"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "ꥸʥѥ"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "ѥ"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "ѥ()"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 桼Ͽ"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "ʤθ̤: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr ""
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ĥɲ"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ĥɲ"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "֤θ"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 󤫤֤õ"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - E-mail֤õ"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - URLɲ"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "ʸ"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "طʿ"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "ݡȤ: "
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - ֥ꥹȤΥݡ"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "̾ΥʥåϺޤ"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "Υåޤ"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Υʥå"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Υʥå"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Υʥå ̾:"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Ȥ"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "¸ƻȤ"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Ф!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "֤Υꥢ"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - ֤Υꥢ"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "ۥȤ³ǤޤǤ"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - ¸"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "ե %s - %s "
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "˥?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "ե%s򳫤ޤ"
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "˥?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "õ"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - 롼פβ̾"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "롼פβ̾"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "̾"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - ֤β̾"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "֤β̾"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - PerlץȤ"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "ե%s򳫤ޤ"
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "ꥨ顼"
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2699,10 +2803,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ³ϥ顼\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr "󥨥顼"
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaimϥåޤ"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2716,7 +2820,7 @@
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "ꥻå"
 
@@ -2758,17 +2862,22 @@
 msgstr "ѥ"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "󥨥顼"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "ץȥ"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2776,40 +2885,40 @@
 "ΥȤǤϥȤޤ ץȥɤ߹Ǥʤʤɤ߹"
 "ץȥ뤬ǤϵǽʤǤ"
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "%sΤǤ?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Խ"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr ""
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Ƽư"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "򤷤ʤ"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Խ"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "󥪥/"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2818,28 +2927,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s ϥ󥪥Ǥޤ"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "󥪥󥨥顼"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s ϥ󥪥դޤ"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "³顼"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perl ץ"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - ץ饰ꥹ"
@@ -2848,10 +2957,12 @@
 msgid "Gaim - Plugins"
 msgstr "Gaim - ץ饰"
 
+#. Left side: frame with list of plugin file names
 #: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "ץ饰ɤ߹"
 
+#. Right side: frame with description and the filepath of plugin
 #: src/plugins.c:265
 #, fuzzy
 msgid "Selected Plugin"
@@ -2897,428 +3008,596 @@
 msgid "Close this window"
 msgstr "ΥɥĤ"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr "Ūʥץ"
+
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:282
 #, fuzzy
-msgid "Windows"
-msgstr "IMɥ"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "ǥХåɥɽ"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "ʤܥȤ"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr ""
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "ʤܥȤ"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "ܡ"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "å"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr ""
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "ƥ"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr ""
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "ޥ꡼"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "ޥ꡼"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr ""
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "ʸ"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "طʿ"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "֤ɽ"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "ʸ"
+msgid "Show graphical _smileys"
+msgstr "եåޥ꡼ɽ"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "åΥॹפɽ"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "󥯤ȤURLɽ"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "ߥڥϥ饤Ȥ"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "̵"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "طʿ"
+msgid "Ignore font _faces"
+msgstr "եȤ̵"
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "եȥ̵"
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "TiKưå̵"
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Enterפǥå"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Control-Enterפǥå"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "IMɥ"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "EscapeפǥɥĤ"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "EscapeפǥɥĤ"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Control-{B/I/U/S}פHTML"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Control-(number)פǥޥ꡼"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "ֲ"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "IM//åȥܥ򱣤"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "եåޥ꡼ɽ"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "åΥॹפɽ"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "ܥɽ"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "󥯤ȤURLɽ"
+msgid "Buddy List Window"
+msgstr "֥ꥹȥɥ"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "ߥڥϥ饤Ȥ"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "ɥ֤¸"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "٥ȯǥɥ򥢥ƥ֤ˤ"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "롼פɽ"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "ե饤ͧãϥ롼פ򱣤"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "롼׿ɽ"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "֤ɽ"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "֥ץɽ"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "ٹ٥ɽ"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "̵"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "ٻ߻֤ɽ"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "եȤ̵"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "եȥ̵"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "TiKưå̵"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Enterפǥå"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Control-Enterפǥå"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "ٻ֤ϥ졼"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "IMɥ"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "ɥ:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "ɥι⤵:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "ϥåȤι⤵:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "٥ȯǥɥ򥢥ƥ֤ˤ"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "ɥ򱣤"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "֥"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "EscapeפǥɥĤ"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "֥򱣤"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "EscapeפǥɥĤ"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S}פHTML"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(number)פǥޥ꡼"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "IM//åȥܥ򱣤"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "ܥɽ"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Ͽ줿ͧãꥹȤưɽ"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "˥᡼̵֥"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "ɥǥɽ"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "ݥåץå"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "åΤ"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "ִλ"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "֤Υ˥å͡"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "ŤΥ"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "ץåնͧãꥹȤɽ"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "ɥ֤¸"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "٥ȯǥɥ򥢥ƥ֤ˤ"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "ե饤ͧãϥ롼פ򱣤"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "롼׿ɽ"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "֥ץɽ"
+msgid "_Show people joining/leaving in window"
+msgstr "/Υʤ򥦥ɥɽ"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "ٹ٥ɽ"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "ƤΥåȤĤΥ֥ɥɽ"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "ٻ߻֤ɽ"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "ٻ֤ϥ졼"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "ɥ:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "ɥι⤵:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "ϥåȤι⤵:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "٥ȯǥɥ򥢥ƥ֤ˤ"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "ɥ򱣤"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "֥򱣤"
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "˥᡼̵֥"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "ɥǥɽ"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "åΤ"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "֤Υ˥å͡"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "ŤΥ"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "/Υʤ򥦥ɥɽ"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "/̾򥨥ꥢɽ"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "å"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "ƤΥåȤĤΥ֥ɥɽ"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "ƤΥåȤĤΥ֥ɥɽ"
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "/̾򥨥ꥢɽ"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "ƤΥåȤĤΥ֥ɥɽ"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Ʊ֥ɥǥåȤɽ"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "֥ꥹ"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "ץ"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "ץ"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "ۥ̾"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "ݡֹ"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "桼̾"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "ѥ"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "ץץ"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "ǥեȤǿɥ򳫤"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "å"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Ƥβä"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "HTMLǤ"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "ƥ򸫤"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "֤󥪥/դȤ"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "֤ٻ/Ȥ"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "֤Υ/ʤȤ"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "ʤʬǥ󥪥/ٻ/ΥʤΤ"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "֤줾ǥ"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "ץ"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "󤷤Ȥ˲Ĥ餵ʤ"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Υβ"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "᥽å"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "ޥ\n"
 "(ե̾%s)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "Υʾ֤Υå"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Υʤ鿷åϥ塼"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "Υʻοä̵"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "ưʤ"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "ưʤ"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "ٻϼưΤ"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "ɥ: "
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Υ"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - "
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "ƥ"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Խ"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Խ"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "󥹥:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "ե"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "å"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "IMɥ"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "롼ץåȥɥ"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "ץ"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr ""
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Υʥå ̾:"
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Υʥå"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim ǥХåɥ"
 
 #: src/prpl.c:70
+msgid "Incompatible protocol detected."
+msgstr ""
+
+#: src/prpl.c:71
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
@@ -3330,11 +3609,11 @@
 "ɤäʤ뤳ȤǤޤޤǤʤΣ˥"
 "ɤޤǤ"
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "ץȥ륨顼"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3342,42 +3621,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "ץȥ"
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%sϺ%sѤƤޤ %sϺե饤Ǥ"
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr ""
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Ĥޤ?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - ץץ"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - ᡼"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "᡼򳫤"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s %s%s%sޤ"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3388,21 +3658,21 @@
 "\n"
 "֥ꥹȤɲäޤ?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "ϿɬפʥץȥǸ߻Ȥޤ"
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Ͽ"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Ͽ"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "Ͽ"
 
@@ -3419,10 +3689,6 @@
 msgid "(1 message)"
 msgstr "(1 å)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "ٹ"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Ϥ"
@@ -3479,12 +3745,171 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gadu-Gadu 顼"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Gadu-Gadu "
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "HTTPꥯȤޤǤ"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "Ф֥ꥹȤΥݡȤ˼ (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "Фؤ֥ꥹȤΥݡȤ˼ (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Ф֥ꥹȤκ˼ (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "ӥ³ (%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "ѥɤѹ˼ (%s)"
+
+#~ msgid "No such nick/channel"
+#~ msgstr "Τ褦ʥ˥å/ͥϤޤ"
+
+#~ msgid "IRC Error"
+#~ msgstr "IRC顼"
+
+#~ msgid "No such server"
+#~ msgstr "Τ褦ʥФϤޤ"
+
+#~ msgid "IRC Part"
+#~ msgstr "IRCѡ"
+
+#, fuzzy
+#~ msgid "Password Change Error!"
+#~ msgstr "Gaim - ѥѹ"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - ѥѹ"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "̵̾"
+
+#~ msgid "MSN Error"
+#~ msgstr "MSN顼"
+
+#~ msgid "Invalid name"
+#~ msgstr "̵̾"
+
+#~ msgid "Chat Error!"
+#~ msgstr "åȥ顼"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - å"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - 顼"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Oscar SNAC 顼"
+
+#~ msgid "Reason unknown"
+#~ msgstr ""
+
+#~ msgid "AOL error"
+#~ msgstr "AOL顼"
+
+#~ msgid "Error"
+#~ msgstr "顼"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - 桼ٹ𤷤ޤ?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC"
+
+#~ msgid "Chat Error"
+#~ msgstr "åȥ顼"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOCٻ"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "եإå񤯤ȤǤޤ!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "󥪥ξǧ"
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "ե饤 ܥå򥯥åƤ"
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Υ: %d ڥǥ"
+
+#~ msgid "Away."
+#~ msgstr "Υ"
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "GaimץåȤĤޤ!"
+
+#~ msgid "About..."
+#~ msgstr "About..."
+
+#~ msgid "Message Error"
+#~ msgstr "å顼"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "åޤ: "
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Ϥߥ顼"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - ѥѹ顼"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "ե %s - %s "
+
+#~ msgid "Preferences Error"
+#~ msgstr "ꥨ顼"
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr "󥨥顼"
+
+#~ msgid "Login Error"
+#~ msgstr "󥨥顼"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl ץ"
+
+#~ msgid "Select"
+#~ msgstr ""
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Ͽ줿ͧãꥹȤưɽ"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "ץåնͧãꥹȤɽ"
+
+#~ msgid "Edit"
+#~ msgstr "Խ"
+
+#~ msgid "Protocol Error"
+#~ msgstr "ץȥ륨顼"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "ץȥ"
+
+#~ msgid "Disconnect"
+#~ msgstr ""
+
+#~ msgid "Warned"
+#~ msgstr "ٹ"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "֥åɽ"
 
-#~ msgid "General Options"
-#~ msgstr "Ūʥץ"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr ""
 #~ "⤷¾ˡդʤäʤСץϤ٤Ƹ̤ľ˸路"
@@ -3517,9 +3942,6 @@
 #~ msgid "Galeon"
 #~ msgstr "Galeon"
 
-#~ msgid "Proxy Options"
-#~ msgstr "ץץ"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3527,9 +3949,6 @@
 #~ "ƤΥץȥǥץץϻȤʤ READMEեߤƤ"
 #~ ""
 
-#~ msgid "Proxy Type"
-#~ msgstr "ץ"
-
 #~ msgid "No Proxy"
 #~ msgstr "ץѤʤ"
 
@@ -3545,24 +3964,12 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "֥ꥹȥץ"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "֥ꥹȥɥ"
-
 #~ msgid "Tab Placement:"
 #~ msgstr "ִ"
 
 #~ msgid "Top"
 #~ msgstr "־"
 
-#~ msgid "Bottom"
-#~ msgstr "ֲ"
-
-#~ msgid "Group Displays"
-#~ msgstr "롼פɽ"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "֤ɽ"
-
 #~ msgid "Conversation Options"
 #~ msgstr "åץ"
 
@@ -3605,18 +4012,12 @@
 #~ msgid "Right"
 #~ msgstr ""
 
-#~ msgid "Buddy Icons"
-#~ msgstr "֥"
-
 #~ msgid "Chat Options"
 #~ msgstr "åȥץ"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "ƤβäƱ֥ɥɽ"
 
-#~ msgid "Tab Completion"
-#~ msgstr "ִλ"
-
 #~ msgid "Font Options"
 #~ msgstr "եȥץ"
 
@@ -3629,12 +4030,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "ƥȤΥեȥ"
 
-#~ msgid "Sound Options"
-#~ msgstr "ץ"
-
-#~ msgid "Sound method"
-#~ msgstr "᥽å"
-
 #~ msgid "Sound played when:"
 #~ msgstr "Ĥ餹Ȥ:"
 
@@ -3647,9 +4042,6 @@
 #~ msgid "minutes using"
 #~ msgstr "ʬ"
 
-#~ msgid "Messages"
-#~ msgstr "å"
-
 #~ msgid "Make Away"
 #~ msgstr "ɤä"
 
--- a/po/ko.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/ko.po	Tue Aug 27 02:43:54 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.58\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-06-03 09:02+0900\n"
 "Last-Translator: A Lee <alee@debian.org>\n"
 "Language-Team: artsilly and alee team\n"
@@ -25,9 +25,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "ݱ"
 
@@ -40,16 +40,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "߰"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr ""
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -91,7 +93,7 @@
 msgid "Change"
 msgstr "ä:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "޽   "
 
@@ -99,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "ģ鿡Ը ޽   "
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "ڸ"
 
@@ -116,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "ģ鿡Ը  ʵ "
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "޽   "
 
@@ -148,7 +150,7 @@
 msgid "Unknown Error Code."
 msgstr "    ڵ."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -218,16 +220,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "߸ - 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
 msgid "Couldn't get search results"
 msgstr "˻    ϴ"
@@ -273,104 +265,151 @@
 msgid "Sex"
 msgstr ""
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "/"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr " ģ  Ǿ  ʽϴ."
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr " ģ    ϴ."
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr " ģ   Խϴ."
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "- "
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr " ģ    ϴ."
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr " ģ  Ǿϴ."
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr " ģ    ϴ."
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "йȣ  Ǿϴ."
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "йȣ   ϴ."
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "http û   ϴ."
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr " ģ    (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "ģ     (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr " ģ    (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "˻ 񽺿   (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "йȣ   (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr " ģ    ϴ."
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr " ޽   "
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "   ϴ."
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "丮 ˻"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "йȣ "
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr " ģ  "
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "ģ   "
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr " ģ  "
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "%s    ϴ."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "  ޽ "
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr " "
@@ -386,20 +425,16 @@
 msgstr "<B>%s   %s  ٲپϴ</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "׷ ȭ̳ ä ϴ."
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "IRC "
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "׷  ϴ"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "ȭ Է ʾҽϴ"
 
 #: src/protocols/irc/irc.c:976
@@ -414,8 +449,8 @@
 msgstr "  ϴ."
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "%sκ  Ǿϴ: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -428,10 +463,6 @@
 msgid "You have left %s"
 msgstr "%s ܵξϴ."
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "IRC "
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "ä:"
@@ -445,230 +476,253 @@
 msgstr "DCC ä"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr " - йȣ "
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "   ϴ."
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "   ϴ."
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr "˷ "
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "ڸ"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "ر"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr " "
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "    ڵ."
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
 
-#: src/protocols/jabber/jabber.c:1655
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "׷  "
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-msgid "Jabber Error"
-msgstr " "
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "ģ"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr " Ȯ "
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "   α "
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "йȣ  Ǿϴ."
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr " - йȣ "
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "  ϴ"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "  ûϴ "
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-msgid "Invalid Jabber I.D."
-msgstr "߸  ̵"
-
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
+msgid "Jabber Error"
+msgstr " "
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 #, fuzzy
 msgid "Server:"
 msgstr "Ͻ "
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "ó:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "  ϴ"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "ä"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr " ȭ "
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "ڸ ޽ "
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "˾â  "
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "̸"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Ÿ ּ"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr " ּ"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "ġ"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "ȣ"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "ȭ"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr " ̸"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr " μ"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -676,23 +730,23 @@
 "  ׸ ûԴϴ. Էص ϴٰ ϴ  Է"
 "ʽÿ."
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr " Ȯ"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr " -  vCard "
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "  ߽ϴ!"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "  Է"
 
@@ -859,116 +913,132 @@
 msgid "Unknown Error Code"
 msgstr "    ڵ."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "MSN "
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "޽   ϴ"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, 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:1076
+#: src/protocols/msn/msn.c:1078
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "ٸ   ̵ αϿ  ϴ."
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Ͽ д ߿  ߻߽ϴ."
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "   ϴ."
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "йȣ: "
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "   ϴ."
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr " "
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
-#, fuzzy
-msgid "Busy"
-msgstr "ģ"
-
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1926
+#, fuzzy
+msgid "Busy"
+msgstr "ģ"
+
+#: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "̵: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "߸ ̸"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr " ׷:"
@@ -1001,60 +1071,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "%s ȭǰ  ϴ."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "ä !"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr " ä  ϴ."
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr " - ä"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "ȣƮ   ϴ."
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "н带   ٸ \n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "  \n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "AIM  α  ϴ"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr ": %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr " .\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "  ϴ"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "  Ű ½ϴ"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "̵ н尡 ƲȽϴ."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "    Դϴ."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1062,26 +1127,49 @@
 "ʹ  ϰ  Ͽϴ. 10 ٸ  ٽ õϽʽÿ.  "
 "õѴٸ ٷ ϴ ð  ϴ."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 "ϰ ִ Ŭ̾Ʈ ʹ Ǿϴ.  ġ ׷̵Ͻ"
 "ÿ. "
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "޽   ϴ"
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "޽   ϴ"
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, 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:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1092,121 +1180,109 @@
 ": \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr " Է ʾҽϴ."
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr " - ICQ  źε"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, 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
+#: 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:1586
+#: 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:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "%d %s  ޽ ʹ Ŀ   ϴ."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "%d %s  ޽ ʹ Ŀ   ϴ."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "%d %s  ޽ ð  ʰ   ϴ."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "%d %s  ޽ ð  ʰ   ϴ."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr ""
 "%d %s  ޽  ܾ ϰ ־   ϴ."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr ""
 "%d %s  ޽  ܾ ϰ ־   ϴ."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr " ܾ ؼ %d %s  ޽   ϴ."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr " ܾ ؼ %d %s  ޽   ϴ."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "    %d %s  ޽   ϴ."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "    %d %s  ޽   ϴ."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr " - "
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC : %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr " - ī SNAC "
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "%sԿ ޽  ߽ϴ: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "   "
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr " Է ʾҽϴ."
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "%s   ޾ƿ  ϴ: %s"
@@ -1311,30 +1387,72 @@
 msgstr "<i> </i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr " ϴ."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL "
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "ʹ  ޽   ʰϿ  ޽   "
 ". 10  ٽ õϽʽÿ."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr " - ICQ  źε"
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr " - ICQ  ޾Ƶ鿩"
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "%s    ϴ."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "޽   ϴ"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1344,19 +1462,15 @@
 "ϴ. ѵ ں ģ     ģ ¶  "
 "  ֽϴ."
 
-#: src/protocols/oscar/oscar.c:3210
-msgid "Gaim - Warning"
-msgstr " - "
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "ȯ:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr " ޽   "
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1367,7 +1481,7 @@
 "IP ּҸ   , ̴ Ȼ    ֽϴ. ׷  "
 "ұ?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1376,7 +1490,7 @@
 "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ϴ α׷ "
 " ޽    ʽϴ.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, fuzzy, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1385,15 +1499,15 @@
 "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ϴ α׷ "
 " ޽    ʽϴ.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 msgid "Get Status Msg"
 msgstr " ޽ "
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "   "
 
@@ -1526,48 +1640,42 @@
 msgstr ""
 "TOC Ͻ ¿ ٽ ۵Ǿϴ.  ޽   ֽϴ."
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "TOC ٽ "
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "ä "
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "йȣ Ǿϴ."
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr " - йȣ "
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC Ͻ  ½ϴ. TOC Ͻ    ޽ "
 "մϴ. ׸  ޽     ֽϴ. ̰"
 " Ͻ ̴ Ű澲 ʽÿ."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC Ͻ"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "丮  "
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "    ϴ!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "    ϴ!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "    ϴ!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1591,22 +1699,23 @@
 msgstr "%s  ޶ ûϿϴ"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "޽ ޵ ʾҽϴ."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "Zġ"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Ŭ:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "νϽ:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "޴»:"
 
@@ -1630,10 +1739,11 @@
 "URL:"
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1677,6 +1787,9 @@
 "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 "Ʈ"
@@ -1686,13 +1799,10 @@
 msgstr " "
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "  Էϼ"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr " "
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr " - α"
@@ -1733,40 +1843,11 @@
 msgid "Preferences"
 msgstr "ȯ漳"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "ڵ α"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr " õմϴ...."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "ӵǾ  ʽϴ. Ŭϸ α ȭ ɴϴ."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "ڸ: %d "
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "ڸ"
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr " ڸ ޽"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr " ø   ϴ!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "... Ͽ"
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr " - ڸ!"
@@ -1779,6 +1860,10 @@
 msgid "Back"
 msgstr "ڷ"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr " ڸ ޽"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "ڸ ޽ "
@@ -1787,7 +1872,7 @@
 msgid "Set All Away"
 msgstr " ڸ ޽ "
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "׷"
 
@@ -1797,12 +1882,13 @@
 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:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr ""
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr ""
 
@@ -1822,10 +1908,6 @@
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "ģ˸"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr " ģ˸"
@@ -1883,7 +1965,7 @@
 msgid "Information on selected Buddy"
 msgstr " ģ  "
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "޽ "
 
@@ -1911,7 +1993,7 @@
 msgid "New Instant Message"
 msgstr " ޽"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "  "
 
@@ -1923,6 +2005,10 @@
 msgid "Tools"
 msgstr ""
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "ģ˸"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "  "
@@ -1967,7 +2053,7 @@
 msgid "About Gaim"
 msgstr "..."
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "ģ "
 
@@ -2000,12 +2086,12 @@
 msgstr "ä  :"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr ""
 
@@ -2018,7 +2104,7 @@
 msgid "Invite"
 msgstr "ʴ"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "ģ"
 
@@ -2034,10 +2120,11 @@
 msgid "Un-Ignore"
 msgstr " "
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr ""
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, c-format
@@ -2081,15 +2168,15 @@
 msgstr "ӼӸ"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr ""
@@ -2103,16 +2190,14 @@
 msgstr " - ׸ "
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "޽   ϴ : ʹ Ůϴ."
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "޽ "
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "޽   ϴ :    "
+#, fuzzy
+msgid "Unable to send message"
+msgstr "޽   ϴ : ʹ Ůϴ."
 
 #: src/conversation.c:1559
 #, c-format
@@ -2124,156 +2209,156 @@
 msgid "Setting position to %d\n"
 msgstr "%d ġ űϴ\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "β ۾"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "β"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr " ۾"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr ""
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr " ģ ۾"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr " ģ ۾"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr " ũ ̱"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "۰"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr " ũ "
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr " ũ Ű"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "ũ"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "۲ "
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "۲"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr " "
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "  "
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "ũ "
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "ũ"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "ϸ  "
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "ϸ"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "޽ ׸ "
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr "׸"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr " ϱ"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "ȭ "
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Ҹ"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr " - ȭ"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "äý  :"
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr " -  "
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "ִϸ̼ "
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "ִϸ̼ "
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr " "
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr " ̸  "
 
@@ -2317,384 +2402,405 @@
 " ģ Ͽ '%s'\n"
 "ұ?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr ""
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "Ȯ"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr " - ޽ "
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr " ģ"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr ":"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 msgid "Account:"
 msgstr ":"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr " -   "
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "׷ ߰"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr " - ׷ ߰"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr " - ģ ߰"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "ģ ߰"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "̵"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr ""
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr " - ڸ!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr " :"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr " ڰ   ֵ "
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr " Ͽ ִ ڸ   ֵ "
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr " "
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr " ڸ ź"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr " Ͽ ִ ڸ "
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr " "
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "ģ˸  ģ Էϼ."
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "ģ˸ "
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr " -  ģ˸"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "ģ˸ - ?"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr ""
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "ģ˸ - ?"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "ģ   ˸"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "ģ ڸ򿡼 ƿ  ˸"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "ģ ѾϿ ƿ  ˸"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "ģ  Ÿ ϸ ˸"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "ģ˸ - ൿ?"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "޽ â "
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "˾â  "
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "޽ "
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "ģ˸  "
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "ģ˸ Ҹ "
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr " ۵  ģ˸ "
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr " - 丮  "
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "丮 "
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr " Ͽ   ˻  ֵ "
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr ""
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "߰ ̸"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "̸"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "ȥ  ̸"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "/"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr " н尡 ġ ʽϴ"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr " - йȣ  "
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr " ׸  äʽÿ"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr " йȣ"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr " - йȣ "
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr " йȣ"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr " йȣ"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr " йȣ Ȯ"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr " -   "
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "˻   ϴ: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "ź"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr " -   ߰"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr " - ź  ߰"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr " - ȭ "
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "ģ ã"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr " -  ģ ã"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr " -  ּҷ ģ ã"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr " - URL ߰"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "  "
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr " :"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr " - ģ "
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "ڸ ޽     ˴ϴ"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "ڸ ޽    ˴ϴ"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr " -  ڸ ޽"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr " ڸ ޽"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "ڸ : "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "  "
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "ģ  "
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr " -  "
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "ȣƮ   ϴ."
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr " - α "
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "%s    ϴ. - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr " α׸ ?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "  %s   ϴ."
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr " α׸ ?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "Ȯ"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "¥"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "ȭ"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr " - ׷ ̸ "
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "׷ ̸ "
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr " ̸:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr " - ģ ̸ "
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "ģ ̸ "
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr " -  ũƮ "
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "  %s   ϴ."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "ȯ漳 "
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2704,10 +2810,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003:  .\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr "α "
+msgid "Gaim was unable to load your plugin."
+msgstr "޽   ϴ"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2721,7 +2827,7 @@
 msgid "Browse"
 msgstr "Ž"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr ""
 
@@ -2762,17 +2868,22 @@
 msgstr "н"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "α "
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "  "
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2780,68 +2891,68 @@
 "  α׿  ϴ. ش  ġ ʾҰų ش "
 "ݿ α  ϴ."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr " %s ұ?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr " -  "
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr " "
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "ڵ "
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr " "
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "/"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s   ϴ"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr " "
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "˸"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s  ϴ"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr " "
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr " ũƮ"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr " - ÷ "
@@ -2851,10 +2962,12 @@
 msgid "Gaim - Plugins"
 msgstr " - ÷ "
 
+#. 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"
@@ -2900,427 +3013,596 @@
 msgid "Close this window"
 msgstr "â ݱ"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr "Ϲ ɼ"
+
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:282
 #, fuzzy
-msgid "Windows"
-msgstr "޽ â"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr " â "
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "׵θ ư "
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "/"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "׵θ ư "
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "β"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr ""
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr ""
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr " ģ ۾"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr ""
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "ϸ  "
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "ϸ  "
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr ""
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr " "
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "  "
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "ģ ǥ"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr " "
+msgid "Show graphical _smileys"
+msgstr "̸Ƽ ׸ ֱ"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "޽ ð ǥ"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "URL  ũ ֱ"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Ʋ öڸ Ͽ ǥ"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr " "
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "  "
+msgid "Ignore font _faces"
+msgstr "۲ "
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr " ũ "
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "TiK ڵȭ ޽ "
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Ű  ޽ "
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Ʈ-Ű  ޽ "
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "޽ â"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Esc Ű  â "
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Ʈ-W Ű  â "
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Ʈ-{B/I/U/S}  HTL ± "
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Ʈ-() Ͽ ׸ "
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Ʒ"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "޽/ä//ڸ ư "
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "̸Ƽ ׸ ֱ"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "޽ ð ǥ"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "ư ׸ ֱ"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "URL  ũ ֱ"
+msgid "Buddy List Window"
+msgstr "ģâ"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Ʋ öڸ Ͽ ǥ"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Ϻ â ġ ũ "
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "޽  ڵ â ø"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "׷ ǥ"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "ӵ ģ  ׷ "
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "׷쿡 ο ǥ"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "ģ ǥ"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "ģ  ׸ ֱ"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "  ǥ"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr " "
+#, fuzzy
+msgid "Show idle _times"
+msgstr "  ð ֱ"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "۲ "
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr " ũ "
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "TiK ڵȭ ޽ "
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Ű  ޽ "
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Ʈ-Ű  ޽ "
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "ڸ ģ ȸ ǥϱ"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "޽ â"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr " ȭâ  ũ"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr " ȭâ  ũ"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Ʈ  "
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "޽  ڵ â ø"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "޽   ڵ â ݱ"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "ģ "
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Esc Ű  â "
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "ģ  "
 
 #: src/prefs.c:466
-msgid "Control-W closes window"
-msgstr "Ʈ-W Ű  â "
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Ʈ-{B/I/U/S}  HTL ± "
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Ʈ-() Ͽ ׸ "
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "޽/ä//ڸ ư "
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "ư ׸ ֱ"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "α׿   ģ ڵ "
+#, fuzzy
+msgid "Disable Buddy Icon A_nimation"
+msgstr "ִϸ̼ "
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "â  ֱ"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "˾â  "
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr " ģ Ÿ  ˸"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "ڵϼ"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr " Ű  ڵϼϱ"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "  ڵϼϱ"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "ģ ø αٿ ǥ"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Ϻ â ġ ũ "
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "޽  ڵ â ø"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "ӵ ģ  ׷ "
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "׷쿡 ο ǥ"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "ģ  ׸ ֱ"
+msgid "_Show people joining/leaving in window"
+msgstr "ģ ϴ/° â "
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "  ǥ"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr " ä ϳ â  "
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "  ð ֱ"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "ڸ ģ ȸ ǥϱ"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr " ȭâ  ũ"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr " ȭâ  ũ"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Ʈ  "
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "޽  ڵ â ø"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "޽   ڵ â ݱ"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "ģ  "
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "ִϸ̼ "
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "â  ֱ"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr " ģ Ÿ  ˸"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr " Ű  ڵϼϱ"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "  ڵϼϱ"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "ģ ϴ/° â "
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr " Ǵ   ֱ"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "ä"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr " ä ϳ â  "
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr " ä ϳ â  "
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr " Ǵ   ֱ"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr " ä ϳ â  "
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "äõ ȭ  â  "
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "ģ "
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Ͻ "
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Ͻ "
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "ȣƮ"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Ʈ"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr ""
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "н"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "Ͻ ɼ"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "⺻  â "
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "޽"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr " ȭ "
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "HTML ±״  "
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "ý α "
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "ģ / "
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "ģ / "
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "ڽ ڸ/ƿ "
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "ڽ //ڸ "
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "ģ     α "
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Ҹ ɼ"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "ӽ Ҹ  "
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "ڸ Ҹ "
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Ҹ  "
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Ҹ  ɾ\n"
 "(%s  ̸)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "޽  ڸ ¿ "
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "ڸ߿   ޽ "
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "ڸ ο ȭ "
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "ڵ 亯  "
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "ڵ 亯  "
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Խÿ ڵ 亯 "
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "ó:"
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "ڸ"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr " - Ҹ "
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "׽Ʈ"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr ""
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr ""
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr ""
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "νϽ:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "۲"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "޽"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "޽ â"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "׷ ä â"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Ͻ"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Ҹ"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Ҹ"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "ڸ : "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "ڸ"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr " - ȯ漳"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "   â"
 
 #: src/prpl.c:70
+msgid "Incompatible protocol detected."
+msgstr ""
+
+#: src/prpl.c:71
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
@@ -3330,11 +3612,11 @@
 "  ҽ ϵ   εϷ õ߽ϴ. "
 " ε  ϴ."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr " "
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3342,42 +3624,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "  "
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s  %s ߽ϴ. %s  Դϴ."
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr ""
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "޾Ƶϱ?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr " - "
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr " -  "
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr " "
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, 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:588
+#: src/prpl.c:590
 msgid ""
 "\n"
 "\n"
@@ -3387,21 +3660,21 @@
 "\n"
 " ģ Ͽ ߰ұ?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "     ִ  ϴ."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr " - "
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr ""
 
@@ -3418,10 +3691,6 @@
 msgid "(1 message)"
 msgstr "(1 ޽)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr ""
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Ȯ"
@@ -3478,12 +3747,169 @@
 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 "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 " - йȣ "
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr " - йȣ "
+
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "߸  ̵"
+
+#~ msgid "MSN Error"
+#~ msgstr "MSN "
+
+#~ msgid "Invalid name"
+#~ msgstr "߸ ̸"
+
+#~ msgid "Chat Error!"
+#~ msgstr "ä !"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr " - ä"
+
+#~ msgid "Gaim - Error"
+#~ msgstr " - "
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr " - ī SNAC "
+
+#~ msgid "Reason unknown"
+#~ msgstr "   "
+
+#~ msgid "AOL error"
+#~ msgstr "AOL "
+
+#~ msgid "Error"
+#~ msgstr ""
+
+#~ msgid "Gaim - Warning"
+#~ msgstr " - "
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC ٽ "
+
+#~ msgid "Chat Error"
+#~ msgstr "ä "
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC Ͻ"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "    ϴ!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr " õմϴ...."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "ӵǾ  ʽϴ. Ŭϸ α ȭ ɴϴ."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "ڸ: %d "
+
+#~ msgid "Away."
+#~ msgstr "ڸ"
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr " ø   ϴ!"
+
+#~ msgid "About..."
+#~ msgstr "... Ͽ"
+
+#~ msgid "Message Error"
+#~ msgstr "޽ "
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "޽   ϴ :    "
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "ģ˸ "
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr " - йȣ  "
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "%s    ϴ. - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "ȯ漳 "
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr "α "
+
+#~ msgid "Login Error"
+#~ msgstr "α "
+
+#~ msgid "Perl Scripts"
+#~ msgstr " ũƮ"
+
+#~ msgid "Select"
+#~ msgstr ""
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "α׿   ģ ڵ "
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "ģ ø αٿ ǥ"
+
+#~ msgid "Edit"
+#~ msgstr ""
+
+#~ msgid "Protocol Error"
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "  "
+
+#~ msgid "Disconnect"
+#~ msgstr ""
+
+#~ msgid "Warned"
+#~ msgstr ""
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "ģ ã â "
 
-#~ msgid "General Options"
-#~ msgstr "Ϲ ɼ"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "ٸ    ɼ   ˴ϴ."
 
@@ -3514,9 +3940,6 @@
 #~ msgid "Galeon"
 #~ msgstr ""
 
-#~ msgid "Proxy Options"
-#~ msgstr "Ͻ ɼ"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3524,9 +3947,6 @@
 #~ "Ͻø     ֽϴ. ڼ  ϸ README "
 #~ " оʽÿ."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Ͻ "
-
 #~ msgid "No Proxy"
 #~ msgstr "Ͻ  "
 
@@ -3542,27 +3962,15 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "ģ ɼ"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "ģâ"
-
 #~ msgid "Tab Placement:"
 #~ msgstr " ġ"
 
 #~ msgid "Top"
 #~ msgstr ""
 
-#~ msgid "Bottom"
-#~ msgstr "Ʒ"
-
 #~ msgid "Raise Buddy List on Signons and Signoffs"
 #~ msgstr "ģ /  ģ â ø"
 
-#~ msgid "Group Displays"
-#~ msgstr "׷ ǥ"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "ģ ǥ"
-
 #~ msgid "Conversation Options"
 #~ msgstr "ȭ ɼ"
 
@@ -3605,18 +4013,12 @@
 #~ msgid "Right"
 #~ msgstr ""
 
-#~ msgid "Buddy Icons"
-#~ msgstr "ģ "
-
 #~ msgid "Chat Options"
 #~ msgstr "ä ɼ"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "ȭ äð  â  "
 
-#~ msgid "Tab Completion"
-#~ msgstr "ڵϼ"
-
 #~ msgid "Font Options"
 #~ msgstr "޲ ɼ"
 
@@ -3629,12 +4031,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "ؽƮ   ũ"
 
-#~ msgid "Sound Options"
-#~ msgstr "Ҹ ɼ"
-
-#~ msgid "Sound method"
-#~ msgstr "Ҹ  "
-
 #~ msgid "Sound played when:"
 #~ msgstr "  Ҹ :"
 
@@ -3647,9 +4043,6 @@
 #~ msgid "minutes using"
 #~ msgstr "     ڸ ޽ : "
 
-#~ msgid "Messages"
-#~ msgstr "޽"
-
 #~ msgid "Make Away"
 #~ msgstr " ڸ"
 
--- a/po/nl.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/nl.po	Tue Aug 27 02:43:54 2002 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.60\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-03-02 16:25+0100\n"
 "Last-Translator: Reinier Lamers <tux_rocker@planet.nl>\n"
 "Language-Team: nl <nl@li.org>\n"
@@ -27,9 +27,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Sluiten"
 
@@ -42,16 +42,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Toevoegen"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -75,6 +76,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -93,7 +95,7 @@
 msgid "Change"
 msgstr "Kanaal"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Beschikbaar"
 
@@ -101,8 +103,8 @@
 msgid "Available for friends only"
 msgstr "Alleen beschikbaar voor vrienden"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Afwezig"
 
@@ -119,7 +121,7 @@
 msgid "Invisible for friends only"
 msgstr "Alleen onzichtbaar voor vrienden"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Niet Beschikbaar"
 
@@ -156,7 +158,7 @@
 msgid "Unknown Error Code."
 msgstr "Onbekende Foutcode"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -233,17 +235,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "U probeert een bericht te sturen naar een onjuist Gadu-Gadu UIN!"
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-#, fuzzy
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu Fout"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Geen zoek resultaten gevonden"
@@ -293,111 +284,151 @@
 msgid "Sex"
 msgstr "Geslacht"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Stad"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:819
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-#, fuzzy
-msgid "Gadu-Gadu Information"
-msgstr "Gadu-Gadu Fout"
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:825
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:830
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
-msgstr ""
-
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "Wachtwoord Veranderen Gelukt"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:956
-#, fuzzy
-msgid "Couldn't send http request"
-msgstr "Kan de zoekopdracht niet versturen"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Buddy Lijst importeren"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Kan geen directe verbinding openen"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Verbinding met zoekmachine afgebroken (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, fuzzy, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Verander Wachtwoord"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Kan bericht niet verzenden: Te groot"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 #, fuzzy
 msgid "Directory Search"
 msgstr "Profiel"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Verander Wachtwoord"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 #, fuzzy
 msgid "Import Buddies List from Server"
 msgstr "Buddy Lijst importeren"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 #, fuzzy
 msgid "Export Buddies List to Server"
 msgstr "Buddy Lijst importeren"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr ""
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Kan het bestand %s niet lezen."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 #, fuzzy
 msgid "Send message through server"
 msgstr "Verzend Bericht als: "
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Haal Info op"
@@ -413,21 +444,16 @@
 msgstr "<B>%s heeft het onderwerp veranderd naar: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "Bijnaam of kanaal bestaat niet"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-#, fuzzy
-msgid "IRC Error"
-msgstr "IRC Fout"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "Onjuiste server"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Geen bijnaam opgegeven"
 
 #: src/protocols/irc/irc.c:976
@@ -444,7 +470,7 @@
 
 #: src/protocols/irc/irc.c:1071
 #, fuzzy, c-format
-msgid "You have been kicked from %s: %s"
+msgid "You have been kicked from %s:"
 msgstr "De verbinding met chat ruimte %s is verbroken"
 
 #: src/protocols/irc/irc.c:1076
@@ -457,10 +483,6 @@
 msgid "You have left %s"
 msgstr "U heeft %s verlaten"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "IRC Part"
-
 #: src/protocols/irc/irc.c:1671
 #, fuzzy
 msgid "Channel:"
@@ -476,46 +498,60 @@
 msgstr "Chat"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
+#, fuzzy
+msgid "Unable to change password."
+msgstr "Kan bericht niet verzenden: Te groot"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
-#, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - Wachtwoord Veranderen"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Kan bericht niet verzenden: Te groot"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Online"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Berichtfout"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Onbekende Foutcode"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -523,225 +559,233 @@
 "\n"
 "Wilt u ze toevoegen aan uw buddy lijst?"
 
-#: src/protocols/jabber/jabber.c:1655
-#, fuzzy
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "Onjuiste server"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-#, fuzzy
-msgid "Jabber Error"
-msgstr "Berichtfout"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Buddy's"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 #, fuzzy
 msgid "Authenticating"
 msgstr "Identificatie mislukt"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 #, fuzzy
 msgid "Unknown login error"
 msgstr "Onbekende Foutcode"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Wachtwoord Veranderen Gelukt"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - Wachtwoord Veranderen"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 #, fuzzy
 msgid "Connection lost"
 msgstr "Verbinding verbroken"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 #, fuzzy
 msgid "Unable to connect"
 msgstr "Kan geen directe verbinding openen"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 #, fuzzy
 msgid "Connected"
 msgstr "Verbinding verbroken"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "Identificatie mislukt"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 #, fuzzy
 msgid "Connecting"
 msgstr "Verbinding verbroken"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-msgid "Invalid Jabber I.D."
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2417
+#, fuzzy
+msgid "Jabber Error"
+msgstr "Berichtfout"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 #, fuzzy
 msgid "Handle:"
 msgstr "Handle:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Kan geen directe verbinding openen"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Toon Logboek"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Haal afwezigheidsbericht op"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Popup Melding"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 #, fuzzy
 msgid "Full Name"
 msgstr "Voornaam"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 #, fuzzy
 msgid "Family Name"
 msgstr "Voornaam"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 #, fuzzy
 msgid "Given Name"
 msgstr "Meisjesnaam"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 #, fuzzy
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 #, fuzzy
 msgid "Locality"
 msgstr "ZLocate"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 #, fuzzy
 msgid "Telephone"
 msgstr "Niets Selecteren"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 #, fuzzy
 msgid "Role"
 msgstr "Verwijderen"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 #, fuzzy
 msgid "Birthday"
 msgstr "Geboortedatum"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 #, fuzzy
 msgid "Set User Info"
 msgstr "Gebruikersinfo"
@@ -908,120 +952,133 @@
 msgid "Unknown Error Code"
 msgstr "Onbekende Foutcode"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-#, fuzzy
-msgid "MSN Error"
-msgstr "MSN Fout"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
 #, fuzzy
-msgid "Gaim was unable to send a message"
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim kon een bericht niet verzenden"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 #, fuzzy
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "De verbinding met chat ruimte %s is verbroken"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van socket"
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Kan bericht niet verzenden: Te groot"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "Wachtwoord:"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Aanmelden niet mogelijk"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "Verbinding maken met GG server"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 #, fuzzy
 msgid "Busy"
 msgstr "Buddy"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "Verstop Icon"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Gebruikersnaam: "
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Gebruikersnaam:"
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-#, fuzzy
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "Meisjesnaam"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Welke groep binnengaan:"
@@ -1054,60 +1111,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "De verbinding met chat ruimte %s is verbroken"
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Chat Fout!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chat is momenteel niet bereikbaar."
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Chat"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "Kan geen verbinding maken met host"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Wachtwoord verzonden, wacht op antwoord\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "Interne verbindingsfout\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Aanmelden bij AIM niet mogelijk"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Aanmelding: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Afgemeld.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Kan geen verbinding maken"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Verbinding hersteld, Cookie verzonden"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Uw Account is momenteel afgesloten"
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1115,24 +1167,47 @@
 "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 "
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Uw AIM Software is te oud. Haal een nieuwere versie op"
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Identificatie mislukt"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Interne Fout"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim kon een bericht niet verzenden"
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "Gaim kon een bericht niet verzenden"
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte verbinding met %s hersteld"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1140,135 +1215,117 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "Geen bijnaam opgegeven"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr ""
 "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr ""
 "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr ""
 "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr ""
 "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, fuzzy, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, fuzzy, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr ""
 "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr ""
 "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr ""
 "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, fuzzy, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr ""
 "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr ""
 "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, fuzzy, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Een bericht van %s is niet overgekomen, oorzaak onbekend"
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, fuzzy, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Een bericht van %s is niet overgekomen, oorzaak onbekend"
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Fout"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1736
-#, fuzzy
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Fout"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, fuzzy, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Het bericht is niet verzonden."
 
-# #: src/protocols/oscar/oscar.c:1753
-# #, c-format
-# msgid "Your message to %s did not get sent: %s"
-# msgstr "Je bericht naar %s is niet verzonden"
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Oorzaak onbekend"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "Geen bijnaam opgegeven"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
@@ -1387,48 +1444,84 @@
 msgstr "<i>Geen Informatie Gegeven</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Uw verbinding is verbroken"
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL fout"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
 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 ""
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Fout"
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr "Identificatie mislukt"
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr "Identificatie mislukt"
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Kan het bestand %s niet lezen."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim kon een bericht niet verzenden"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - Gebruiker Waarschuwen?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Kan geen directe verbinding openen"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1438,30 +1531,30 @@
 "U heeft gekozen om een directe verbinding met %s te openen. Hierdoor kan hij/"
 "zij uw IP adres zien en dat kan een veiligheids risico zijn. Wilt u doorgaan?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Haal afwezigheidsbericht op"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "Direct bericht"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 #, fuzzy
 msgid "Get Capabilities"
 msgstr "Mogelijkheden: %s\n"
@@ -1596,50 +1689,44 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC werkt weer. U kunt nu weer berichten versturen."
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr ""
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Chat Fout"
-
 #: src/protocols/toc/toc.c:782
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Wachtwoord Veranderen Gelukt"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Wachtwoord Veranderen"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC heeft een PAUSE commando verstuurd. Als dit gebeurd negeert TOC ieder "
 "bericht dat verzonden wordt en het kan gebeuren dat uw verbinding verbroken "
 "wordt. Gaim verhindert dat dit gebeurd maar u kunt geen berichten verzenden. "
 "Dit is tijdelijk, wees even geduldig."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC Pause"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Haal directory info op"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "Kan niet verbinden voor transfer!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "Kan niet verbinden voor transfer!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "Kan bestandsheader niet schrijven!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1661,22 +1748,23 @@
 msgstr "%s vraagt u om een bestand te verzenden"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Het bericht is niet verzonden."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Class"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Instance"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Ontvanger"
 
@@ -1703,7 +1791,7 @@
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 
 #: src/about.c:147
@@ -1727,6 +1815,9 @@
 "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 "Website"
@@ -1736,13 +1827,10 @@
 msgstr "Afmelden"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Vul je loginnaam in"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Aanmeldingsfout"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - Aanmelden"
@@ -1784,40 +1872,11 @@
 msgid "Preferences"
 msgstr "Instellingen"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Automatisch Aanmelden"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Bezig met aanmelden...."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Niet aangemeld. Klik voor login venster."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Afwezig %d hangend"
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Afwezig"
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Nieuw Afwezigheidsbericht"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Kan de gaim applet niet aanmaken!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "Over..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Afwezig"
@@ -1830,6 +1889,10 @@
 msgid "Back"
 msgstr "Terug"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Nieuw Afwezigheidsbericht"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Afwezigheidsbericht verwijderen"
@@ -1838,7 +1901,7 @@
 msgid "Set All Away"
 msgstr "Zet alles op afwezig"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Groep"
 
@@ -1848,12 +1911,13 @@
 msgstr "Bericht"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1873,10 +1937,6 @@
 msgid "Un-Alias"
 msgstr "Alias verwijderen"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "Buddy-Alarm"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "Nieuw Buddy-Alarm"
@@ -1933,7 +1993,7 @@
 msgid "Information on selected Buddy"
 msgstr "Info over geselecteerde Buddy"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Bericht verzenden"
 
@@ -1961,7 +2021,7 @@
 msgid "New Instant Message"
 msgstr "Nieuw Bericht"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Gebruikersinfo"
 
@@ -1973,6 +2033,10 @@
 msgid "Tools"
 msgstr "Systeem"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "Buddy-Alarm"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Protocol Acties"
@@ -2019,7 +2083,7 @@
 msgid "About Gaim"
 msgstr "Over Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Buddy Lijst"
 
@@ -2052,12 +2116,12 @@
 msgstr "Deelnemen aan chat als:"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -2070,7 +2134,7 @@
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Buddy"
 
@@ -2086,10 +2150,11 @@
 msgid "Un-Ignore"
 msgstr "Negeren Opheffen"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "Negeren"
 
+#. 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
 #, fuzzy, c-format
@@ -2138,15 +2203,15 @@
 msgstr "Fluisteren"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Blokkeren"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Waarschuwen"
@@ -2161,16 +2226,14 @@
 msgstr "Gaim - IM gebruiker"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "Kan bericht niet verzenden: Te groot"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Berichtfout"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "Kan bericht niet verzenden: Reden onbekend"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "Kan bericht niet verzenden: Te groot"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2182,158 +2245,158 @@
 msgid "Setting position to %d\n"
 msgstr "Zet Positie op %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Vette Tekst"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Vet"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Cursieve Tekst"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Cursief"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Onderstreepte Tekst"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Onderstrepen"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Doorgehaalde Tekst"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Doorhalen"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Verklein lettertype"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Klein"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Normale Letter Grootte"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Vergroot Lettertype"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Groot"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Selecteer lettertype "
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Lettertype"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Tekstkleur"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Kleur"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Achtergrondkleur"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Link invoegen"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Voeg Smiley in"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "IM Afbeelding"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Image"
 msgstr "IM Afbeelding"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Schakel logboek in"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Logboek"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Gesprek Opslaan"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Geluid"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Gesprekken"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Verzend Bericht als: "
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Icon Opslaan"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Deactiveer Animatie"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Activeer Animatie"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Verstop Icon"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Sla Icon op als..."
 
@@ -2376,386 +2439,407 @@
 "your buddylist. Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Accepteren"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - IM gebruiker"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "Verzend naar:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Gebruiker:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "Account"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Gebruikersinfo"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Groep toevoegen"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Groep Toevoegen"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Buddy Toevoegen"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Buddy Toevoegen"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Gebruiker"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Toevoegen Aan"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Afwezig"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Zet privacy voor:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Alle gebruikers mogen contact opnemen"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Alleen onderstaande gebruikers toestaan"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Toegestaan"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Alle Gebruikers Blokkeren"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Onderstaande gebruikers blokkeren"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Geblokkeerd"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Vul een buddy in om te alarmeren"
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Buddy-Alarm Fout"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nieuw Buddy-Alarm "
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Wie Alarmeren"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Account"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Wanneer Alermeren"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Alermeren bij aanmelden"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Alarmeren bij terugkeer van afwezigheid"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Alarmeren bij terugkeer van Inactief"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Geluid als buddy zich aanmeldt"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Alarm Actie"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "Open Berichtvenster"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Popup Melding"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Verstuur bericht"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Commando uitvoeren bij alarm"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Speel geluid af bij alarm"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Sla dit alarm op na activatie"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Profiel Wijzigen"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Directory Info"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Sta zoekopdrachten toe om uw info te vinden"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Voornaam"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Tweede Naam"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Meisjesnaam"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Staat"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Nieuwe wachtwoorden zijn niet gelijk"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Fout bij wachtwoord hernoemen"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Vul alle velden voledig in"
 
-#: src/dialogs.c:2172
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Wachtwoord Veranderen"
+
+#: src/dialogs.c:2186
 msgid "Original Password"
 msgstr "Oud Wachtwoord"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Nieuw Wachtwoord"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Nieuw Wachtwoord (herhalen)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Vul gebruikersinfo in"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Het resultaat van uw zoek opdracht:"
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Toestaan"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Blokkeren"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Toestemming toevoegen"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Blokkade toevoegen"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Houd gesprek bij in logboek"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Buddy Zoeken"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Zoek Buddy via info"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Zoek Buddy via Email"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - URL Toevoegen"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Selecteer Tekstkleur"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Achtergrondkleur Selecteren"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importeren naar:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importeer Buddylijst"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "U moet iets invullen"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "U kunt geen leeg bericht maken"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Nieuw afwezigheidsbericht"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Nieuw afwezigheidsbericht"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Afwezig titel:"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Gebruik"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Opslaan en gebruiken"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Lachen!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Alias voor Buddy"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias voor Buddy"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "Kan geen verbinding maken met host"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Logboek opslaan"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Kan %s - %s niet verwijderen."
-
-#: src/dialogs.c:4009
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "Kan configuratiebestand %s niet openen."
+
+#: src/dialogs.c:4024
 msgid "Really clear log?"
 msgstr "Logboek opschonen?"
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Gesprek"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Opschonen"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Groep hernoemen"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Groep hernoemen"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Nieuwe Naam:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Buddy hernoemen"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Buddy hernoemen"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Selecteer Perl Script"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kan configuratiebestand %s niet openen."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Instellingsfout"
-
 #: src/html.c:183
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
@@ -2765,9 +2849,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fout: Kan geen verbinding maken.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
-msgid "Plugin Error"
-msgstr "Plugin Fout"
+#: src/module.c:106 src/module.c:112
+#, fuzzy
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim kon een bericht niet verzenden"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2781,7 +2866,7 @@
 msgid "Browse"
 msgstr "Bladeren"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Wissen"
 
@@ -2823,17 +2908,22 @@
 msgstr "Vul Wachtwoord in"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Aanmeldings Fout"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Protocol Acties"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2841,70 +2931,70 @@
 "U kunt zich niet aanmelden op dit account. U heeft de plugin niet geladen of "
 "het protocol heeft geen aanmeldings functie."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wilt u %s echt verwijderen?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Account Editor"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Alles Selecteren"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Selecteer Auto's"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Niets Selecteren"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Bewerken"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Aan/Afmelden"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr "Kan de aanmelding niet herstellen"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Aanmeldingsfout"
+
+#: src/multi.c:1419
 #, fuzzy
 msgid "Notice"
 msgstr "Stem"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr ""
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 #, fuzzy
 msgid "Connection Error"
 msgstr "Verbinding verbroken"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perl Scripts"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Plugin Lijst"
@@ -2913,11 +3003,13 @@
 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"
@@ -2963,430 +3055,598 @@
 msgid "Close this window"
 msgstr "Dit venster sluiten"
 
-#: src/prefs.c:266
-#, fuzzy
-msgid "Windows"
-msgstr "Berichtvenster"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr "Algemene Instellingen"
+
+#. 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"
 msgstr "Debug venster tonen"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Gebruik knoppen zonder rand"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Titel"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Gebruik knoppen zonder rand"
-
-#: src/prefs.c:311
-#, fuzzy
-msgid "Strikethough"
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Vet"
+
+#: src/prefs.c:303
+#, fuzzy
+msgid "_Italics"
+msgstr "Cursief"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Onderstrepen"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Doorgehaalde Tekst"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Annuleren"
 
-#: src/prefs.c:323
-#, fuzzy
-msgid "Use custom face"
+#: src/prefs.c:310
+#, fuzzy
+msgid "Use custo_m face"
+msgstr "Voeg Smiley in"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Voeg Smiley in"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Selecteer"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
-#, fuzzy
-msgid "Text color"
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
 msgstr "Tekstkleur"
 
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Achtergrondkleur"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Buddyweergave"
+
+#: src/prefs.c:374
+#, fuzzy
+msgid "Show graphical _smileys"
+msgstr "Toon grafische smileys"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Toon tijdweergave in berichten"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "Toon URL's als links"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Onderstreep fout gespelde woorden"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Kleuren negeren"
+
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Achtergrondkleur"
+msgid "Ignore font _faces"
+msgstr "Lettertype negeren"
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "Lettergrootte negeren"
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "Negeer automatische Tik berichten"
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Bericht verzenden met Enter"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Bericht verzenden met Control-Enter"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "Berichtvenster"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Venster sluiten met Esc"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Venster sluiten met Esc"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "HTML-tags invoegen met Ctrl-{B/I/U/S}"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Smiley invoegen met Ctrl-(cijfer)"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Beneden"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "IM/Info/Chat knoppen verbergen"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Toon grafische smileys"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Toon tijdweergave in berichten"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Knoppen met afbeeldingen tonen"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Toon URL's als links"
+msgid "Buddy List Window"
+msgstr "Buddy Lijst Venster"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Onderstreep fout gespelde woorden"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Venstergrootte en -positie opslaan"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Haal venster omhoog bij gebeurtenissen"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Groepenweergave"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Verberg groepen waarin niemand online is"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Toon aantal leden van groepen"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Buddyweergave"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "Toon buddy type icons"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Toon waarschuwingsniveau"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Kleuren negeren"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Toon inactieve tijd"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Lettertype negeren"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Lettergrootte negeren"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "Negeer automatische Tik berichten"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Bericht verzenden met Enter"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Bericht verzenden met Control-Enter"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Toon inactieve buddy's grijs"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "Berichtvenster"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Nieuwe vensterbreedte:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "Nieuwe vensterhoogte:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Hoogte van invoerveld:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Haal venster omhoog bij gebeurtenissen"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Verberg venster bij verzenden"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Buddy Icons"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Venster sluiten met Esc"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Verberg Buddy Icons"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Venster sluiten met Esc"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "HTML-tags invoegen met Ctrl-{B/I/U/S}"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Smiley invoegen met Ctrl-(cijfer)"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "IM/Info/Chat knoppen verbergen"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Knoppen met afbeeldingen tonen"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Automatisch buddylijst tonen bij aanmelden"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Deactiveer Animatie"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Toon aanmeldingen in venster"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Popup Melding"
+
+# L src/prefs.c:232
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Laat buddy's zien dat je tegen ze typt"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "Titels in Tabs"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Volledige namen in Tabs"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Oude stijl tabs"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Toon Buddy Lijst vlakbij applet"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Venstergrootte en -positie opslaan"
-
-#: src/prefs.c:513
-#, fuzzy
-msgid "Raise Window on Events"
-msgstr "Haal venster omhoog bij gebeurtenissen"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Verberg groepen waarin niemand online is"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Toon aantal leden van groepen"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "Toon buddy type icons"
+#, fuzzy
+msgid "_Show people joining/leaving in window"
+msgstr "Toon pesonen die weggaan of binnenkomen in venster"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Toon waarschuwingsniveau"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "Toon alle gesprekken in een venster met tabbladen"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Toon inactieve tijd"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Toon inactieve buddy's grijs"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Nieuwe vensterbreedte:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "Nieuwe vensterhoogte:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Hoogte van invoerveld:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Haal venster omhoog bij gebeurtenissen"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Verberg venster bij verzenden"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Verberg Buddy Icons"
-
-#: src/prefs.c:578
-#, fuzzy
-msgid "Disable Buddy Icon Animation"
-msgstr "Deactiveer Animatie"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Toon aanmeldingen in venster"
-
-# L src/prefs.c:232
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Laat buddy's zien dat je tegen ze typt"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Volledige namen in Tabs"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "Oude stijl tabs"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Toon pesonen die weggaan of binnenkomen in venster"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "Toon aliassen in tabs of titels"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "Chat"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "Toon alle gesprekken in een venster met tabbladen"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "Toon alle gesprekken in een venster met tabbladen"
-
-#: src/prefs.c:675
-msgid "Show aliases in tabs/titles"
-msgstr "Toon aliassen in tabs of titels"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "Toon alle gesprekken in een venster met tabbladen"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Toon gesprekken in hetzelfde venster met tabbladen"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Buddy Lijst"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Proxy Type"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Host"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Poort"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Gebruiker"
 
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
+msgstr "Wachtwoord"
+
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
+#, fuzzy
+msgid "Browser Options"
+msgstr "Proxy Instellingen"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
+msgstr "Open standaard nieuw venster"
+
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Berichten"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
+msgstr "Alle gesprekken loggen"
+
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
+msgstr "Verwijder HTML uit het logboek"
+
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Toon Systeemlog"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
+msgstr "Log als buddy's zich aan/afmelden"
+
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
+msgstr "Log als buddy's inactief/actief worden"
+
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
+msgstr "Log als buddy's weggaan of terugkomen"
+
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
+msgstr "Log uw eigen aan/afmeldingen"
+
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
+msgstr "Eigen log voor elke buddy-aanmelding"
+
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Geluidsinstellingen"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
+msgstr "Geen geluid bij aanmelden"
+
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
+msgstr "Geluid bij afwezigheid"
+
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Geluiden"
+
+#: src/prefs.c:777
+#, c-format
+msgid ""
+"Sound c_ommand\n"
+"(%s for filename)"
+msgstr ""
+
 #: src/prefs.c:813
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: src/prefs.c:873
-#, fuzzy
-msgid "Open new window by default"
-msgstr "Open standaard nieuw venster"
-
-#: src/prefs.c:892
-msgid "Log all conversations"
-msgstr "Alle gesprekken loggen"
-
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
-msgstr "Verwijder HTML uit het logboek"
-
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
-msgstr "Log als buddy's zich aan/afmelden"
-
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
-msgstr "Log als buddy's inactief/actief worden"
-
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
-msgstr "Log als buddy's weggaan of terugkomen"
-
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
-msgstr "Log uw eigen aan/afmeldingen"
-
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
-msgstr "Eigen log voor elke buddy-aanmelding"
-
-#: src/prefs.c:952
-msgid "No sounds when you log in"
-msgstr "Geen geluid bij aanmelden"
-
-#: src/prefs.c:953
-msgid "Sounds while away"
-msgstr "Geluid bij afwezigheid"
-
-#: src/prefs.c:990
-#, c-format
-msgid ""
-"Sound command\n"
-"(%s for filename)"
+#, fuzzy
+msgid "_Sending messages removes away status"
+msgstr "Verzenden van bericht heft afwezigheid op"
+
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
+msgstr "Plaats berichten in wachtrij bij afwezigheid"
+
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
+msgstr "Negeer gesprekken tijdens afwezigheid"
+
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "Geen automatisch antwoord verzenden"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
-msgstr "Verzenden van bericht heft afwezigheid op"
-
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
-msgstr "Plaats berichten in wachtrij bij afwezigheid"
-
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
-msgstr "Negeer gesprekken tijdens afwezigheid"
-
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
-msgstr ""
-
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "Geen automatisch antwoord verzenden"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr ""
 "Alleen automatisch antwoord\n"
 "verzenden wanneer u inactief bent"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "Afwezig: "
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Afwezig"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Geluidsconfiguratie"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 #, fuzzy
 msgid "Test"
 msgstr "Alleen Tekst"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Kies..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Bewerken"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Bewerken"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Instance"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Lettertype"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Bericht"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "Berichtvenster"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Groeps Chat Venster"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Browser"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Geluiden"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Geluiden"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Afwezig titel:"
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Afwezigheid"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Voorkeuren"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim Debug output venster"
 
 #: 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 "
@@ -3397,11 +3657,11 @@
 "programma. Omdat het niet dezelfde versie is als dit programma kan ik helaas "
 "niet zeggen welke het was maar werken zal het in ieder geval niet."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Protocol Fout"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3409,42 +3669,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Protocol Acties"
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s gebruikte %s, dat verwijderd is. %s is nu offline."
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr "Verbinding Verbreken"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Accepteren?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nieuwe E-mail"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Open E-mail"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s heeft %s tot buddy gemaakt"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3455,22 +3706,22 @@
 "\n"
 "Wilt u ze toevoegen aan uw buddy lijst?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - Gesprekken"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 #, fuzzy
 msgid "Register"
 msgstr "Wissen"
@@ -3488,10 +3739,6 @@
 msgid "(1 message)"
 msgstr "(1 bericht)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Gewaarschuwd"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Ja"
@@ -3550,6 +3797,159 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gadu-Gadu Fout"
+
+#, fuzzy
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Gadu-Gadu Fout"
+
+#, fuzzy
+#~ msgid "Couldn't send http request"
+#~ msgstr "Kan de zoekopdracht niet versturen"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Verbinding met zoekmachine afgebroken (%s)"
+
+#, fuzzy
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "Verander Wachtwoord"
+
+#~ msgid "No such nick/channel"
+#~ msgstr "Bijnaam of kanaal bestaat niet"
+
+#, fuzzy
+#~ msgid "IRC Error"
+#~ msgstr "IRC Fout"
+
+#~ msgid "No such server"
+#~ msgstr "Onjuiste server"
+
+#~ msgid "IRC Part"
+#~ msgstr "IRC Part"
+
+#, fuzzy
+#~ msgid "Password Change Error!"
+#~ msgstr "Gaim - Wachtwoord Veranderen"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - Wachtwoord Veranderen"
+
+#, fuzzy
+#~ msgid "MSN Error"
+#~ msgstr "MSN Fout"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Chat Fout!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Chat"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Fout"
+
+#, fuzzy
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Fout"
+
+# #: src/protocols/oscar/oscar.c:1753
+# #, c-format
+# msgid "Your message to %s did not get sent: %s"
+# msgstr "Je bericht naar %s is niet verzonden"
+#~ msgid "Reason unknown"
+#~ msgstr "Oorzaak onbekend"
+
+#~ msgid "AOL error"
+#~ msgstr "AOL fout"
+
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Gebruiker Waarschuwen?"
+
+#~ msgid "Chat Error"
+#~ msgstr "Chat Fout"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC Pause"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "Kan bestandsheader niet schrijven!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Bezig met aanmelden...."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Niet aangemeld. Klik voor login venster."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Afwezig %d hangend"
+
+#~ msgid "Away."
+#~ msgstr "Afwezig"
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Kan de gaim applet niet aanmaken!"
+
+#~ msgid "About..."
+#~ msgstr "Over..."
+
+#~ msgid "Message Error"
+#~ msgstr "Berichtfout"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "Kan bericht niet verzenden: Reden onbekend"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Buddy-Alarm Fout"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Fout bij wachtwoord hernoemen"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "Kan %s - %s niet verwijderen."
+
+#~ msgid "Preferences Error"
+#~ msgstr "Instellingsfout"
+
+#~ msgid "Plugin Error"
+#~ msgstr "Plugin Fout"
+
+#~ msgid "Login Error"
+#~ msgstr "Aanmeldings Fout"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl Scripts"
+
+#~ msgid "Select"
+#~ msgstr "Selecteer"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Automatisch buddylijst tonen bij aanmelden"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Toon Buddy Lijst vlakbij applet"
+
+#~ msgid "Edit"
+#~ msgstr "Bewerken"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Protocol Fout"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Protocol Acties"
+
+#~ msgid "Disconnect"
+#~ msgstr "Verbinding Verbreken"
+
+#~ msgid "Warned"
+#~ msgstr "Gewaarschuwd"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Buddy Ticker tonen"
 
@@ -3592,9 +3992,6 @@
 #~ msgid "Enable sounds"
 #~ msgstr "Activeer Geluiden"
 
-#~ msgid "General Options"
-#~ msgstr "Algemene Instellingen"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "Alle opties hebben onmiddelijk effect tenzij anders aangegeven"
 
@@ -3625,9 +4022,6 @@
 #~ msgid "Manual"
 #~ msgstr "Handmatig"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Proxy Instellingen"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3635,9 +4029,6 @@
 #~ "Niet alle protocollen kunnen de proxy instellingen gebruiken. Zie het "
 #~ "README bestand voor info."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Proxy Type"
-
 #~ msgid "No Proxy"
 #~ msgstr "Geen Proxy"
 
@@ -3653,15 +4044,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Buddy Lijst Instellingen"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Buddy Lijst Venster"
-
-#~ msgid "Group Displays"
-#~ msgstr "Groepenweergave"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Buddyweergave"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Gespreksopties"
 
@@ -3698,24 +4080,15 @@
 #~ msgid "Top"
 #~ msgstr "Boven"
 
-#~ msgid "Bottom"
-#~ msgstr "Beneden"
-
 #~ msgid "Left"
 #~ msgstr "Links"
 
 #~ msgid "Right"
 #~ msgstr "Rechts"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Buddy Icons"
-
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Toon gesprekken in hetzelfde venster met tabbladen"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Titels in Tabs"
-
 #~ msgid "Font Options"
 #~ msgstr "Lettertypes"
 
@@ -3728,9 +4101,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Lettergrootte"
 
-#~ msgid "Sound Options"
-#~ msgstr "Geluidsinstellingen"
-
 #~ msgid "Sound Player:"
 #~ msgstr "Geluidsafspeler:"
 
--- a/po/pl.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/pl.po	Tue Aug 27 02:43:54 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.60\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-06-30 07:59+0100\n"
 "Last-Translator: Przemysaw Suek <pbs@linux.net.pl>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -24,9 +24,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Zamknij"
 
@@ -38,16 +38,17 @@
 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:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Dodaj"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Usu"
 
@@ -71,6 +72,7 @@
 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
 msgid "Check this box to display only symbols and price:"
 msgstr "Zaznacz to by wywietla tylko symbole i cen:"
@@ -87,7 +89,7 @@
 msgid "Change"
 msgstr "Zmie"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Dostpny"
 
@@ -95,8 +97,8 @@
 msgid "Available for friends only"
 msgstr "Dostpny tylko dla przyjaci"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Zajty"
 
@@ -112,7 +114,7 @@
 msgid "Invisible for friends only"
 msgstr "Niewidoczny tylko dla przyjaci"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Niedostpny"
 
@@ -144,7 +146,7 @@
 msgid "Unknown Error Code."
 msgstr "Nieznany Kod Bdu."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
@@ -214,16 +216,6 @@
 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:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "gadu-Gadu: Bd"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Nie mona uzyska rezultatw przeszukiwania"
@@ -269,104 +261,151 @@
 msgid "Sex"
 msgstr "Pe"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Miasto"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Nie ma adnej listy kumpli na serwerze. Przykro mi!"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "Nie mona zaimportowa listy kumpli z serwera."
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Lista kumpli poprawnie przetransmitowana na serwer."
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Informacje Gadu-Gadu "
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Nie mona przetransferowa listy kumpli na serwer."
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "Lista kumpli poprawnie usunita z serwera"
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Nie mona usun listy kumpli z serwera"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "Pomylna zmiana hasa."
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "Nie mona byo zmieni hasa"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "Nie mona wysa dania http"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "Bd importu listy kumpli z serwera (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "Bd eksportu listy kumpli na serwer (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Bd usuwania listy kumpli z serwera (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Poczenie do wyszukiwarki niepowiodo si (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Bd zmiany hasa (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Nie mona zaimportowa listy kumpli z serwera."
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Nie mona otworzy bezporedniego IM"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Nie mona wysa hasa"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Przeszukiwanie Katalogu"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Zmie haso"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Importuj list kumpli z serwera"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Eksportuj list kumpli na serwer"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Usu list kumpli z serwera"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Nie mona czytac pliku %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Wylij wiadomo poprzez serwer"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Pobierz informacj"
@@ -382,20 +421,16 @@
 msgstr "<B>%s zmieni temat na: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "Brak nicka / kanau "
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "Bd IRC"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "Brak serwera"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Nie podano nicka"
 
 #: src/protocols/irc/irc.c:976
@@ -410,8 +445,8 @@
 msgstr "Nie mona zapisa"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Zostae wykopany z %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -424,10 +459,6 @@
 msgid "You have left %s"
 msgstr "Opucie %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "Wyjcie z IRC"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Kana:"
@@ -441,222 +472,247 @@
 msgstr "Chat DCC"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr "Niepoprawne obezne haso! Haso NIE zmienione!"
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
-msgid "Password Change Error!"
-msgstr "Bd zmiany hasa!"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
-msgstr "Nowe haso takie samo jak stare! Haso NIE zmienione!"
-
-#: src/protocols/jabber/jabber.c:1115
+#, fuzzy
+msgid "Unable to change password."
+msgstr "Nie mona wysa hasa"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Nie mona wysa hasa"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Dostpny"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "Rozszerzona zajto"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "Nie przeszkadza"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Bd Jabber"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr "Bd %s: %s"
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 msgid "Unknown Error in presence"
 msgstr "Nieznany bd w prezencji."
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, 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:1655
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "Brak uytkownika"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-msgid "Jabber Error"
-msgstr "Bd Jabber"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Kumple"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "Autentykowanie"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "Nieznany bd logowania."
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 msgid "Password successfully changed."
 msgstr "Zmiana hasa powioda si."
 
-#: src/protocols/jabber/jabber.c:2035
-msgid "Password Change"
-msgstr "Zmiana hasa"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "Poczenie utracone"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "Nie mona si poczy"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "Poczony"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "danie metody autentykacji"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "czenie"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-msgid "Invalid Jabber I.D."
-msgstr "Niepoprawna ID Jabber"
-
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
+msgid "Jabber Error"
+msgstr "Bd Jabber"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Pokj:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "Uchwyt:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Nie mona si poczy"
+
+#: src/protocols/jabber/jabber.c:2718
 msgid "Chats"
 msgstr "Czaty"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 msgid "View Error Msg"
 msgstr "Poka komunikat bdu"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Pobierz wiadomo Zajty"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr "Odso Od"
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr "Tymczasowo schowaj Od"
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr "Usu ze spisu"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 msgid "Cancel Presence Notification"
 msgstr "Anuluj pokazywanie powiadomienia"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "Pena nazwa"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "Nazwisko"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "Nazwisko panieskie"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Adres ulica"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "Rozszerzony adres"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "Miejsce (lokalizacja)"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "Kod pocztowy"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Kraj"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Nazwa organizacji"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "Jednostka organizacyjna"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Tytu"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr "Rola"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "Data urodzenia"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Opis"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -664,23 +720,23 @@
 "Wszystkie ponisze pola s opcjonalne. Wprowad jedynie te informacje, ktre "
 "uwaasz za stosowne"
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "Identyfikacja uytkownika"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Edycja vCard Jabber"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "Poprawa rejestracja na serwerze!"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Nieznany bd rejestracji"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "Ustaw informacje o uytkowniku"
 
@@ -832,107 +888,125 @@
 msgid "Unknown Error Code"
 msgstr "Nieznany Kod Bdu."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "Bad MSN"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+#, fuzzy
+msgid "An MSN message may not have been received."
 msgstr "Wiadomo moga zosta nieodebrana."
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim nie mg wysa wiadomoci"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Uytkownik %s (%s) chce doda %s do swojej listy kolesi."
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "Uytkownik %s (%s) chce doda Ci do swojej listy kolesi."
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Zostae rozczony. Zapisae si z innego miejsca."
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 msgid "Error reading from server"
 msgstr "Bd podczas odczytu z serwera"
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr "danie wysania hasa"
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 msgid "Unable to send password"
 msgstr "Nie mona wysa hasa"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 msgid "Password sent"
 msgstr "Haso wysane"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 msgid "Unable to write to server"
 msgstr "Nie mona zapisa na serwer"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 msgid "Synching with server"
 msgstr "Synchronizacja z serwerem"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr "Nie ma mnie przy komputerze"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr "Zaraz bd"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Busy"
 msgstr "Zajty"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "On The Phone"
 msgstr "Na telefonie"
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr "Na lanczu"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr "Wyczy przyjazn nazw"
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+#, fuzzy
+msgid "New MSN friendly name too long."
 msgstr "Przyjazna nazwa zbyt duga."
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 msgid "Set Friendly Name"
 msgstr "Ustaw przyjazn nazw"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 msgid "Set Friendly Name:"
 msgstr "Ustaw przyjazn nazw:"
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr "Wyczy wszystkie przyjazne nazwy"
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
-msgstr "Niepoprawna nazwa"
-
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
+msgstr "Niepoprawna nazwa uytkownika"
+
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Do jakiej grupy przyczy:"
@@ -965,60 +1039,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Zostae rozczony z pokojem %s."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Bd Czat!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Czat jest w tej chwili niedostpny"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Czat"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "Nie mona byo poczy si z hostem"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Haso wysano, oczekiwanie na odpowied\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "wewntrzny bd poczenia\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Nie mona zalogowa do AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Zapisz si: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Wypisano.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Nie mona poczy"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Ustanowiono poczenie, wysano ciasteczko"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Niepoprawny nick lub haso."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Twoje konto jest w tej chwili zawieszone."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1027,24 +1096,47 @@
 "ponownie. Jeli bdziesz teraz prbowa dalej, bdziesz musia zaczeka "
 "duej."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Wersja klienta, ktrej uywasz, jest zbyt stara. Uaktualnij j."
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Autoryzacja nie powioda si"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Bd wewntrzny"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim 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
+#, 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
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Ustanowiono bezporedni IM z %s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1055,121 +1147,109 @@
 "uytkownikw z nastpujcego powodu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "Nie podano powodu."
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - Odmowa autoryzacji ICQ"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, 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:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim - Zaakceptowano autoryzacj ICQ"
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Opucie %d wiadomo od %s poniewa bya ona niepoprawna."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Opucie %d wiadomoci od %s poniewa byy one niepoprawne."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Opucie %d wiadomo od %s poniewa bya ona zbyt dua."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Opucie %d wiadomoci od %s poniewa byy one zbyt due."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "Opucie %d wiadomo od %s poniewa przekroczono limit szybkoci."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Opucie %d wiadomoci od %s poniewa przekroczono limit szybkoci."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Opucie %d wiadomo od %s poniewa bya ona zbyt okrutna."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Opucie %d wiadomoci od %s poniewa byy one zbyt okrutne."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Opucie %d wiadomo od %s poniewa jeste zbyt okrutny."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Opucie %d wiadomoci od %s poniewa jeste zbyt okrutny."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Opucie %d wiadomo od %s z nieznanych powodw."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Opucie %d wiadomoci od %s z nieznanych powodw."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Bd"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Stan:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>Stan:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Bd Oscar SNAC"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Twoja wiadomo do %s nie zostaa wysana: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Powd nieznany"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "Nie podano powodu."
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Informacja uytkownika dla %s niedostpna: %s"
@@ -1280,30 +1360,72 @@
 msgstr "<i>Brak podanych informacji</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Twoje poczenie moe by utracone."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "Bd AOL"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "Ostatnia wiadomo nie zostaa wysana poniewa przekroczye limit "
 "prdkoci. Zaczekaj 10 sekund i sprbuj ponownie."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Bd"
-
-#: src/protocols/oscar/oscar.c:3207
+#: 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
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Nie mona czytac pliku %s."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim nie mg wysa wiadomoci"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1313,19 +1435,15 @@
 "Dopki przekraczasz limit niektrzy kolesie nie bd pokazywani jako "
 "dostpni."
 
-#: src/protocols/oscar/oscar.c:3210
-msgid "Gaim - Warning"
-msgstr "Gaim - Ostrzeenie"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Wymiana:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Nie mona otworzy bezporedniego IM"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1336,7 +1454,7 @@
 "zobaczy twj adres IP i moe to by ryzykiem zabezpiecze. Czy chcesz "
 "kontynuowa?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1345,7 +1463,7 @@
 "<B>UIN:</B> %s<BR><B>Stan:</B> %s<BR><HR><BR><I>Zdalny klient nie potrafi "
 "wysya wiadomoci o stanie.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1354,15 +1472,15 @@
 "<B>UIN:</B> %s<BR><B>Stan:</B> %s<BR><HR><BR><I>Uytkownik nie ma wiadomoci "
 "o stanie.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 msgid "Get Status Msg"
 msgstr "Pobierz wiadomo o stanie"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "Bezporednia IM"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Pobierz uprawnienia: "
 
@@ -1495,48 +1613,42 @@
 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:599
-msgid "TOC Resume"
-msgstr "Wznw TOC"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Bd Czat"
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "Pomylna zmiana hasa."
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Zmiana hasa"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC wysa polecenie PAUSE. Gdy dzieje si co takiego TOC ignoruje "
 "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:788
-msgid "TOC Pause"
-msgstr "TOC Pause"
-
 #: src/protocols/toc/toc.c:1225
 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:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "Nie mona poczy w celu przesyu!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "Nie mona poczy w celu przesyu!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "Nie mona zapisa nagwka pliku!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1558,22 +1670,23 @@
 msgstr "%s da od ciebie wysania mu pliku"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Twoja wiadomo nie zostaa wysana."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "Zlocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Klasa:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Przykad:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Odbiorca:"
 
@@ -1598,10 +1711,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1646,6 +1760,9 @@
 "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"
@@ -1655,13 +1772,10 @@
 msgstr "Wypisz si"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Wpisz swoj nazw logowania"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Bd zapisywania si"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - Logowanie"
@@ -1702,39 +1816,10 @@
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 msgid "Auto-login"
 msgstr "Automatyczne logowanie"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Prba zapisania si..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Niedostpny. Kliknij by uaktywni okno logowania."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Zajty: w trakcie %d "
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Zajty."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Nowy komunikat Zajty"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Nie mona stworzy apletu Gaim!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "O ..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Zajty!"
@@ -1747,6 +1832,10 @@
 msgid "Back"
 msgstr "Powrt"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Nowy komunikat Zajty"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Usu wiadomo Zajty"
@@ -1755,7 +1844,7 @@
 msgid "Set All Away"
 msgstr "Ustaw wszystkie Zajty"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Grupa"
 
@@ -1765,12 +1854,13 @@
 msgstr "IM"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Pseudo"
 
@@ -1790,10 +1880,6 @@
 msgid "Un-Alias"
 msgstr "Od-pseudo"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "Wychwy kumpla"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "Nowe wychwycenie kumpla"
@@ -1850,7 +1936,7 @@
 msgid "Information on selected Buddy"
 msgstr "Informacje o wybranym kumplu"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Wylij IM"
 
@@ -1878,7 +1964,7 @@
 msgid "New Instant Message"
 msgstr "Nowa IM"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Pobierz informacje o uytkowniku"
 
@@ -1890,6 +1976,10 @@
 msgid "Tools"
 msgstr "Narzdzia"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "Wychwy kumpla"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Akcje protokou"
@@ -1934,7 +2024,7 @@
 msgid "About Gaim"
 msgstr "O Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Lista kumpli"
 
@@ -1967,12 +2057,12 @@
 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:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1985,7 +2075,7 @@
 msgid "Invite"
 msgstr "Wywoaj"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Kole"
 
@@ -2001,10 +2091,11 @@
 msgid "Un-Ignore"
 msgstr "Od-ignoruj"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "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
 #, c-format
@@ -2048,15 +2139,15 @@
 msgstr "Szept"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Wylij "
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Blokuj"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Ostrze"
@@ -2070,16 +2161,14 @@
 msgstr "Gaim - Wstaw obraz"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "Nie mona wysa wiadomoci: zbyt dua"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Bd wiadomoci"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "Nie mona wysa wiadomoci: powd nieznany"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "Nie mona wysa wiadomoci: zbyt dua"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2091,156 +2180,156 @@
 msgid "Setting position to %d\n"
 msgstr "Ustawianie pozycji na %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Tekst pogrubiony"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Pogrubienie"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Tekst pochylony"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Pochylenie"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Tekst podkrelony"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Podkrelenie"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Tekst przekrelony"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Przekrelenie"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Zmiejsz wielko czcionki"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Maa"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Normalna wielko czcionki"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normalna"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Zwiksz wielko czcionki"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Dua"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Wybierz czcionk"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Czcionka"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Kolor tekstu"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Kolor"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Kolor ta"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Wstaw odnonik"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Odnonik"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Wstaw umiechnit twarz"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Umiech"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "Wstaw obraz IM"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr "Obraz"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Zacz logowanie"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Logowanie"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Zapisz rozmow"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Dwik"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - rozmowy"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Wylij wiadomo jako: "
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - zapisz ikon"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Wycz animacj"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Zacz animacj"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Ukryj ikon"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Zapisz ikon jako..."
 
@@ -2284,384 +2373,405 @@
 "Zamierzasz usun '%s' ze swojej\n"
 "listy kumpli. Kontynuowa ? "
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Akceptuj"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "Ok"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - Uytkownik IM"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "kto IM:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Uytkownik:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 msgid "Account:"
 msgstr "Konto:"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Pobierz informacje o uytkowniku"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Dodaj grup"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Dodaj grup"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Dodaj kumpla"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Dodaj kumpla"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Dodaj do"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Zajty!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Ustaw prywatno dla:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Pozwl wszystkim uytkownikom na kontakt ze mn"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Pozwl tylko uytkownikom poniej"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Lista zezwole"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Zabro wszystkim uytkownikom"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Blokuj uytkownikw poniej"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Lista blokowa"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Wprowad kumpla do wywoania."
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Bd wywoania kumpla"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nowe wywoanie kumpla"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Wychwy Kto"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Konto"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Wychwy Kiedy"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Wywoaj przy zapisywaniu si"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Wywoaj przy powrocie z Zajty"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Wywoaj przy powrocie z bezczynnoci"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "Dwik gdy kole napisze do Ciebie"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Akcje protokou"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "Otwrz okno IM"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Powiadomienie Popup"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Wylij wiadomo"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Wykonaj polecenie przy wywoaniu"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Odtwrz dwik przy wywoaniu"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Zapisz to wywoanie po aktywacji"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - ustaw informacje katalogowe"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Informacja katalogowa"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dopuszczaj przeszukiwania Web w celu znalezienia twojego info"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Imi"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Drugie imi"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Nazwisko"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Nazwisko panieskie"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Stan"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Nowe hasa nie s zgodne"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - bd zmiany hasa"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Wypenij cakowicie wszystkie pola"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "Haso oryginalne"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Zmiana hasa"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "Haso oryginalne"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Nowe haso"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Nowe haso (ponownie)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - ustaw informacj uytkownika"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Poniej s wyniki twojego wyszukiwania: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Akceptuj"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Odrzu"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - dodaj akceptacj"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - dodaj odrzucenie"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - loguj rozmow"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Szukaj kumpla"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - znajd kumpla wg informacji"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - znajd kumpla wg adresu email"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Dodaj URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Wybierz kolor tekstu"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Wybierz kolor ta"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - importuj list kumpli"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "Nie moesz stworzy wiadomoci Zajty bez tytuu"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "Nie moesz stworzy pustej wiadomoci Zajty"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - nowa wiadomo zajty"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Nowa wiadomo zajty"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Tytu Zajty: "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Uyj"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Zapisz i uyj"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Umiech!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Pseudo kumpla"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - pseudo kumpla"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "Nie mona byo poczy si z hostem"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - zapisz plik logu"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Nie mona usun pliku %s - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "Naprawd wyczyci log?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "Nie mona otworzy pliku konfiguracji %s."
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "Naprawd wyczyci log?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "Okej"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Rozmowa"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Wyczy"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - zmie nazw grupy"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Zmie nazw grupy"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Nowa nazwa:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - zmie nazw kumpla"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Zmie nazw kumpla"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - wybierz skrypt Perl"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nie mona otworzy pliku konfiguracji %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Bd preferencji"
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2671,9 +2781,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Bd otwierania poczenia.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
-msgid "Plugin Error"
-msgstr "Bd wtyczki"
+#: 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
 msgid "Gaim - Load Buddy Icon"
@@ -2687,7 +2798,7 @@
 msgid "Browse"
 msgstr "Przegldaj"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Zeruj"
 
@@ -2728,17 +2839,22 @@
 msgstr "Wprowad haso"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Bd logowania"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Akcje protokou"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2746,40 +2862,40 @@
 "Nie moesz zalogowa si na to konto; nie masz zaadowanego odpowiedniego "
 "protokou lub nie ma on funkcji logowania."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Jeste pewien, e chcesz usun %s?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - edytor kont"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Wybierz wszystkie"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Wybierz automaty"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Wybierz aden"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Modyfikuj"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Zapisz / wypisz si"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Usu"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2788,16 +2904,20 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nie mg si zalogowa"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Bd zapisywania si"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "Uwaga"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s nie mg si zalogowa"
@@ -2806,14 +2926,10 @@
 # #, c-format
 # msgid "%s has been signed off"
 # msgstr "%s wylogowa si: %s"
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "Bd poczenia"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Skrypty Perl"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - lista wtyczek"
@@ -2822,10 +2938,12 @@
 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"
@@ -2871,428 +2989,596 @@
 msgid "Close this window"
 msgstr "Zamknij to okno"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, 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 "Windows"
-msgstr "Okno IM"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Poka okno odpluskwiania"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Uywaj przyciskw bez obrysu"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Stan"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Uywaj przyciskw bez obrysu"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Pogrubienie"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Pochylenie"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Podkrelenie"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Tekst przekrelony"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Anuluj"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "Uytkownik jest zbyt aktywny"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Uytkownik jest zbyt aktywny"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Wybierz"
-
-#: src/prefs.c:341
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Kolor tekstu"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Kolor ta"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Ekrany kumpli"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Use custom size"
-msgstr "Uytkownik jest zbyt aktywny"
-
-#: src/prefs.c:359
+msgid "Show graphical _smileys"
+msgstr "Poka graficzne twarzyczki ;-)"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Poka znaczniki czasu wiadomoci"
+
+#: src/prefs.c:376
 #, fuzzy
-msgid "Text color"
-msgstr "Kolor tekstu"
+msgid "Show _URLs as links"
+msgstr "Poka URLe jako linki"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Podwietlaj le napisane sowa"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Ignoruj kolory"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Kolor ta"
+msgid "Ignore font _faces"
+msgstr "Ignoruj krj czcionki"
+
+#: src/prefs.c:382
+#, 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
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Enter wysya wiadomo"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Control-Enter wysya wiadomo"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "Okno IM"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Escape zamyka okno"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Control-W zamyka okno"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Control-[B/I/U/S] wstawia tagi HTML"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Control-(liczba) wstawia twarzyczki :-)"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "D"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Ukryj przyciski IM/Info/Czat"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Poka graficzne twarzyczki ;-)"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Poka znaczniki czasu wiadomoci"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Poka obrazki na przyciskach"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Poka URLe jako linki"
+msgid "Buddy List Window"
+msgstr "Okno listy kumpli"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Podwietlaj le napisane sowa"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Zapisz wielko/pozycj okna"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Powiksz okno przy zdarzeniach"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Ekrany grup"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Ukryj grupy bez dostpnych kumpli"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Poka liczby w grupach"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Ekrany kumpli"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "Poka ikony typu kumpli"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Poka poziomy ostrzee"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Ignoruj kolory"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Poka czasy bezczynnoci"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Ignoruj krj czcionki"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Ignoruj wielkoci czcionki"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignoruj automatyzowane wiadomoci TIK"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Enter wysya wiadomo"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Control-Enter wysya wiadomo"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Bezczynni kumple w szarym kolorze"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "Okno IM"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Szeroko nowego okna:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "Wysoko nowego okna:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Wprowad wysoko widgetu"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Powiksz okno przy zdarzeniach"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Ukryj okno przy wysyaniu"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Ikony kumpla"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Escape zamyka okno"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Ukryj ikony kumpla"
 
 #: src/prefs.c:466
-msgid "Control-W closes window"
-msgstr "Control-W zamyka okno"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-[B/I/U/S] wstawia tagi HTML"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(liczba) wstawia twarzyczki :-)"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Ukryj przyciski IM/Info/Czat"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Poka obrazki na przyciskach"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Automatycznie poka po zapisaniu si list kumpli"
+#, fuzzy
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Wycz animacj ikon kumpli"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Poka logowania w oknie"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Powiadomienie Popup"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Wychwy kumpli, do ktrych piszesz"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "Uzupenianie tab"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Uzupenianie nickw tabulatorem"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Uzupenianie tab w starym stylu"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Poka list kumpli blisko apletu"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Zapisz wielko/pozycj okna"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "Powiksz okno przy zdarzeniach"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Ukryj grupy bez dostpnych kumpli"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Poka liczby w grupach"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "Poka ikony typu kumpli"
+msgid "_Show people joining/leaving in window"
+msgstr "Poka ludzi przyczajcych si/wychodzcych w oknie"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Poka poziomy ostrzee"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Poka czasy bezczynnoci"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Bezczynni kumple w szarym kolorze"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Szeroko nowego okna:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "Wysoko nowego okna:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Wprowad wysoko widgetu"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Powiksz okno przy zdarzeniach"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Ukryj okno przy wysyaniu"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Ukryj ikony kumpla"
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "Wycz animacj ikon kumpli"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Poka logowania w oknie"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Wychwy kumpli, do ktrych piszesz"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Uzupenianie nickw tabulatorem"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "Uzupenianie tab w starym stylu"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Poka ludzi przyczajcych si/wychodzcych w oknie"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "Pokazuj aliasy w zakadkach/tytuach/wskaniku"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "Czaty"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "Pokazuj aliasy w zakadkach/tytuach/wskaniku"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Lista kumpli"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Typ proxy"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Serwer proxy"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Serwer"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Uytkownik"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Haso"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "Opcje proxy"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "Domylnie otwieraj nowe okno"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Wiadomoci"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Loguj wszystkie rozmowy"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "Wycignij HTML z logw"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Poka log systemowy"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "Loguj gdy kumple zapisuj/wypisuj si"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Loguj gdy kumple staj si bezczynni/od-bezczynni"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Loguj gdy kumple staj si zajci/wracaj"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Loguj swoje wasne zapisywania/bezczynnoci/zajtoci"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "Oddzielne pliki logw dla kadego zapisania si kumpla"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Opcje dwiku"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "Bez dwikw gdy si logujesz"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Dwiki podczas zajtoci"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Sposb odgrywania"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Polecenie odegrania plikw\n"
 "(%s dla nazwy pliku)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "Wysanie wiadomoci usuwa stan Zajty"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Kolejkuj nowe wiadomoci gdy zajty"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "Ignoruj nowe rozmowy gdy zajty"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "Nie wysyaj automatycznej odpowiedzi"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "Nie wysyaj automatycznej odpowiedzi"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Wysyaj automatyczn odpowied tylko gdy bezczynny"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "Bezczynno: "
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Zajty"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - konfiguracja dwiku"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Wybierz..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Edycja"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Edycja"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Przykad:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Czcionka"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Wiadomo wysana"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "Okno IM"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Okno grupy czatu"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Przegldarka"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Dwiki"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Zdarzenia"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Tytu Zajty: "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Wiadomoci Zajty"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - preferencje"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim okno wyjcia odplukswiania"
 
 #: 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 "
@@ -3304,11 +3590,11 @@
 "wersja i nie mog powiedzie Ci, ktra to bya. Co by nie gada, protok "
 "nie zosta zaadowany."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Bd protokou"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3316,42 +3602,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Akcje protokou"
-
-#: src/prpl.c:103
+#: 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:106
-msgid "Disconnect"
-msgstr "Rozcz"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Akcpetujesz?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - prompt"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nowa poczta"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Otwrz poczt"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, 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:588
+#: src/prpl.c:590
 msgid ""
 "\n"
 "\n"
@@ -3361,7 +3638,7 @@
 "\n"
 "Chcesz ich doa do swojej listy kumpli?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3369,15 +3646,15 @@
 "Nie masz w tej chwili adnych dostpnych protokow, ktrymi mgby "
 "zarejestrowa nowe konta."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Rejestracja"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Informacje rejestracji"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "Rejestruj"
 
@@ -3394,10 +3671,6 @@
 msgid "(1 message)"
 msgstr "(1 wiadomo)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Ostrzeono"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Tak"
@@ -3450,12 +3723,172 @@
 msgid "Someone says your name in chat"
 msgstr "Kto wymawia Twoje imi na czacie"
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "gadu-Gadu: Bd"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Informacje Gadu-Gadu "
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "Nie mona wysa dania http"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "Bd importu listy kumpli z serwera (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "Bd eksportu listy kumpli na serwer (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Bd usuwania listy kumpli z serwera (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Poczenie do wyszukiwarki niepowiodo si (%s)"
+
+#~ 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!"
+
+#~ msgid "Password Change Error!"
+#~ msgstr "Bd zmiany hasa!"
+
+#~ msgid "New password same as old password! Password NOT Changed!"
+#~ msgstr "Nowe haso takie samo jak stare! Haso NIE zmienione!"
+
+#~ msgid "Password Change"
+#~ msgstr "Zmiana hasa"
+
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Niepoprawna ID Jabber"
+
+#~ msgid "MSN Error"
+#~ msgstr "Bad MSN"
+
+#~ msgid "Invalid name"
+#~ msgstr "Niepoprawna nazwa"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Bd Czat!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Czat"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Bd"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Bd Oscar SNAC"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Powd nieznany"
+
+#~ msgid "AOL error"
+#~ msgstr "Bd AOL"
+
+#~ msgid "Error"
+#~ msgstr "Bd"
+
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Ostrzeenie"
+
+#~ msgid "TOC Resume"
+#~ msgstr "Wznw TOC"
+
+#~ msgid "Chat Error"
+#~ msgstr "Bd Czat"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC Pause"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "Nie mona zapisa nagwka pliku!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Prba zapisania si..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Niedostpny. Kliknij by uaktywni okno logowania."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Zajty: w trakcie %d "
+
+#~ msgid "Away."
+#~ msgstr "Zajty."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Nie mona stworzy apletu Gaim!"
+
+#~ msgid "About..."
+#~ msgstr "O ..."
+
+#~ msgid "Message Error"
+#~ msgstr "Bd wiadomoci"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "Nie mona wysa wiadomoci: powd nieznany"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Bd wywoania kumpla"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - bd zmiany hasa"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "Nie mona usun pliku %s - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "Bd preferencji"
+
+#~ msgid "Plugin Error"
+#~ msgstr "Bd wtyczki"
+
+#~ msgid "Login Error"
+#~ msgstr "Bd logowania"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Skrypty Perl"
+
+#~ msgid "Select"
+#~ msgstr "Wybierz"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Automatycznie poka po zapisaniu si list kumpli"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Poka list kumpli blisko apletu"
+
+#~ msgid "Edit"
+#~ msgstr "Edycja"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Bd protokou"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Akcje protokou"
+
+#~ msgid "Disconnect"
+#~ msgstr "Rozcz"
+
+#~ msgid "Warned"
+#~ msgstr "Ostrzeono"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Poka wskanik kumpli"
 
-#~ msgid "General Options"
-#~ msgstr "Opcje oglne"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "Wszystkie opcje dziaaj od razu, chyba, e napisano inaczej."
 
@@ -3489,9 +3922,6 @@
 #~ msgid "Manual (%s for URL)"
 #~ msgstr "Rcznie (%s dla URL)"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Opcje proxy"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3499,9 +3929,6 @@
 #~ "Nie wszystkie protokoy mog uywa proxy. Przeczytaj plik README by "
 #~ "dowiedzie si szczegw"
 
-#~ msgid "Proxy Type"
-#~ msgstr "Typ proxy"
-
 #~ msgid "No Proxy"
 #~ msgstr "Bez proxy"
 
@@ -3517,27 +3944,15 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Opcje listy kumpli"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Okno listy kumpli"
-
 #~ msgid "Tab Placement:"
 #~ msgstr "Ustawienie zakadek"
 
 #~ msgid "Top"
 #~ msgstr "Gra"
 
-#~ msgid "Bottom"
-#~ msgstr "D"
-
 #~ msgid "Raise Buddy List on Signons and Signoffs"
 #~ msgstr "Poka list kumpli przy logowaniach i wylogowaniach"
 
-#~ msgid "Group Displays"
-#~ msgstr "Ekrany grup"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Ekrany kumpli"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Opcje rozmw"
 
@@ -3580,18 +3995,12 @@
 #~ msgid "Right"
 #~ msgstr "Prawo"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Ikony kumpla"
-
 #~ msgid "Chat Options"
 #~ msgstr "Opcje czatu"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Poka wszystkie rozmowy w jednym oknie z zakadkami"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Uzupenianie tab"
-
 #~ msgid "Font Options"
 #~ msgstr "Opcje czcionki"
 
@@ -3604,12 +4013,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Wielko czcionki tekstu"
 
-#~ msgid "Sound Options"
-#~ msgstr "Opcje dwiku"
-
-#~ msgid "Sound method"
-#~ msgstr "Sposb odgrywania"
-
 #~ msgid "Sound played when:"
 #~ msgstr "Dwik odtwarzany gdy:"
 
@@ -3622,9 +4025,6 @@
 #~ msgid "minutes using"
 #~ msgstr "minutach uywajc"
 
-#~ msgid "Messages"
-#~ msgstr "Wiadomoci"
-
 #~ msgid "Make Away"
 #~ msgstr "Zrb Zajty"
 
--- a/po/ru.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/ru.po	Tue Aug 27 02:43:54 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-03-22 14:05+0300\n"
 "Last-Translator: Grigory Bakunov <black@asplinux.ru>\n"
 "Language-Team: RUSSIAN <RU@li.org>\n"
@@ -25,9 +25,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr ""
 
@@ -40,16 +40,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr ""
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr ""
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -91,7 +93,7 @@
 msgid "Change"
 msgstr ":"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr ""
 
@@ -99,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr ""
 
@@ -116,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr ""
 
@@ -150,7 +152,7 @@
 msgid "Unknown Error Code."
 msgstr "  "
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -221,16 +223,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "     Gadu-Gadu UIN!"
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Gaim -  Gadu"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "   "
@@ -276,109 +268,152 @@
 msgid "Sex"
 msgstr ""
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr ""
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "     ."
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "     "
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:814
 #, fuzzy
-msgid "Buddy List successfully transferred to server"
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "    ."
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr " Gadu"
-
-#: src/protocols/gg/gg.c:821
+#: src/protocols/gg/gg.c:819
 #, fuzzy
-msgid "Couldn't transfer Buddy List to server"
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "     "
 
-#: src/protocols/gg/gg.c:827
+#: src/protocols/gg/gg.c:825
 #, fuzzy
-msgid "Buddy List sucessfully deleted from server"
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:830
 #, fuzzy
-msgid "Couldn't delete Buddy List from server"
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "     "
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "   HTTP "
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "     (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "     (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "     (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "     (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "   (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "     "
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "   "
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "   "
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr " "
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr " "
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "  "
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "    "
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "    %s"
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "   "
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr " "
@@ -394,20 +429,16 @@
 msgstr "<B>%s   : %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "  /"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr " IRC"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "  "
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "  "
 
 #: src/protocols/irc/irc.c:976
@@ -422,8 +453,8 @@
 msgstr " "
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "    %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -436,10 +467,6 @@
 msgid "You have left %s"
 msgstr "  %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "IRC"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr ":"
@@ -453,47 +480,61 @@
 msgstr "DCC "
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim -  "
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "   "
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "   "
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 #, fuzzy
 msgid "Unknown"
 msgstr " ICQ"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr " \"\""
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr " "
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -501,210 +542,217 @@
 "\n"
 "   ?"
 
-#: src/protocols/jabber/jabber.c:1655
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
 #, fuzzy
-msgid "No such user"
+msgid "No such user."
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-#, fuzzy
-msgid "Jabber Error"
-msgstr " "
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim -  "
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "."
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
 #, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr " "
-
-#: src/protocols/jabber/jabber.c:2648
+msgid "Jabber Error"
+msgstr " "
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "   "
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "e-mail"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "   .   ."
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim -  Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr " !"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "   "
 
@@ -872,116 +920,132 @@
 msgid "Unknown Error Code"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr " MSN"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim   "
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "      ."
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "    ."
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "   "
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "    ."
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
-#, fuzzy
-msgid "Busy"
-msgstr "(UIN)"
-
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1926
+#, fuzzy
+msgid "Busy"
+msgstr "(UIN)"
+
+#: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "UIN"
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr " "
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "  "
@@ -1014,60 +1078,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "    %s."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr " !"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - "
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "    "
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr " ,  \n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "  \n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "   AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr ": %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr ".\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr " ,  "
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "    ."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "   ."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1076,24 +1135,47 @@
 "  .         "
 "."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "     ."
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim   "
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "Gaim   "
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1101,122 +1183,109 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1585
+#: 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:1586
+#: 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:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "   %d   %s,  ."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr ""
 "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "   %d   %s,   ."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "   %d   %s,   ."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "   %d   %s   ."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "   %d   %s   ."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - "
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC  : %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim -  Oscar SNAC"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "   %s  : %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr " "
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "  "
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "   %s : %s"
@@ -1327,50 +1396,87 @@
 msgstr "<i>  </i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "   ."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr " AOL"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "   ,  .  10   "
 "  ."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr " "
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr " "
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "    %s"
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim   "
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "  ?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "   "
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1380,30 +1486,30 @@
 "      %s.     IP "
 ",      .   ?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "   "
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr " "
 
@@ -1536,50 +1642,44 @@
 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
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "  "
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim -  "
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC   PAUSE.   , TOC   "
 "  ,        "
 ". Gaim     .    - "
 " ."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC "
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr " "
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "    !"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "    !"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "    !"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1603,22 +1703,23 @@
 msgstr "%s   "
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "     "
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr ":"
 
@@ -1642,10 +1743,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1689,6 +1791,9 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
+#. this makes the sizes not work.
+#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr " "
@@ -1698,13 +1803,10 @@
 msgstr " "
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr ",   "
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr " "
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - "
@@ -1745,40 +1847,11 @@
 msgid "Preferences"
 msgstr ""
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr " "
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr " "
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr ".   ."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr ":   %d."
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "   "
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "  Gaim !"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr " ..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - !"
@@ -1791,6 +1864,10 @@
 msgid "Back"
 msgstr ""
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "   "
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "   "
@@ -1799,7 +1876,7 @@
 msgid "Set All Away"
 msgstr "  \"\""
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr ""
 
@@ -1809,12 +1886,13 @@
 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:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr ""
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr ""
 
@@ -1834,10 +1912,6 @@
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr ""
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr " "
@@ -1894,7 +1968,7 @@
 msgid "Information on selected Buddy"
 msgstr "  "
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr " "
 
@@ -1922,7 +1996,7 @@
 msgid "New Instant Message"
 msgstr " "
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "  "
 
@@ -1934,6 +2008,10 @@
 msgid "Tools"
 msgstr ""
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr ""
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr ""
@@ -1980,7 +2058,7 @@
 msgid "About Gaim"
 msgstr " "
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr " "
 
@@ -2013,12 +2091,12 @@
 msgstr "   :"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr ""
 
@@ -2031,7 +2109,7 @@
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "(UIN)"
 
@@ -2047,10 +2125,11 @@
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr ""
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, c-format
@@ -2094,15 +2173,15 @@
 msgstr ""
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr ""
@@ -2116,16 +2195,14 @@
 msgstr "Gaim -  "
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "  :   "
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr " "
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "   : ."
+#, fuzzy
+msgid "Unable to send message"
+msgstr "  :   "
 
 #: src/conversation.c:1559
 #, c-format
@@ -2137,156 +2214,156 @@
 msgid "Setting position to %d\n"
 msgstr "   %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr ""
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr ""
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr ""
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr ""
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr ""
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr " "
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr " "
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "   "
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr " "
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr ""
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr " "
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr ""
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr " "
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr " "
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr " "
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr " "
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr ""
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr " IM "
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr " "
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr " "
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "  :"
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim -  "
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr " "
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr " "
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr " "
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "  ..."
 
@@ -2330,385 +2407,406 @@
 "  '%s' \n"
 "  ?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr ""
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - "
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr " (UIN):"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "(UIN):"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "a "
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "  "
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr " "
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr " "
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "UIN"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr " "
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - !"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "  :"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "   "
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "   "
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr " "
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "   "
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "    ' '"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "' '"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr " "
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr ""
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "a "
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr " "
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "  "
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "  "
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "  "
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "   "
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "  "
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "  "
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr " "
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr " "
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "   "
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "   "
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "  "
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr " "
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "   web    ."
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr ""
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr ""
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr ""
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr " "
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "/"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr " "
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim -   "
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "  "
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr " "
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim -  "
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr " "
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr " "
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "  ( )"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr " "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr ""
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr " "
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim -   Email"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "  "
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr ":"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "      "
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "     "
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "  "
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr " "
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "    "
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - "
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "   %s - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "  ?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "     %s."
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "  ?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr ""
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr " "
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr " (UIN):"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr " "
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim -   Perl"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "     %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr " "
-
 #: src/html.c:183
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
@@ -2718,10 +2816,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003:   .\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr " "
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim   "
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2735,7 +2833,7 @@
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr ""
 
@@ -2777,17 +2875,22 @@
 msgstr " "
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr " "
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr ""
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2796,40 +2899,40 @@
 "    ,\n"
 "     ."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "   %s?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim -  "
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr " "
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr ""
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr ""
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "/"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2838,28 +2941,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s  "
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr " "
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s "
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr " "
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perl "
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim -  "
@@ -2868,10 +2971,12 @@
 msgid "Gaim - Plugins"
 msgstr "Gaim - "
 
+#. Left side: frame with list of plugin file names
 #: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr " "
 
+#. Right side: frame with description and the filepath of plugin
 #: src/plugins.c:265
 #, fuzzy
 msgid "Selected Plugin"
@@ -2917,432 +3022,600 @@
 msgid "Close this window"
 msgstr " "
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr " "
+
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:282
 #, fuzzy
-msgid "Windows"
-msgstr " "
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "  "
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr " "
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "/"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr " "
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr ""
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr ""
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr ""
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr " "
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr ""
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr " "
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr " "
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr ""
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr " "
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr " "
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr ""
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr " "
+msgid "Show graphical _smileys"
+msgstr "  "
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "  "
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr " URL  "
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr " "
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr " "
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr " "
+msgid "Ignore font _faces"
+msgstr "  "
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "  "
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "  "
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Enter  "
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Ctrl-Enter  "
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr " "
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Esc  "
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Esc  "
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Ctrl-{B/I/U/S}   HTML "
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Ctrl-()  "
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr ""
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr " "
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "  "
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "  "
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "   "
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr " URL  "
+msgid "Buddy List Window"
+msgstr "  "
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr " "
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr " / "
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "-   "
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr ""
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "   (  Ofline)"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "  "
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr ""
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "  "
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "  "
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr " "
+#, fuzzy
+msgid "Show idle _times"
+msgstr "  "
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "  "
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "  "
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "  "
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Enter  "
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Ctrl-Enter  "
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr " "
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr " "
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "  "
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "  "
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "  "
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "-   "
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "   "
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr " "
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Esc  "
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "  "
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Esc  "
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Ctrl-{B/I/U/S}   HTML "
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Ctrl-()  "
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr " "
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "   "
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "     "
+msgid "Disable Buddy Icon A_nimation"
+msgstr " "
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr " "
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr " "
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "     "
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr " "
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Tab -  "
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "  "
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "    "
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr " / "
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "-   "
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "   (  Ofline)"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "  "
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "  "
+msgid "_Show people joining/leaving in window"
+msgstr " /   "
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "  "
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "       "
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "  "
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr " "
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "  "
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "  "
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "  "
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "-   "
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "   "
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "  "
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr " "
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr " "
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "     "
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Tab -  "
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "  "
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr " /   "
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "   "
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr ""
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "       "
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "       "
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "   "
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "       "
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "     "
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr " "
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr " Proxy"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Proxy "
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr ""
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr ""
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr ""
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr ""
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr " Proxy"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "    "
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr ""
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "  "
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr " HTML     "
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "  "
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr " / "
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "  /"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr " -  /"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "    //"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "  "
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr " "
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "   "
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "   "
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr " "
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "  \n"
 "(%s    )"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "      "
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr ""
 "   \n"
 " "
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr ""
 "     \n"
 ""
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "  "
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "  "
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "  "
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr " "
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr ""
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim -  "
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr ""
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr ""
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr ""
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr ""
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr ":"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr ""
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr " "
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr " "
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr ""
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr ""
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "  (Away)"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "  Gaim"
 
 #: src/prpl.c:70
+msgid "Incompatible protocol detected."
+msgstr ""
+
+#: src/prpl.c:71
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
@@ -3353,11 +3626,11 @@
 "  .  , -       "
 "."
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr " "
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3365,42 +3638,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr ""
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s  %s,  . %s ."
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr " "
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - "
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim -  "
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr " "
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s  %s   %s%s%s"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3411,21 +3675,21 @@
 "\n"
 "   ?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "      ."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - "
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr ""
 
@@ -3442,10 +3706,6 @@
 msgid "(1 message)"
 msgstr "(1 )"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr ""
-
 #: src/server.c:901
 msgid "Yes"
 msgstr ""
@@ -3502,12 +3762,171 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gaim -  Gadu"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr " Gadu"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "   HTTP "
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "     (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "     (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "     (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "     (%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "   (%s)"
+
+#~ msgid "No such nick/channel"
+#~ msgstr "  /"
+
+#~ msgid "IRC Error"
+#~ msgstr " IRC"
+
+#~ msgid "No such server"
+#~ msgstr "  "
+
+#~ msgid "IRC Part"
+#~ msgstr "IRC"
+
+#, fuzzy
+#~ msgid "Password Change Error!"
+#~ msgstr "Gaim -  "
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim -  "
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr " "
+
+#~ msgid "MSN Error"
+#~ msgstr " MSN"
+
+#~ msgid "Invalid name"
+#~ msgstr " "
+
+#~ msgid "Chat Error!"
+#~ msgstr " !"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - "
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - "
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim -  Oscar SNAC"
+
+#~ msgid "Reason unknown"
+#~ msgstr " "
+
+#~ msgid "AOL error"
+#~ msgstr " AOL"
+
+#~ msgid "Error"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "  ?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC ."
+
+#~ msgid "Chat Error"
+#~ msgstr " "
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC "
+
+#~ msgid "Could not write file header!"
+#~ msgstr "    !"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr " "
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr ".   ."
+
+#~ msgid "Away: %d pending."
+#~ msgstr ":   %d."
+
+#~ msgid "Away."
+#~ msgstr "."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "  Gaim !"
+
+#~ msgid "About..."
+#~ msgstr " ..."
+
+#~ msgid "Message Error"
+#~ msgstr " "
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "   : ."
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr ""
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim -   "
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "   %s - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr " "
+
+#~ msgid "Login Error"
+#~ msgstr " "
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl "
+
+#~ msgid "Select"
+#~ msgstr ""
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "     "
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "    "
+
+#~ msgid "Edit"
+#~ msgstr ""
+
+#~ msgid "Protocol Error"
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr ""
+
+#~ msgid "Disconnect"
+#~ msgstr " "
+
+#~ msgid "Warned"
+#~ msgstr ""
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr " "
 
-#~ msgid "General Options"
-#~ msgstr " "
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "   ,    ."
 
@@ -3538,9 +3957,6 @@
 #~ msgid "Galeon"
 #~ msgstr ""
 
-#~ msgid "Proxy Options"
-#~ msgstr " Proxy"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3548,9 +3964,6 @@
 #~ "       .\n"
 #~ "  README     ."
 
-#~ msgid "Proxy Type"
-#~ msgstr " Proxy"
-
 #~ msgid "No Proxy"
 #~ msgstr " "
 
@@ -3566,24 +3979,12 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "  "
 
-#~ msgid "Buddy List Window"
-#~ msgstr "  "
-
 #~ msgid "Tab Placement:"
 #~ msgstr " :"
 
 #~ msgid "Top"
 #~ msgstr ""
 
-#~ msgid "Bottom"
-#~ msgstr ""
-
-#~ msgid "Group Displays"
-#~ msgstr ""
-
-#~ msgid "Buddy Displays"
-#~ msgstr ""
-
 #~ msgid "Conversation Options"
 #~ msgstr " "
 
@@ -3626,18 +4027,12 @@
 #~ msgid "Right"
 #~ msgstr ""
 
-#~ msgid "Buddy Icons"
-#~ msgstr " "
-
 #~ msgid "Chat Options"
 #~ msgstr " "
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "     "
 
-#~ msgid "Tab Completion"
-#~ msgstr " "
-
 #~ msgid "Font Options"
 #~ msgstr ""
 
@@ -3650,12 +4045,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr " "
 
-#~ msgid "Sound Options"
-#~ msgstr " "
-
-#~ msgid "Sound method"
-#~ msgstr " "
-
 #~ msgid "Sound played when:"
 #~ msgstr " :"
 
@@ -3668,9 +4057,6 @@
 #~ msgid "minutes using"
 #~ msgstr " "
 
-#~ msgid "Messages"
-#~ msgstr ""
-
 #~ msgid "Make Away"
 #~ msgstr ""
 
--- a/po/sk.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/sk.po	Tue Aug 27 02:43:54 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2001-02-22 00:00\n"
 "Last-Translator: Daniel Ren <daniel@rezny.sk>\n"
 "Language-Team: SK <SK@li.org>\n"
@@ -25,9 +25,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Zatvori"
 
@@ -40,16 +40,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Prida"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Zrui"
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -91,7 +93,7 @@
 msgid "Change"
 msgstr "Kanl:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Prtomn"
 
@@ -99,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "Prtomn iba pre priateov"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Pre"
 
@@ -116,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "Neviditen iba pre priateov"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Nedostupn"
 
@@ -150,7 +152,7 @@
 msgid "Unknown Error Code."
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
@@ -225,16 +227,6 @@
 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: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 "Chyba Gadu-Gadu"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Nemem zska vsledky vyhladvania"
@@ -280,111 +272,151 @@
 msgid "Sex"
 msgstr "Pohlavie"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Mesto"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-#, fuzzy
-msgid "Gadu-Gadu Information"
-msgstr "Chyba Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:821
+#: src/protocols/gg/gg.c:819
 #, fuzzy
-msgid "Couldn't transfer Buddy List to server"
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Importuj zoznam kamartov"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:830
 #, fuzzy
-msgid "Couldn't delete Buddy List from server"
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Importuj zoznam kamartov"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "Heslo bolo spene zmenen"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:956
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
 #, fuzzy
-msgid "Couldn't send http request"
-msgstr "Nemem posla poiadavku na vyhladvanie"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
+msgid "Couldn't export buddy list"
+msgstr "Importuj zoznam kamartov"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Nemem otvori Priame IM spojenie"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Pripojenie na vyhladvaciu slubu zlyhalo (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, fuzzy, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Zmeni heslo"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Nemem ta sbor %s."
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Vyhladvanie v prieinku"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Zmeni heslo"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 #, fuzzy
 msgid "Import Buddies List from Server"
 msgstr "Importuj zoznam kamartov"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 #, fuzzy
 msgid "Export Buddies List to Server"
 msgstr "Importuj zoznam kamartov"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr ""
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Nemem ta sbor %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Poli sprvu cez server"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Zskaj Info"
@@ -400,20 +432,16 @@
 msgstr "<B>%s zmenil tmu na: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "iadna prezvka/kanl"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "Chyba IRC"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "iaden server"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Nenapsali ste prezvku"
 
 #: src/protocols/irc/irc.c:976
@@ -428,8 +456,8 @@
 msgstr "Nemem zapisova"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Boli ste vykopnut z %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -442,10 +470,6 @@
 msgid "You have left %s"
 msgstr "Opustili ste %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "as IRC"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Kanl:"
@@ -460,46 +484,60 @@
 msgstr "Chat"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - Zmena hesla"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "Nemem ta sbor %s."
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Nemem ta sbor %s."
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Pripojen"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Chyba sprvy"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -507,225 +545,232 @@
 "\n"
 "elte si prida ich do Vho zoznamu kamartov?"
 
-#: src/protocols/jabber/jabber.c:1655
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
 #, fuzzy
-msgid "No such user"
+msgid "No such user."
 msgstr "iaden server"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-#, fuzzy
-msgid "Jabber Error"
-msgstr "Chyba sprvy"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Kamarti"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autentifikcia preruen"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 #, fuzzy
 msgid "Unknown login error"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Heslo bolo spene zmenen"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - Zmena hesla"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 #, fuzzy
 msgid "Connection lost"
 msgstr "Spojenie ukonen"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 #, fuzzy
 msgid "Unable to connect"
 msgstr "Nemem sa pripoji."
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 #, fuzzy
 msgid "Connected"
 msgstr "Odpojen."
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "Autentifikcia preruen"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 #, fuzzy
 msgid "Connecting"
 msgstr "Spojenie ukonen"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
 #, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "Nesprvne meno"
-
-#: src/protocols/jabber/jabber.c:2648
+msgid "Jabber Error"
+msgstr "Chyba sprvy"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Miestnos:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Nemem sa pripoji."
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Pozrie zznam"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Zobrazi notifikciu"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 #, fuzzy
 msgid "Full Name"
 msgstr "Prv meno"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 #, fuzzy
 msgid "Family Name"
 msgstr "Prv meno"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 #, fuzzy
 msgid "Given Name"
 msgstr "Druh meno"
 
-#: src/protocols/jabber/jabber.c:3284
-#, fuzzy
-msgid "Nickname"
-msgstr "Prezvka"
-
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
-msgid "URL"
-msgstr "URL"
-
-#: src/protocols/jabber/jabber.c:3286
-msgid "Street Address"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:3287
-msgid "Extended Address"
-msgstr ""
-
 #: src/protocols/jabber/jabber.c:3288
 #, fuzzy
-msgid "Locality"
-msgstr "ZLocate"
-
-#: src/protocols/jabber/jabber.c:3289
-msgid "Region"
-msgstr ""
+msgid "Nickname"
+msgstr "Prezvka"
+
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
+msgid "URL"
+msgstr "URL"
 
 #: src/protocols/jabber/jabber.c:3290
+msgid "Street Address"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3291
+msgid "Extended Address"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3292
+#, fuzzy
+msgid "Locality"
+msgstr "ZLocate"
+
+#: src/protocols/jabber/jabber.c:3293
+msgid "Region"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Krajina"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 #, fuzzy
 msgid "Telephone"
 msgstr "Vybrat iaden"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Nzov"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 #, fuzzy
 msgid "Role"
 msgstr "Zrui"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 #, fuzzy
 msgid "Birthday"
 msgstr "Rok narodenia"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Popis"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 #, fuzzy
 msgid "Set User Info"
 msgstr "Zska informcie o uvateovi"
@@ -893,117 +938,133 @@
 msgid "Unknown Error Code"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "Chyba MSN"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim neme posla sprvu"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 #, 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:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Chyba pri tan zo socketu."
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Nemem ta sbor %s."
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "Heslo: "
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Nemem sa pripoji na server."
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "Pripjam sa na GG server"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
-#, fuzzy
-msgid "Busy"
-msgstr "Kamart"
-
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1926
+#, fuzzy
+msgid "Busy"
+msgstr "Kamart"
+
+#: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "Skry ikonu"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Druh meno"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Meno obrazovky: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "Nesprvne meno"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Ktor skupinu pripoji:"
@@ -1036,60 +1097,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Boli ste odpojen z chatovacej miestnosti %s."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Chyba Chatu!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chat je teraz nedostupn"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Chat"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "Nemem sa spoji s hostiteom"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Poslan heslo, akm na odpove\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "vntorn chyba spojenia\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Nemem sa prihlsi do AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Prihlsi: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Odhlsen.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Nemem sa pripoji"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Spojenie vytvoren, poslan cookie"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Nesprvne heslo alebo prezvka."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1097,24 +1153,47 @@
 "Pripjali a odpjali ste sa vemi asto. Pokajte 10 mint, potom skste "
 "znova. Ak budete pokraova v pripjan, budete aka dlhie."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Verzia klienta ktor pouvate je velmi star. Naintalujte si nov na"
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Autentifikcia preruen"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Vntorn chyba"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim 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
+#, 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
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Priame IM spojenie s %s vytvoren"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1122,121 +1201,107 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "Nenapsali ste prezvku"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1585
+#: 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:1586
+#: 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:1595
+#: src/protocols/oscar/oscar.c:1597
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Stratili ste %d sprv%s z %s pretoe %s je prli vek."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Stratili ste %d sprv%s z %s pretoe s velmi zl."
 
-#: src/protocols/oscar/oscar.c:1605
+#: 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:1606
+#: src/protocols/oscar/oscar.c:1608
 #, fuzzy, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Stratili ste %d sprv%s z %s pretoe ste vyerpali limit sprv."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, 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:1616
+#: src/protocols/oscar/oscar.c:1618
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Stratili ste %d sprv%s z %s pretoe s velmi zl."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, fuzzy, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Stratili ste %d sprv%s z %s pretoe ste velmi zl."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Stratili ste %d sprv%s z %s pretoe ste velmi zl."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, fuzzy, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Stratili ste %d sprv%s z %s z neznmych dvodov."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, fuzzy, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Stratili ste %d sprv%s z %s z neznmych dvodov."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Chyba"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1736
-#, fuzzy
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Chyba"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Vaa sprva %s nebola poslan: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Dvod neznmy"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "Nenapsali ste prezvku"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Informcie o pouvateovi %s su neprstupn: %s"
@@ -1350,48 +1415,84 @@
 msgstr "<i>Neposkytnut iane informcie</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Vae spojenie moe by preruen."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "Chyba AOL"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
 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 ""
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Chyba"
-
-#: src/protocols/oscar/oscar.c:3207
+#: 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
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Nemem ta sbor %s."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim neme posla sprvu"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - Prihlsenie"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vmena:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Nemem otvori Priame IM spojenie"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1402,30 +1503,30 @@
 "pouvateom vidie Vau IP adresu, moe to by bezpenostn riziko. elte "
 "si pokraova"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Stav: %s"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "Priame IM"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr ""
 
@@ -1557,32 +1658,20 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr ""
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Chyba Chatu"
-
 #: src/protocols/toc/toc.c:782
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Heslo bolo spene zmenen"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Zmena hesla"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
-msgstr ""
-
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
+"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
@@ -1590,13 +1679,18 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "Nemem sa spoji pre prenos!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "Nemem sa spoji pre prenos!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "Nemem zapsa hlaviku sboru!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1618,22 +1712,23 @@
 msgstr ""
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Vaa sprva nebola poslan."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Trieda:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Prijmate:"
 
@@ -1657,10 +1752,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1687,6 +1783,9 @@
 "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"
@@ -1696,12 +1795,9 @@
 msgstr "Odhlsi"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
-msgstr ""
-
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Chyba pri prihlasovan"
+#, fuzzy
+msgid "Please enter your login."
+msgstr "Zadajte, prosm, Vae heslo"
 
 #: src/aim.c:260
 msgid "Gaim - Login"
@@ -1744,40 +1840,11 @@
 msgid "Preferences"
 msgstr ""
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Aotomatick prihlasovanie sa"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Pokam sa prihlsi...."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Nepripojen. Kliknite pre otvorenie prihlasovacieho okna."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr ""
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Pre."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Nov 'Pre' sprva"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Nemem vytvori applet Gaim!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr ""
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr ""
@@ -1790,6 +1857,10 @@
 msgid "Back"
 msgstr "Sp"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Nov 'Pre' sprva"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Odstr 'Pre' sprvu"
@@ -1798,7 +1869,7 @@
 msgid "Set All Away"
 msgstr "Nastav vetko na 'Pre'"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Skupina"
 
@@ -1808,12 +1879,13 @@
 msgstr "IM"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1833,10 +1905,6 @@
 msgid "Un-Alias"
 msgstr "Zrui alias"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr ""
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr ""
@@ -1893,7 +1961,7 @@
 msgid "Information on selected Buddy"
 msgstr "Informcie o vybratom kamartovi"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr ""
 
@@ -1921,7 +1989,7 @@
 msgid "New Instant Message"
 msgstr ""
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Zska informcie o uvateovi"
 
@@ -1933,6 +2001,10 @@
 msgid "Tools"
 msgstr "Nstroje"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr ""
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Akcie protokolu"
@@ -1979,7 +2051,7 @@
 msgid "About Gaim"
 msgstr "O aplikcii Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Zoznam kamartov"
 
@@ -2012,12 +2084,12 @@
 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:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Zrui"
 
@@ -2030,7 +2102,7 @@
 msgid "Invite"
 msgstr "Pozva"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Kamart"
 
@@ -2046,10 +2118,11 @@
 msgid "Un-Ignore"
 msgstr "Od-ignorova"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "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
 #, c-format
@@ -2093,15 +2166,15 @@
 msgstr ""
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Posla"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Blokova"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Varova"
@@ -2116,16 +2189,14 @@
 msgstr "Gaim - IM pouvate"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "Nemem posla sprvu: vemi vek"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Chyba sprvy"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "Nemem posla sprvu: Neznmy dvod"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "Nemem posla sprvu: vemi vek"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2137,157 +2208,157 @@
 msgid "Setting position to %d\n"
 msgstr "Nastavi pozciu na %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Tun text"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Tun"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr ""
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Kurzva"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Podiarknut text"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Podiarknut"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Preiarknut text"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Preiarknut"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Zmeni vekos fontu"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Mal"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Normlna vekos fontu"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normlny"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Zvi vekost fontu"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Vek"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Vybra font"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Font"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Farba textu"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Farba"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Farba pozadia"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Vloi odkaz"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Odkaz"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Vloi smajlka"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Smajlk"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Vloi smajlka"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Povoli zaznamenvanie"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Zanamenvanie"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Uloi konverzciu"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Uloi"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konverzcie"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Posla sprvu ako: "
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Uloi ikonu"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Nepovoli animcie"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Povoli animcie"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Skry ikonu"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Uloi ikonu ako..."
 
@@ -2330,386 +2401,407 @@
 "your buddylist. Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Akceptova"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - IM pouvate"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr ""
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Pouvate:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "Konto"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Zska informcie o pouvatelovi"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Prida skupinu"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Prida skupinu"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Prida kamarta"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Prida kamarta"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Prida k"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Skromie"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Nastav bezpenos pre:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Povo vetkm povateom kontaktova ma"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Povo iba niie uvedench pouvateov"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Zoznam povolench"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Odmietnu vetkch pouvateov"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Blokova niie uvedench pouvateov"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Zoznam blokovanch"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr ""
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr ""
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Konto"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Zvuk ke sa kamart prihlsi"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "Otvori IM okno"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Zobrazi notifikciu"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Posla sprvu"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr ""
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr ""
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Povoli Internetovm vyhladvaom njs informcie o Vs"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Prv meno"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Druh meno"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Priezvisko"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr ""
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "tt"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr ""
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Chyba zmeny hesla"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Vyplte vetky polka"
 
-#: src/dialogs.c:2172
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Zmena hesla"
+
+#: src/dialogs.c:2186
 msgid "Original Password"
 msgstr "Star heslo"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Nov heslo"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Nov heslo (znova)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Nastavi informcie o pouvateovi"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Niie s vsledky vyhadvania: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Povoli"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Zamietnu"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Prida povolenie"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Prida zkaz"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Zaznamenaj konverzciu"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Njs kamarta"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Njs kamarta poda informcie"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Njs kamarta poda emailu"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Prida URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Veberte farbu textu"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Vyberte farbu pozadia"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importuj zoznam kamartov"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "Nemete vytvori 'Pre' sprvu s przdnym nzvom"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "Nemete vytvori przdnu 'Pre' sprvu"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Nov 'Pre' sprva"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Nov 'Pre' sprva"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Nzov 'Pre': "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Poui"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Uloi a Poui"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "???"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Alias kamarta"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias kamarta"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "Nemem sa spoji s hostiteom"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Uloit zznamov sbor"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Nemem vymaza sbor %s - %s"
-
-#: src/dialogs.c:4009
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "Nemem otvori konfiguran sbor %s."
+
+#: src/dialogs.c:4024
 msgid "Really clear log?"
 msgstr "Skutone vymaza zznamy?"
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Dtum"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Konverzcia"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Vyisti"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Premenova skupinu"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Premenova Skupinu"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Nov meno"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Premenova kamarta"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Premenova kamarta"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vyberte si Perlov skript"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nemem otvori konfiguran sbor %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Chyba ???"
-
 #: src/html.c:183
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
@@ -2719,10 +2811,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Chyba pri otvran spojenia.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr "Chyba pri Prihlasovan"
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim neme posla sprvu"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2736,7 +2828,7 @@
 msgid "Browse"
 msgstr "Prehliada"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Zrui"
 
@@ -2778,17 +2870,22 @@
 msgstr "Vlote heslo"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Chyba pri Prihlasovan"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Akcie protokolu"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2796,74 +2893,74 @@
 "Nemoete sa prihlsi na toto konto, nemte nahran protokol, alebo protokol "
 "nem funkciu prihlsenia"
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste si, e chcete vymazat %s"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor knt"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Vybra Vetky"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr ""
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Vybrat iaden"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Zmeni"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Prihlsi/Odhlsi"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Zmaza"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s nebol schopn prihlsi sa do: %s"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Chyba pri prihlasovan"
+
+#: src/multi.c:1419
 #, fuzzy
 msgid "Notice"
 msgstr "Hlas"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr ""
 "%s\n"
 "%s nebol schopn prihlsi sa do: %s"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 #, fuzzy
 msgid "Connection Error"
 msgstr "Spojenie ukonen"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perlov skripty"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Zoznam pluginov"
@@ -2872,11 +2969,13 @@
 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"
@@ -2922,430 +3021,588 @@
 msgid "Close this window"
 msgstr "Zatvor toto okno"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, 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 "Windows"
-msgstr "IM okno"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Zobraz ladiace okno"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Poui tlatka bez okrajov"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "tt"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Poui tlatka bez okrajov"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Tun"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Kurzva"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Podiarknut"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Preiarknut text"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Zrui"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "Vloi smajlka"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Vloi smajlka"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Vybra"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Farba textu"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Farba pozadia"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Zobrazenia skupiny"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "Farba textu"
+msgid "Show graphical _smileys"
+msgstr "Zobraz smajlkov graficky"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Zobraz asov znaku pri sprvach"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "Zobraz URL ako linky"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Zvrazni nesprvne psan slov"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Ignoruj farby"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Farba pozadia"
+msgid "Ignore font _faces"
+msgstr "Ignoruj vzhady fontu"
+
+#: src/prefs.c:382
+#, 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
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Enter pole sprvu"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Control-Enter pole sprvu"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "IM okno"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Tlaidlo Escape zatvor okno"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Tlaidlo Escape zatvor okno"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Control-{B/I/U/S} vlo HTML znaky"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Control-(slo) vlo smajlka"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Dole"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Skry tlatka IM/Informcie/Chat"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Zobraz smajlkov graficky"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Zobraz asov znaku pri sprvach"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Zobraz obrzky na tlatkach"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Zobraz URL ako linky"
+msgid "Buddy List Window"
+msgstr "Okno zo zoznamom kamartov"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Zvrazni nesprvne psan slov"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Ulo vekost/pozciu okna"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Zvi okno pri udalostiach"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Zobrazenia skupiny"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Skry skupiny so iadnymi propojenmi kamartmi"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Zobraz sla v skupinch"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Zoznam kamartov"
+
+#: src/prefs.c:430
+msgid "Show buddy type _icons"
+msgstr ""
+
+#: src/prefs.c:431
+msgid "Show _warning levels"
+msgstr ""
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Ignoruj farby"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Reportuj poet neinnost"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Ignoruj vzhady fontu"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Ignoruj vekosti fontu"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignoruj TiK automatick sprvy"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Enter pole sprvu"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Control-Enter pole sprvu"
+msgid "Grey i_dle buddies"
+msgstr ""
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "IM okno"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Vka novho okna:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "rka novho okna:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Vka vstupnho okienka:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Zvi okno pri udalostiach"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Zvi okno pri udalostiach"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Kamartova ikona"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Tlaidlo Escape zatvor okno"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Skry ikony kamartov"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Tlaidlo Escape zatvor okno"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} vlo HTML znaky"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(slo) vlo smajlka"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Skry tlatka IM/Informcie/Chat"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Zobraz obrzky na tlatkach"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Automaticky zobraz zoznam kamartov pri prihlsen"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Nepovoli animcie"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Zobraz prihlasovacie men v okne"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Zobrazi notifikciu"
+
+#: src/prefs.c:472
+msgid "Notify buddies that you are _typing to them"
+msgstr ""
+
+#: src/prefs.c:504
+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
-msgid "Display Buddy List near applet"
+#, fuzzy
+msgid "_Show people joining/leaving in window"
+msgstr "Zobraz ud pripjajcich/odchdzajcich v okne"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Ulo vekost/pozciu okna"
-
-#: src/prefs.c:513
-#, fuzzy
-msgid "Raise Window on Events"
-msgstr "Zvi okno pri udalostiach"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Skry skupiny so iadnymi propojenmi kamartmi"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Zobraz sla v skupinch"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
+#: src/prefs.c:526
+msgid "IM Tabs"
 msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr ""
-
-#: src/prefs.c:534
-msgid "Show idle times"
-msgstr ""
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr ""
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Vka novho okna:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "rka novho okna:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Vka vstupnho okienka:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Zvi okno pri udalostiach"
-
-#: src/prefs.c:568
-#, fuzzy
-msgid "Hide window on send"
-msgstr "Zvi okno pri udalostiach"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Skry ikony kamartov"
-
-#: src/prefs.c:578
-#, fuzzy
-msgid "Disable Buddy Icon Animation"
-msgstr "Nepovoli animcie"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Zobraz prihlasovacie men v okne"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr ""
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr ""
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr ""
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Zobraz ud pripjajcich/odchdzajcich v okne"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
-msgstr ""
-
-#: src/prefs.c:674
 #, 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:675
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:534
+msgid "Show a_liases in tabs/titles"
 msgstr ""
 
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "Chat"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
 msgstr "Zobraz vetky chaty v jednom okne so zlokami"
 
-#: src/prefs.c:700
+#: src/prefs.c:546
+msgid "Combined Tabs"
+msgstr ""
+
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Zobraz vetky chaty v jednom okne so zlokami"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Zoznam kamartov"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Typ proxy"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Hostite"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Pouvate"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Heslo"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "Voby proxy"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "tandadne otvor nov okno"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Sprvy"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Zaznamena vsetky rozhovory"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "Zru HTML zo zznamov"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Pozrie systmov zznam"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "Zaznamena ke sa kamarti prihlsia/odhlsia"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Zaznamena ke sa kamarti stan neinnmi/innmi"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Zaznamena ke kamarti oddu pre/vrtia sa"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Zaznamena vlastn prihlsenia/neinnosti/odchody pre"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "Samostatn zznamov sbor pre kadho pripojenho kamarta"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Zvuky Voby"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "Ziadne zvuky ke sa prihlsite"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Zvuky pokia ste 'Pre'"
 
-#: src/prefs.c:990
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Zvuky Voby"
+
+#: src/prefs.c:777
 #, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Prkaz na prehrvanie zvukovch sborov\n"
 "(%s pre meno sboru; vntorn ak je przdny)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "Posielanie sprv zru stav 'Pre'"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Ke som 'Pre' nov sprvy zara do rady"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "Ignoruj nov konverzciu ke ste 'Pre'"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "Neposla aotumatick odpove"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "Neposla aotumatick odpove"
 
-#: src/prefs.c:1050
+#: src/prefs.c:823
 #, fuzzy
-msgid "Only send auto-response when idle"
+msgid "_Only send auto-response when idle"
 msgstr "Neposla aotumatick odpove"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+msgid "Idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Pre"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
+msgstr ""
+
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Nastavenie zvukov"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 #, fuzzy
 msgid "Test"
 msgstr "Text"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Vyberte..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Edituj"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Edituj"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 msgid "Interface"
 msgstr ""
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Font"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Sprvy"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "IM okno"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Okno skupinovho chatu"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Prehliada"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Udalosti"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Nzov 'Pre': "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "'Pre' sprvy"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Nastavenia"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: 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 "
@@ -3356,11 +3613,11 @@
 "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:74
-msgid "Protocol Error"
-msgstr "Chyba Protokolu"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3368,42 +3625,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Akcie protokolu"
-
-#: src/prpl.c:103
+#: 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:106
-msgid "Disconnect"
-msgstr "Odpoji"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Akceptova?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr ""
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nov Pota"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Otvori potu"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s urobil %s jeho kamarta%s%s%s"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3414,22 +3662,22 @@
 "\n"
 "elte si prida ich do Vho zoznamu kamartov?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - Konverzcie"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 #, fuzzy
 msgid "Register"
 msgstr "Zrui"
@@ -3447,10 +3695,6 @@
 msgid "(1 message)"
 msgstr "(1 sprva)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr ""
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "no"
@@ -3509,8 +3753,141 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
-#~ msgid "General Options"
-#~ msgstr "Veobecn voby"
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Chyba Gadu-Gadu"
+
+#, fuzzy
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Chyba Gadu-Gadu"
+
+#, fuzzy
+#~ msgid "Couldn't send http request"
+#~ msgstr "Nemem posla poiadavku na vyhladvanie"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Pripojenie na vyhladvaciu slubu zlyhalo (%s)"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - Zmena hesla"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Nesprvne meno"
+
+#~ msgid "MSN Error"
+#~ msgstr "Chyba MSN"
+
+#~ msgid "Invalid name"
+#~ msgstr "Nesprvne meno"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Chyba Chatu!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Chat"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Chyba"
+
+#, fuzzy
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Chyba"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Dvod neznmy"
+
+#~ msgid "AOL error"
+#~ msgstr "Chyba AOL"
+
+#~ msgid "Error"
+#~ msgstr "Chyba"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Prihlsenie"
+
+#~ msgid "Chat Error"
+#~ msgstr "Chyba Chatu"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "Nemem zapsa hlaviku sboru!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Pokam sa prihlsi...."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Nepripojen. Kliknite pre otvorenie prihlasovacieho okna."
+
+#~ msgid "Away."
+#~ msgstr "Pre."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Nemem vytvori applet Gaim!"
+
+#~ msgid "Message Error"
+#~ msgstr "Chyba sprvy"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "Nemem posla sprvu: Neznmy dvod"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Chyba zmeny hesla"
+
+#~ 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"
+
+#~ msgid "Login Error"
+#~ msgstr "Chyba pri Prihlasovan"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perlov skripty"
+
+#~ msgid "Select"
+#~ msgstr "Vybra"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Automaticky zobraz zoznam kamartov pri prihlsen"
+
+#~ msgid "Edit"
+#~ msgstr "Edituj"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Chyba Protokolu"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Akcie protokolu"
+
+#~ msgid "Disconnect"
+#~ msgstr "Odpoji"
 
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "Vetky voby sa ihne pouij, pokia nie je napsan inak."
@@ -3518,9 +3895,6 @@
 #~ msgid "Miscellaneous"
 #~ msgstr "Rzne"
 
-#~ msgid "Report Idle Times"
-#~ msgstr "Reportuj poet neinnost"
-
 #~ msgid "None"
 #~ msgstr "iadne"
 
@@ -3533,9 +3907,6 @@
 #~ msgid "Netscape"
 #~ msgstr "Netscape"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Voby proxy"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3543,9 +3914,6 @@
 #~ "Nie vetky protokoly mou poui tieto voby proxy. Pozrite si,\n"
 #~ "prosm, README sbor pre detaily."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Typ proxy"
-
 #~ msgid "No Proxy"
 #~ msgstr "Bez proxy"
 
@@ -3561,9 +3929,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Voby zoznamu kamratov"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Okno zo zoznamom kamartov"
-
 #, fuzzy
 #~ msgid "Tab Placement:"
 #~ msgstr "Poloha zloky"
@@ -3571,12 +3936,6 @@
 #~ msgid "Top"
 #~ msgstr "Hore"
 
-#~ msgid "Bottom"
-#~ msgstr "Dole"
-
-#~ msgid "Group Displays"
-#~ msgstr "Zobrazenia skupiny"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Voby konverzcie"
 
@@ -3616,9 +3975,6 @@
 #~ msgid "Right"
 #~ msgstr "Vpravo"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Kamartova ikona"
-
 #~ msgid "Chat Options"
 #~ msgstr "Voby chatu"
 
@@ -3638,13 +3994,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Vekos fontu pre text"
 
-#~ msgid "Sound Options"
-#~ msgstr "Zvuky Voby"
-
-#, fuzzy
-#~ msgid "Sound method"
-#~ msgstr "Zvuky Voby"
-
 #, fuzzy
 #~ msgid "Sound played when:"
 #~ msgstr "Zvukov prehrva:"
@@ -3655,9 +4004,6 @@
 #~ msgid "minutes using"
 #~ msgstr "mint pouva"
 
-#~ msgid "Messages"
-#~ msgstr "Sprvy"
-
 #~ msgid "Make Away"
 #~ msgstr "Urob 'Pre'"
 
--- a/po/sv.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/sv.po	Tue Aug 27 02:43:54 2002 +0000
@@ -2,12 +2,12 @@
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001.
 #
-# $Id: sv.po 3425 2002-08-18 17:37:15Z chipx86 $
+# $Id: sv.po 3495 2002-08-27 02:43:54Z seanegan $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-05-19 03:54+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -26,9 +26,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Stng"
 
@@ -40,16 +40,17 @@
 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:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Lgg till"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr "Ange symboler tskilda med \"+\" i fltet nedan."
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr "Kryssa i denna ruta fr att endast visa symboler och pris:"
@@ -89,7 +91,7 @@
 msgid "Change"
 msgstr "ndra"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "Tillgnglig"
 
@@ -97,8 +99,8 @@
 msgid "Available for friends only"
 msgstr "Tillgnglig endast fr vnner"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Frnvarande"
 
@@ -114,7 +116,7 @@
 msgid "Invisible for friends only"
 msgstr "Osynlig endast fr vnner"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "Otillgnglig"
 
@@ -146,7 +148,7 @@
 msgid "Unknown Error Code."
 msgstr "Oknd felkod."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -216,16 +218,6 @@
 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/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu-fel"
-
 # src/message.c:76
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
@@ -272,104 +264,151 @@
 msgid "Sex"
 msgstr "Kn"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Ort"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Det finns ingen kompislista lagrad p servern. Ledsen!"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "Kunde inte importera kompislista frn servern"
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Kompislistan skickades utan problem till servern"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Gadu-Gadu-information"
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Kunde inte verfra kompislista till servern"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "Kompislistan togs utan problem bort frn servern"
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kunde inte ta bort kompislistan frn servern"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "Lsenordet ndrades utan problem"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "Lsenordet kunde inte ndras"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "Kunde inte skicka http-begran"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "Import av kompislista frn server misslyckades (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "Export av kompislista till server misslyckades (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Borttagning av kompislista frn server misslyckades (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Anslutning till sktjnsten misslyckades (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Byte av lsenord misslyckades (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "Kunde inte importera kompislista frn servern"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "Kan inte ppna direktmeddelande"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Kan inte lsa frn uttag"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Katalogskning"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Byt lsenord"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Importera kompislista frn servern"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Exportera kompislista till servern"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Ta bort kompislista frn server"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "Kan inte lsa filen %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Skicka meddelande genom servern"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Hmta information"
@@ -385,20 +424,16 @@
 msgstr "<B>%s har bytt mne till: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "Inget sdant smeknamn/kanal"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "IRC-fel"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "Ingen sdan server"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "Inget smeknamn r angivet"
 
 #: src/protocols/irc/irc.c:976
@@ -413,8 +448,8 @@
 msgstr "Kan inte skriva"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Du har sparkats ut frn %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -427,10 +462,6 @@
 msgid "You have left %s"
 msgstr "Du har lmnat %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "IRC-lmnande"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Kanal:"
@@ -444,225 +475,250 @@
 msgstr "DCC-chatt"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr "Ogiltigt aktuellt lsenord! Lsenordet ndrades INTE!"
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
-msgid "Password Change Error!"
-msgstr "Fel vid lsenordsndring!"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
-msgstr "Nya lsenordet samma som det gamla! Lsenordet ndrades INTE!"
-
-#: src/protocols/jabber/jabber.c:1115
+#, fuzzy
+msgid "Unable to change password."
+msgstr "Kan inte lsa frn uttag"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "Kan inte lsa frn uttag"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr "Oknd"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Ansluten"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "Utkad frnvaro"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "Str inte"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Jabber-fel"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr "Fel %s: %s"
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 msgid "Unknown Error in presence"
 msgstr "Oknt fel i nrvaro"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, 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:1655
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "Ingen sdan anvndare"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-msgid "Jabber Error"
-msgstr "Jabber-fel"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Kompisar"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "Oknt inloggningsfel"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 msgid "Password successfully changed."
 msgstr "ndring av lsenord lyckades."
 
-#: src/protocols/jabber/jabber.c:2035
-msgid "Password Change"
-msgstr "Lsenordsndring"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "Anslutningen tappades"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "Kan inte ansluta"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "Ansluten"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "Begr autentiseringsmetod"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-msgid "Invalid Jabber I.D."
-msgstr "Ogiltigt Jabber-id."
-
-#: src/protocols/jabber/jabber.c:2648
-msgid "Room:"
-msgstr "Rum:"
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
+msgid "Jabber Error"
+msgstr "Jabber-fel"
 
 #: src/protocols/jabber/jabber.c:2652
+msgid "Room:"
+msgstr "Rum:"
+
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "Handtag:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "Kan inte ansluta"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Chatt"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Visa logg"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Frnvaromeddelande"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Visa notifiering"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "Fullstndigt namn"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "Efternamn"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "Frnamn"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Gatuadress"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "Utkad adress"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "E-post"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Organisationsnamn"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "Organisationsenhet"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr "Roll"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "Fdelsedag"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -670,23 +726,23 @@
 "Alla poster nedan r valfria. Ange endast den information som du trivs med "
 "att lmna ut"
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "Anvndaridentitet"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Redigera Jabber-vCard"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "Serverregistrering lyckades!"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Oknt registreringsfel"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "Stll in anvndarinformation"
 
@@ -854,116 +910,132 @@
 msgid "Unknown Error Code"
 msgstr "Oknd felkod."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "MSN-fel"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim kunde inte skicka ett meddelande"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, 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:1076
+#: src/protocols/msn/msn.c:1078
 #, 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:1177
+#: src/protocols/msn/msn.c:1179
 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:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Fel vid lsning frn uttag (socket)."
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Kan inte lsa frn uttag"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "Lsenord: "
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Kan inte ansluta till servern."
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "Ansluter till GG-servern"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
-#, fuzzy
-msgid "Busy"
-msgstr "Kompis"
-
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1926
+#, fuzzy
+msgid "Busy"
+msgstr "Kompis"
+
+#: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "Dlj ikon"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Efternamn"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Skrmnamn: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "Ogiltigt namn"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "G in i vilken grupp:"
@@ -996,60 +1068,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blivit frnkopplad frn chattrummet %s."
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "Chattfel!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chatt r inte tillgngligt fr tillfllet"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Chatt"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "Kunde inte ansluta till vrden"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Lsenord skickat, vntar p svar\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "internt anslutningsfel\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "Kan inte logga in till AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Inloggning: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Loggade ut.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "Kunde inte ansluta"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Anslutning etablerad, kaka skickad"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Felaktigt smeknamn eller lsenord."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Ditt konto r avstngt fr tillfllet."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1057,24 +1124,47 @@
 "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/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Versionen av klienten du anvnder r fr gammal. Uppgradera p "
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Autentisering misslyckades"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Internt fel"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim 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
+#, 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
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direktmeddelande med %s etablerat"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1085,123 +1175,111 @@
 "kontaktlista med fljande motivering:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "Ingen motivering angiven."
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ-auktorisering nekades"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "Anvndaren %lu har beviljat din begran att lgga till denne till din "
 "kontaktlista"
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim - ICQ-auktorisering beviljades"
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Du missade %d meddelande frn %s eftersom det var ogiltigt."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Du missade %d meddelanden frn %s eftersom de var ogiltiga."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Du missade %d meddelande frn %s eftersom det var fr stort."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Du missade %d meddelanden frn %s eftersom de var fr stora."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Du missade %d meddelande frn %s eftersom frekvensgrnsen har verskridits."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr ""
 "Du missade %d meddelanden frn %s eftersom frekvensgrnsen har verskridits."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Du missade %d meddelande frn %s eftersom det var fr hemskt."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Du missade %d meddelanden frn %s eftersom de r fr hemska."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Du missade %d meddelande frn %s eftersom du r fr hemsk."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Du missade %d meddelanden frn %s eftersom du r fr hemsk."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Du missade %d meddelande frn %s p grund av oknda orsaker."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Du missade %d meddelanden frn %s p grund av oknda orsaker."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - Fel"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fel: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Oscar SNAC-fel"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Ditt meddelande till %s skickades inte: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Oknd orsak"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "Ingen motivering angiven."
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Anvndarinformation fr %s r inte tillgnglig: %s"
@@ -1312,30 +1390,72 @@
 msgstr "<i>Ingen information tillhandahllen</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL-fel"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "Det senaste meddelandet skickades inte eftersom du r ver frekvensgrnsen. "
 "Vnta 10 sekunder och frsk igen."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Fel"
-
-#: src/protocols/oscar/oscar.c:3207
+#: 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
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "Kan inte lsa filen %s."
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim kunde inte skicka ett meddelande"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1345,19 +1465,15 @@
 "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:3210
-msgid "Gaim - Warning"
-msgstr "Gaim - Varning"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vxel:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "Kan inte ppna direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1368,7 +1484,7 @@
 "kommer att lta dem se din IP-adress, och kan vara en skerhetsrisk. Vill du "
 "fortstta?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1377,7 +1493,7 @@
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Fjrrklienten stder inte "
 "skickande av statusmeddelanden.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1386,15 +1502,15 @@
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Anvndaren har inga "
 "statusmeddelanden.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 msgid "Get Status Msg"
 msgstr "Hmta statusmeddelande"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "Direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Hmta kapabiliteter"
 
@@ -1528,49 +1644,43 @@
 msgstr ""
 "TOC har kommit tillbaka frn dess paus. Du kan nu skicka meddelanden igen."
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "TOC-terupptagning"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Chattfel"
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "Lsenordsndring lyckades"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Lsenordsndring"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC har skickat ett PAUSE-kommando. Nr detta sker, ignorerar TOC alla "
 "meddelanden som skickas till den, och kan sparak ut dig om du skickar ett "
 "meddelande. Gaim kommer att frhindra att ngot gr igenom. Detta r endast "
 "tillflligt, hll ut."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC-paus"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Hmta kataloginformation"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "Kunde inte ansluta fr verfring!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "Kunde inte ansluta fr verfring!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "Kunde inte skriva filhuvud!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1592,22 +1702,23 @@
 msgstr "%s ber att du ska skicka denne en fil"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Ditt meddelande skickades inte."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Klass:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Mottagare:"
 
@@ -1631,10 +1742,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1678,6 +1790,9 @@
 "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"
@@ -1687,13 +1802,10 @@
 msgstr "Logga ut"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Ange ditt inloggningsnamn"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Inloggningsfel"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - Inloggning"
@@ -1735,40 +1847,11 @@
 msgid "Preferences"
 msgstr "Instllningar"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Logga in automatiskt"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Frsker att logga in..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Frnkopplad. Klicka fr att ta fram inloggningsrutan."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Frnvarande: %d vntar."
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Frnvarande."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Nytt frnvaromeddelande:"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Kan inte skapa Gaim-panelprogram!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "Om..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Frnvarande!"
@@ -1782,6 +1865,10 @@
 msgid "Back"
 msgstr "Bakt"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Nytt frnvaromeddelande:"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Ta bort frnvaromeddelande"
@@ -1790,7 +1877,7 @@
 msgid "Set All Away"
 msgstr "Stll in alla frnvarande"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Grupp"
 
@@ -1800,12 +1887,13 @@
 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:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Information"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1825,10 +1913,6 @@
 msgid "Un-Alias"
 msgstr "Avaliasera"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "Kompisanfall"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "Nytt kompisanfall"
@@ -1885,7 +1969,7 @@
 msgid "Information on selected Buddy"
 msgstr "Information om vald kompis"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Skicka snabbmeddelande"
 
@@ -1913,7 +1997,7 @@
 msgid "New Instant Message"
 msgstr "Nytt snabbmeddelande"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Hmta anvndarinformation"
 
@@ -1925,6 +2009,10 @@
 msgid "Tools"
 msgstr "Verktyg"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "Kompisanfall"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Protokolltgrder"
@@ -1969,7 +2057,7 @@
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Kompislista"
 
@@ -2002,12 +2090,12 @@
 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:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -2020,7 +2108,7 @@
 msgid "Invite"
 msgstr "Bjud in"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Kompis"
 
@@ -2037,10 +2125,11 @@
 msgid "Un-Ignore"
 msgstr "Avignorera"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "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
 #, c-format
@@ -2084,15 +2173,15 @@
 msgstr "Viska"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Skicka"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Blockera"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Varna"
@@ -2106,16 +2195,14 @@
 msgstr "Gaim - Infoga bild"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "Kan inte skicka meddelande: fr stort"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Meddelandefel"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "Kan inte skicka meddelande: Oknd orsak"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "Kan inte skicka meddelande: fr stort"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2127,157 +2214,157 @@
 msgid "Setting position to %d\n"
 msgstr "Stller in positionen till %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Gr texten fet"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Fet"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Gr texten kursiv"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Kursiv"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Understryk text"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Understrykning"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Genomstryk text"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Genomstrykning"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Minska typsnittsstorleken"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Liten"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Normal typsnittsstorlek"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "ka typsnittsstorleken"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Stor"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Vlj typsnitt"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Typsnitt"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Textfrg"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Frg"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Bakgrundsfrg"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Infoga lnk"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Lnk"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Infoga smiley"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "Infoga snabbmeddelandebild"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr "Bild"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Anvnd loggning"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Loggning"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Spara konversation"
 
 # src/menus.c:280
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Spara"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Ljud"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konversationer"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Skicka meddelande som: "
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Spara ikon"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Anvnd inte animering"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Anvnd animation"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Dlj ikon"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Spara ikon som..."
 
@@ -2321,384 +2408,405 @@
 "Du hller p att ta bort \"%s\" frn\n"
 "din kompislista. Vill du fortstta?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Acceptera"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - Snabbmeddelandeanvndare"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "Snabbmeddelande till vem:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Anvndare:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 msgid "Account:"
 msgstr "Konto:"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Hmta anvndarinformation"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Lgg till grupp"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Lgg till grupp"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Lgg till kompis"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Lgg till kompis"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Lgg till i"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Frnvarande!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Stll in ostrdhet fr:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Tillt alla anvndare att kontakta mig"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Tillt endast anvndarna nedan"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Tilltelselista"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Neka alla anvndare"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Blockera anvndarna nedan"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Blockera lista"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Ange en kompis att anfalla."
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Kompisanfallsfel"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nytt kompisanfall"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Anfall vem"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Konto"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Anfall nr"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Anfall vid inloggning"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Anfall vid terkomst frn frnvaro"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Anfall vid terkomst frn inaktivitet"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "Anfall d kompis skriver till dig"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Anfallstgrd"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "ppna snabbmeddelandefnster"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Visa notifiering"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Skicka meddelande"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Kr kommando vid anfall"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Spela ljud vid anfall"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Spara detta anfall efter aktivering"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Stll in kataloginformation"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Kataloginformation"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Tillt webbtjnster att hitta din information"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Frnamn"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Andranamn"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Flicknamn"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Delstat"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Nya lsenorden stmmer inte verens"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Fel vid lsenordsbyte"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Fyll i alla flt helt"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "Gammalt lsenord"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Lsenordsndring"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "Gammalt lsenord"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Nytt lsenord"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Nytt lsenord (igen)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Stll in anvndarinformation"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Nedan r resultaten frn din skning: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Tillt"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Neka"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Lgg till tilltelse"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Lgg till nekan"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Logga konversation"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Sk efter kompis"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Sk kompis efter information"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Sk kompis efter e-post"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Lgg till URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Vlj textfrg"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Vlj bakgrundsfrg"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importera till:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importera kompislista"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "Du kan inte skapa ett frnvaromeddelande med en tom titel"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "Kunde inte skapa ett tomt frnvaromeddelande"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Nytt frnvaromeddelande"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Nytt frnvaromeddelande"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Frnvarotitel: "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Anvnd"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Spara och anvnd"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Le!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Aliaskompis"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Aliaskompis"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "Kunde inte ansluta till vrden"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Spara loggfil"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "Kan inte ta bort filen %s - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "Vill du verkligen tmma loggen?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "Kunde inte ppna konfigurationsfilen %s."
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "Vill du verkligen tmma loggen?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "Okej"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Konversation"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Tm"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Byt namn p gruppen"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Byt namn p gruppen"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Nytt namn:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Byt namn p kompis"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Byt namn p kompis"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vlj Perlskript"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunde inte ppna konfigurationsfilen %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Instllningsfel"
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2708,9 +2816,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fel vid ppnande av anslutning.\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
-msgid "Plugin Error"
-msgstr "Insticksmodulfel"
+#: src/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
 msgid "Gaim - Load Buddy Icon"
@@ -2724,7 +2833,7 @@
 msgid "Browse"
 msgstr "Blddra"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "terstll"
 
@@ -2765,17 +2874,22 @@
 msgstr "Ange lsenord"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Inloggningsfel"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Protokolltgrder"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2783,40 +2897,40 @@
 "Du kan inte logga in detta konto. Du har inte det protokoll som det anvnder "
 "inlst, eller protokollet har inte inloggningsfunktionen."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, 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:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Kontoredigerare"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Markera alla"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Markera automatiskt"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "Markera inga"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Modifera"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Logga in/ut"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2825,28 +2939,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s kunde inte logga in"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Inloggningsfel"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "Meddelande"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s har kopplats frn"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "Anslutningsfel"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perlskript"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista ver insticksmoduler"
@@ -2855,10 +2969,12 @@
 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"
@@ -2904,427 +3020,596 @@
 msgid "Close this window"
 msgstr "Stng detta fnster"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, 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 "Windows"
-msgstr "Snabbmeddelandefnster"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Visa felskningsfnster"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Anvnd ramlsa knappar"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Delstat"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Anvnd ramlsa knappar"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Fet"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Kursiv"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Understrykning"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Genomstryk text"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Avbryt"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "Infoga smiley"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Infoga smiley"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Markera"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Textfrg"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Bakgrundsfrg"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Kompisvisningar"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "Textfrg"
+msgid "Show graphical _smileys"
+msgstr "Visa grafiska smileys"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Visa tidsstmpel p meddelanden"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "Visa URL:er som lnkar"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Markera felstavade ord"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Ignorera frger"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Bakgrundsfrg"
+msgid "Ignore font _faces"
+msgstr "Ignorera typsnittsvarianter"
+
+#: src/prefs.c:382
+#, 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
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Retur skickar meddelande"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Control-Retur skickar meddelande"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "Snabbmeddelandefnster"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Escape stnger fnster"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Control-W stnger fnster"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Control-{B/I/U/S} infogar HTML-taggar"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Control-(nummer) infogar smileys"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Nederst"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Dlj snabbmeddelande-/info-/chattknappar"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Visa grafiska smileys"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Visa tidsstmpel p meddelanden"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Visa bilder p knappar"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Visa URL:er som lnkar"
+msgid "Buddy List Window"
+msgstr "Kompislistefnster"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Markera felstavade ord"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Spara fnsterstorlek/position"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Hj fnster vid hndelser"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Gruppvisningar"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Dlj grupper med inga anslutna kompisar"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Visa nummer i grupper"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Kompisvisningar"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "Visa kompistypikoner"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Visa varningsniver"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Ignorera frger"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Visa inaktivitetstider"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Ignorera typsnittsvarianter"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Ignorera typsnittsstorlekar"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignorera automatiserade TiK-meddelanden"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Retur skickar meddelande"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Control-Retur skickar meddelande"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Frga inaktiva kompisar gra"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "Snabbmeddelandefnster"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Ny fnsterbredd:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "Ny fnsterhjd:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Hjd p postwidget:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Hj fnster vid hndelser"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Dlj fnster vid skickande"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Kompisikoner"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Escape stnger fnster"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Dlj kompisikoner"
 
 #: src/prefs.c:466
-msgid "Control-W closes window"
-msgstr "Control-W stnger fnster"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} infogar HTML-taggar"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(nummer) infogar smileys"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Dlj snabbmeddelande-/info-/chattknappar"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Visa bilder p knappar"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Visa automatiskt kompislista vid inloggning"
+#, fuzzy
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Inaktivera kompisikonanimering"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Visa inloggningar i fnster"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Visa notifiering"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Meddela kompisar att du skriver till dem"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "Tabbkomplettering"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Tabbkomplettera smeknamn"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Gammaldags tabbkomplettering"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Visa kompislista nra panelprogrammet"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Spara fnsterstorlek/position"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "Hj fnster vid hndelser"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Dlj grupper med inga anslutna kompisar"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Visa nummer i grupper"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "Visa kompistypikoner"
+msgid "_Show people joining/leaving in window"
+msgstr "Visa personer som gr in/lmnar i fnstret"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Visa varningsniver"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "Visa alla chattar i ett fnster med flikar"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Visa inaktivitetstider"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Frga inaktiva kompisar gra"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Ny fnsterbredd:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "Ny fnsterhjd:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Hjd p postwidget:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Hj fnster vid hndelser"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Dlj fnster vid skickande"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Dlj kompisikoner"
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "Inaktivera kompisikonanimering"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Visa inloggningar i fnster"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Meddela kompisar att du skriver till dem"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Tabbkomplettera smeknamn"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "Gammaldags tabbkomplettering"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Visa personer som gr in/lmnar i fnstret"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "Visa alias i flikar/titlar"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "Chatt"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "Visa alla chattar i ett fnster med flikar"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "Visa alla chattar i ett fnster med flikar"
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "Visa alias i flikar/titlar"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "Visa alla chattar i ett fnster med flikar"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Visa chattar i samma flikfnster"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Kompislista"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Proxytyp"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Proxyserver"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Vrd"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Anvndare"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Lsenord"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "Proxyalternativ"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "Visa nytt fnster som standard"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Meddelanden"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Logga alla konversationer"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "Ta bort HTML frn loggar"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Visa systemlogg"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "Logga d kompisar loggar in/ut"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Logga d kompisar blir inaktiva/kommer tillbaka frn inaktivitet"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Logga d kompisar blir frnvarande/kommer tillbaka"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Logga dina egna inloggningar/inaktivitet/frnvarande"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "Individuell loggfil fr varje kompis inloggning"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Ljudalternativ"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "Inga ljud nr du loggar in"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Ljud d du r frnvarande"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Ljudmetod"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Ljudkommando\n"
 "(%s fr filnamn)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "Att skicka meddelanden tar bort frnvarostatus"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Klgg nya meddelanden vid frnvaro"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "Ignorera nya konversationer vid frnvaro"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "Skicka inte automatiskt svar"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "Skicka inte automatiskt svar"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Skicka endast automatiskt svar vid inaktivitet"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "Inaktivitet: "
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Frnvarande"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Ljudkonfiguration"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Vlj..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Redigera"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Redigera"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Instans:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Meddelande skickat"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "Snabbmeddelandefnster"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Gruppchatfnster"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Proxyserver"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Webblsare"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Ljud"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Hndelser"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Frnvarotitel: "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Frnvaromeddelanden"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Egenskaper"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: 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 "
@@ -3336,11 +3621,11 @@
 "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:74
-msgid "Protocol Error"
-msgstr "Protokollfel"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3348,42 +3633,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Protokolltgrder"
-
-#: src/prpl.c:103
+#: 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:106
-msgid "Disconnect"
-msgstr "Koppla frn"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "Acceptera?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nytt brev"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "ppna brev"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, 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:588
+#: src/prpl.c:590
 msgid ""
 "\n"
 "\n"
@@ -3393,7 +3669,7 @@
 "\n"
 "Vill du lgga till honom eller henne till din kompislista?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3401,15 +3677,15 @@
 "Du har fr tillfllet inga tillgngliga protokoll som klarar av att "
 "registrera nya konton."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrering"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Registreringsinformation"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "Registrera"
 
@@ -3426,10 +3702,6 @@
 msgid "(1 message)"
 msgstr "(1 meddelande)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Varnad"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Ja"
@@ -3482,12 +3754,172 @@
 msgid "Someone says your name in chat"
 msgstr "Ngon sger ditt namn i chatt"
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gadu-Gadu-fel"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Gadu-Gadu-information"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "Kunde inte skicka http-begran"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "Import av kompislista frn server misslyckades (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "Export av kompislista till server misslyckades (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Borttagning av kompislista frn server misslyckades (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Anslutning till sktjnsten misslyckades (%s)"
+
+#~ 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!"
+
+#~ msgid "Password Change Error!"
+#~ msgstr "Fel vid lsenordsndring!"
+
+#~ msgid "New password same as old password! Password NOT Changed!"
+#~ msgstr "Nya lsenordet samma som det gamla! Lsenordet ndrades INTE!"
+
+#~ msgid "Password Change"
+#~ msgstr "Lsenordsndring"
+
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Ogiltigt Jabber-id."
+
+#~ msgid "MSN Error"
+#~ msgstr "MSN-fel"
+
+#~ msgid "Invalid name"
+#~ msgstr "Ogiltigt namn"
+
+#~ msgid "Chat Error!"
+#~ msgstr "Chattfel!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Chatt"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - Fel"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Oscar SNAC-fel"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Oknd orsak"
+
+#~ msgid "AOL error"
+#~ msgstr "AOL-fel"
+
+#~ msgid "Error"
+#~ msgstr "Fel"
+
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - Varning"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC-terupptagning"
+
+#~ msgid "Chat Error"
+#~ msgstr "Chattfel"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC-paus"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "Kunde inte skriva filhuvud!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Frsker att logga in..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Frnkopplad. Klicka fr att ta fram inloggningsrutan."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Frnvarande: %d vntar."
+
+#~ msgid "Away."
+#~ msgstr "Frnvarande."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Kan inte skapa Gaim-panelprogram!"
+
+#~ msgid "About..."
+#~ msgstr "Om..."
+
+#~ msgid "Message Error"
+#~ msgstr "Meddelandefel"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "Kan inte skicka meddelande: Oknd orsak"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Kompisanfallsfel"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Fel vid lsenordsbyte"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "Kan inte ta bort filen %s - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "Instllningsfel"
+
+#~ msgid "Plugin Error"
+#~ msgstr "Insticksmodulfel"
+
+#~ msgid "Login Error"
+#~ msgstr "Inloggningsfel"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perlskript"
+
+#~ msgid "Select"
+#~ msgstr "Markera"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Visa automatiskt kompislista vid inloggning"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Visa kompislista nra panelprogrammet"
+
+#~ msgid "Edit"
+#~ msgstr "Redigera"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Protokollfel"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Protokolltgrder"
+
+#~ msgid "Disconnect"
+#~ msgstr "Koppla frn"
+
+#~ msgid "Warned"
+#~ msgstr "Varnad"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Visa kompistickare"
 
-#~ msgid "General Options"
-#~ msgstr "Allmnna instllningar"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "Alla ndringar brjar glla omedelbart svida inte annat anges."
 
@@ -3519,9 +3951,6 @@
 #~ msgid "Galeon"
 #~ msgstr "Galeon"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Proxyalternativ"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3529,9 +3958,6 @@
 #~ "Inte alla protokoll kan anvnda dessa proxyalternativ. Se filen README "
 #~ "fr detaljer."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Proxytyp"
-
 #~ msgid "No Proxy"
 #~ msgstr "Ingen proxy"
 
@@ -3547,27 +3973,15 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Alternativ fr kompislista"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Kompislistefnster"
-
 #~ msgid "Tab Placement:"
 #~ msgstr "Flikplacering:"
 
 #~ msgid "Top"
 #~ msgstr "verst"
 
-#~ msgid "Bottom"
-#~ msgstr "Nederst"
-
 #~ msgid "Raise Buddy List on Signons and Signoffs"
 #~ msgstr "Hj kompislista vid inloggningar och utloggningar"
 
-#~ msgid "Group Displays"
-#~ msgstr "Gruppvisningar"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Kompisvisningar"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Konversationsalternativ"
 
@@ -3610,18 +4024,12 @@
 #~ msgid "Right"
 #~ msgstr "Hger"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Kompisikoner"
-
 #~ msgid "Chat Options"
 #~ msgstr "Chattalternativ"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Visa konversationer i samma flikfnster"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Tabbkomplettering"
-
 #~ msgid "Font Options"
 #~ msgstr "Typsnittsalternativ"
 
@@ -3634,12 +4042,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Typsnittsstorlek fr text"
 
-#~ msgid "Sound Options"
-#~ msgstr "Ljudalternativ"
-
-#~ msgid "Sound method"
-#~ msgstr "Ljudmetod"
-
 #~ msgid "Sound played when:"
 #~ msgstr "Ljud spelas d:"
 
@@ -3652,9 +4054,6 @@
 #~ msgid "minutes using"
 #~ msgstr "minuters anvndning"
 
-#~ msgid "Messages"
-#~ msgstr "Meddelanden"
-
 #~ msgid "Make Away"
 #~ msgstr "Gr frnvarande"
 
--- a/po/zh_CN.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/zh_CN.po	Tue Aug 27 02:43:54 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2000-06-17 17:55+08\n"
 "Last-Translator: hashao <hashao@china.com>\n"
 "Language-Team: Simplified Chinese <zh@li.org>\n"
@@ -27,9 +27,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "ر"
 
@@ -41,16 +41,17 @@
 msgid "Refresh"
 msgstr "ˢ"
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr ""
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "ɾ"
 
@@ -74,6 +75,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -92,7 +94,7 @@
 msgid "Change"
 msgstr "ȡ"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr ""
 
@@ -100,8 +102,8 @@
 msgid "Available for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "ʱ뿪"
 
@@ -118,7 +120,7 @@
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr ""
 
@@ -155,7 +157,7 @@
 msgid "Unknown Error Code."
 msgstr ""
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr ""
@@ -232,17 +234,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr ""
 
-#: 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
-#, fuzzy
-msgid "Gadu-Gadu Error"
-msgstr "Gaim - "
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr ""
@@ -292,112 +283,153 @@
 msgid "Sex"
 msgstr ""
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr ""
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
-msgstr ""
-
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
+#: src/protocols/gg/gg.c:814
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:821
-#, fuzzy
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "б"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:833
-#, fuzzy
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "б"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "Gaim - "
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:956
-#, fuzzy
-msgid "Couldn't send http request"
-msgstr "ӵ"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "б"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "ֱܽ"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "ܶļ %s"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1147
-#, fuzzy, c-format
-msgid "Changing Password failed (%s)"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 #, fuzzy
 msgid "Directory Search"
 msgstr "ַ¼"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 #, fuzzy
 msgid "Import Buddies List from Server"
 msgstr "б"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 #, fuzzy
 msgid "Export Buddies List to Server"
 msgstr "б"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr ""
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "ܶļ %s"
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 #, 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:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "ûϸ"
@@ -413,21 +445,15 @@
 msgstr ""
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
+msgid "There is no such nick or channel on this IRC 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
-#, fuzzy
-msgid "IRC Error"
-msgstr ""
-
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
+msgid "There is no such IRC Server"
 msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+msgid "No IRC nickname given"
 msgstr ""
 
 #: src/protocols/irc/irc.c:976
@@ -444,7 +470,7 @@
 
 #: src/protocols/irc/irc.c:1071
 #, fuzzy, c-format
-msgid "You have been kicked from %s: %s"
+msgid "You have been kicked from %s:"
 msgstr "㱻 (%s) ϳˣ"
 
 #: src/protocols/irc/irc.c:1076
@@ -457,10 +483,6 @@
 msgid "You have left %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr ""
-
 #: src/protocols/irc/irc.c:1671
 #, fuzzy
 msgid "Channel:"
@@ -476,267 +498,288 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
+#, fuzzy
+msgid "Unable to change password."
+msgstr "ܶļ %s"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
-#, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - "
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "ܶļ %s"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Ϣ"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1655
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+msgid "No such user."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
+msgid "Buddies"
+msgstr "Ƕ"
+
+#: src/protocols/jabber/jabber.c:1808
+#, fuzzy
+msgid "Authenticating"
+msgstr "֤ʧ"
+
+#: src/protocols/jabber/jabber.c:1845
+#, fuzzy
+msgid "Unknown login error"
+msgstr "¼"
+
+#: src/protocols/jabber/jabber.c:2036
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "Gaim - "
+
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
+#, 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
+#, fuzzy
+msgid "Unable to connect"
+msgstr "ֱܽ"
+
+#: src/protocols/jabber/jabber.c:2088
+#, fuzzy
+msgid "Connected"
+msgstr "ѶϿ"
+
+#: src/protocols/jabber/jabber.c:2091
+#, fuzzy
+msgid "Requesting Authentication Method"
+msgstr "֤ʧ"
+
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
+#, fuzzy
+msgid "Connecting"
+msgstr "ѹر"
+
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
 #, fuzzy
 msgid "Jabber Error"
 msgstr "Ϣ"
 
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
-msgid "Buddies"
-msgstr "Ƕ"
-
-#: src/protocols/jabber/jabber.c:1805
-#, fuzzy
-msgid "Authenticating"
-msgstr "֤ʧ"
-
-#: src/protocols/jabber/jabber.c:1842
-#, fuzzy
-msgid "Unknown login error"
-msgstr "¼"
-
-#: src/protocols/jabber/jabber.c:2033
-#, fuzzy
-msgid "Password successfully changed."
-msgstr "Gaim - "
-
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - "
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
-#, fuzzy
-msgid "Connection lost"
-msgstr "ѹر"
-
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
-#, fuzzy
-msgid "Unable to connect"
-msgstr "ֱܽ"
-
-#: src/protocols/jabber/jabber.c:2085
-#, fuzzy
-msgid "Connected"
-msgstr "ѶϿ"
-
-#: src/protocols/jabber/jabber.c:2088
-#, fuzzy
-msgid "Requesting Authentication Method"
-msgstr "֤ʧ"
-
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
-#, fuzzy
-msgid "Connecting"
-msgstr "ѹر"
-
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-#, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 #, fuzzy
 msgid "Server:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 #, fuzzy
 msgid "Handle:"
 msgstr "ʱ䣺"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "ֱܽ"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "鿴¼"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "յʱ뿪Ϣ"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 #, fuzzy
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 #, fuzzy
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 #, fuzzy
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 #, fuzzy
 msgid "Telephone"
 msgstr "ȫѡ"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 #, fuzzy
 msgid "Role"
 msgstr "ɾ"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 #, fuzzy
 msgid "User Identity"
 msgstr "ûϸ"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 #, fuzzy
 msgid "Server Registration successful!"
 msgstr "ûע"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 #, fuzzy
 msgid "Set User Info"
 msgstr "ûϸ"
@@ -905,122 +948,135 @@
 msgid "Unknown Error Code"
 msgstr "¼"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-#, fuzzy
-msgid "MSN Error"
-msgstr ""
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
 #, fuzzy
-msgid "Gaim was unable to send a message"
+msgid "Gaim was unable to send an MSN message"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 #, fuzzy
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "㱻 (%s) ϳˣ"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "ȡļ %s "
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "ܶļ %s"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "룺"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "ܵ¼ AIM"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "עµû"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 #, fuzzy
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "ظǶǵͼ"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "¼"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "¼"
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-#, fuzzy
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Ҫ飺"
@@ -1053,84 +1109,106 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "㱻 (%s) ϳˣ"
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "û졣"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim "
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "ӵ"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "ͳȺӦ\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "ڲӴ\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "ܵ¼ AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "¼ %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "dz\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "޷"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "ӳɹͳɡɣ"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "ӣϿƵ̫ˣʮԡҪԣȵʱ"
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "ʹõ汾̫ˡµİɣ"
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "֤ʧ"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "ڲ"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr ""
+"%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
+#, 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
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "<HR><B>ѽ %s ֱӡ</B><BR><HR>"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1138,124 +1216,105 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+msgid "ICQ authorization denied."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1585
+#: 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:1586
+#: 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:1595
+#: src/protocols/oscar/oscar.c:1597
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, fuzzy, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, fuzzy, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, fuzzy, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, fuzzy, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Īضʧһ %s Ϣ"
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, fuzzy, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Īضʧһ %s Ϣ"
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - "
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1736
-#, fuzzy
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - "
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, fuzzy, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Ϣ޷ͳ"
 
-# #: src/protocols/oscar/oscar.c:1753
-# #, c-format
-# msgid "Your message to %s did not get sent: %s"
-# msgstr " %s Ϣûб"
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "ԭ"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+msgid "No reason was given."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
@@ -1378,48 +1437,86 @@
 msgstr "<i>δṩκϢ</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "ӿѾϿ"
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL "
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
 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 ""
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr "֤ʧ"
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr "֤ʧ"
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "ܶļ %s"
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr ""
+"%s\n"
+"%s ޷¼ %s"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - û"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "ֱܽ"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1427,30 +1524,30 @@
 "continue?"
 msgstr " %s ׽¶ĺβͣзա"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "յʱ뿪Ϣ"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "ֱϢ"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 #, fuzzy
 msgid "Get Capabilities"
 msgstr "ԣ%s\n"
@@ -1582,49 +1679,43 @@
 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
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Gaim - "
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - "
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC ͣ"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "ַ¼"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "޷ӡ"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "޷ӡ"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "޷дļͷ"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1646,22 +1737,23 @@
 msgstr "%s Ƿһļ"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Ϣ޷ͳ"
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr ""
 
@@ -1687,7 +1779,7 @@
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 
 #: src/about.c:147
@@ -1711,6 +1803,9 @@
 "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 "ַ"
@@ -1720,13 +1815,10 @@
 msgstr "뿪"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "ĵ¼"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "¼"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - ¼"
@@ -1767,41 +1859,11 @@
 msgid "Preferences"
 msgstr ""
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Զ¼"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "ڵ¼"
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "ߡ¼"
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr ""
-
-#: src/applet.c:131
-#, fuzzy
-msgid "Away."
-msgstr "ʱ뿪"
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "µʱ뿪Ϣ"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "޷ Gaim С!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "ڡ"
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - ʱ뿪"
@@ -1814,6 +1876,10 @@
 msgid "Back"
 msgstr ""
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "µʱ뿪Ϣ"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "ɾ뿪Ϣ"
@@ -1822,7 +1888,7 @@
 msgid "Set All Away"
 msgstr "ʺΪ뿪"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Ⱥ"
 
@@ -1832,12 +1898,13 @@
 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:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "ϸ"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Ŷ"
 
@@ -1857,10 +1924,6 @@
 msgid "Un-Alias"
 msgstr "ȥŶ"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr ""
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr ""
@@ -1921,7 +1984,7 @@
 msgid "Information on selected Buddy"
 msgstr "ѡеѵ"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "ʱϢ"
 
@@ -1949,7 +2012,7 @@
 msgid "New Instant Message"
 msgstr "ʱϢ"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "ûϸ"
 
@@ -1961,6 +2024,10 @@
 msgid "Tools"
 msgstr ""
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr ""
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Э鶯"
@@ -2007,7 +2074,7 @@
 msgid "About Gaim"
 msgstr " Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "б"
 
@@ -2041,12 +2108,12 @@
 msgstr "趨ʹõdzƣ"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "ȡ"
 
@@ -2059,7 +2126,7 @@
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr ""
 
@@ -2077,10 +2144,11 @@
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr ""
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, fuzzy, c-format
@@ -2129,15 +2197,15 @@
 msgstr "Ļ"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "ͳ"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "ס죡"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr ""
@@ -2152,18 +2220,16 @@
 msgstr "Gaim - ʱϢû"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
-msgstr ""
-
-#: src/conversation.c:1336 src/conversation.c:1340
-#, fuzzy
-msgid "Message Error"
-msgstr "Ϣ"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
+msgstr "Īضʧһ %s Ϣ"
 
 #: src/conversation.c:1340
 #, fuzzy
-msgid "Unable to send message: Unknown reason"
-msgstr "Īضʧһ %s Ϣ"
+msgid "Unable to send message"
+msgstr ""
+"%s\n"
+"%s ޷¼ %s"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2175,162 +2241,162 @@
 msgid "Setting position to %d\n"
 msgstr "λ趨 %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr ""
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr ""
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "б"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "б"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "¼"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "¼"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr ""
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "С"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "С"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "С"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr ""
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr ""
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "ѡ"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr ""
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "ɫ"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "ɫ"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "ɫ"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "볬"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Цͼ"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Ц"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "IM ͼ"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Image"
 msgstr "IM ͼ"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "ʼ¼"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "¼"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Ի"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 #, fuzzy
 msgid "Toggle Sound"
 msgstr "򿪣رռ¼"
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - жԻ"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Ϣ"
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 #, fuzzy
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Ϊ"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr ""
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 #, fuzzy
 msgid "Enable Animation"
 msgstr ""
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 #, fuzzy
 msgid "Hide Icon"
 msgstr "ظǶǵͼ"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 #, fuzzy
 msgid "Save Icon As..."
 msgstr "Gaim - Ϊ"
@@ -2374,402 +2440,419 @@
 "your buddylist. Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr ""
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "ȷ"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - ʱϢû"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "һTʱϢ"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "û"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "ʺ"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - ȡû"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr ""
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr ""
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 #, fuzzy
 msgid "Contact"
 msgstr ""
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 #, fuzzy
 msgid "Add To"
 msgstr ""
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - ʱ뿪"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "˽ѡΪ"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "еûϵ"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "ֻûϵ"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "ûб"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "ܾûϵ"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "סЩһ"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "סļһ"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "ҪӵģǶ"
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "ʱ"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 #, fuzzy
 msgid "Account"
 msgstr "ʺ"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Ӻʱ¼"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Ӻʱ"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Ӻʱ־ָ"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "ѵ¼"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 #, fuzzy
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 #, fuzzy
 msgid "Open IM Window"
 msgstr "ʱϢ"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr ""
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 #, fuzzy
 msgid "Send Message"
 msgstr "Ϣ"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "ִֶ"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "ֶͲ"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "´ηȻִ"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 趨ַ¼"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "ַ¼"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "ҳѰҵ"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr ""
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr ""
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr ""
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr ""
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "ʡ"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "벻һ"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - "
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "еı"
 
-#: src/dialogs.c:2172
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - "
+
+#: src/dialogs.c:2186
 msgid "Original Password"
 msgstr ""
 
-#: src/dialogs.c:2186
-msgid "New Password"
-msgstr ""
-
 #: src/dialogs.c:2200
+msgid "New Password"
+msgstr ""
+
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "루ȷ"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 趨û"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "Ľ"
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "ܾ"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - ӽֹ"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ¼Ի"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Ѱ"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - ûϲѰ"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ݵʲѰ"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "趨ɫ"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "趨ɫ"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr ""
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - б"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "ʱ뿪Ϣûб"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "ʱ뿪ϢΪ"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - ʱ뿪Ϣ"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "µʱ뿪Ϣ"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "ʱ뿪⣺"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "ʹ"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "沢ʹ"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "Ц"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "ȡһŶ"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - ȡһŶ"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "ӵ"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - ¼Ϊ"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:3996
 #, fuzzy, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "ܶļ %s"
+msgid "Couldn't remove file %s."
+msgstr "ܽ\n"
 
 # #: src/dialogs.c:3981
 # #, c-format
 # msgid "Unable to remove file %s - %s"
 # msgstr "ɾļ %s"
-#: src/dialogs.c:4009
+#: src/dialogs.c:4024
 msgid "Really clear log?"
 msgstr "Ҫ¼"
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "ȷ"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 #, fuzzy
 msgid "Date"
 msgstr "ʡ"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 #, fuzzy
 msgid "Conversation"
 msgstr "Ի"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - "
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr ""
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "֣"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Ƕ"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Ƕ"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - ѡ Perl ű"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr ""
 
-# #: src/gaimrc.c:1137
-# #, c-format
-# msgid "Could not open config file %s."
-# msgstr "޷ļ"
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "ѡ"
-
 #: src/html.c:183
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
@@ -2779,9 +2862,12 @@
 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/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
 #, fuzzy
@@ -2798,7 +2884,7 @@
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr ""
 
@@ -2841,17 +2927,23 @@
 msgstr ""
 
 #: src/multi.c:948
+#, fuzzy
+msgid "TOC not found."
+msgstr "Ҳļ %s\n"
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "¼"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Э鶯"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2860,74 +2952,74 @@
 "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:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "ɾ %s"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - ʺű༭"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "ȫѡ"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "ѡԶظϢ"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "ȫѡ"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "޸"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "¼/뿪"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "ɾ"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "¼"
+
+#: src/multi.c:1419
 #, fuzzy
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 #, fuzzy
 msgid "Connection Error"
 msgstr "ѹر"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perl ű"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - б"
@@ -2936,11 +3028,13 @@
 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"
@@ -2986,429 +3080,592 @@
 msgid "Close this window"
 msgstr "ڽ̸ʾ¼dzϢ"
 
-#: src/prefs.c:266
-#, fuzzy
-msgid "Windows"
-msgstr "ʱϢ"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr "һѡ"
+
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:282
+#, fuzzy
+msgid "Show _Debug Window"
 msgstr "ʾ Debug "
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "ʹޱ߿ť"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "ʽ"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "ʹޱ߿ť"
-
-#: src/prefs.c:311
-#, fuzzy
-msgid "Strikethough"
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr ""
+
+#: src/prefs.c:303
+#, fuzzy
+msgid "_Italics"
+msgstr "б"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "¼"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr ""
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "ȡ"
 
-#: src/prefs.c:323
-#, fuzzy
-msgid "Use custom face"
+#: src/prefs.c:310
+#, fuzzy
+msgid "Use custo_m face"
+msgstr "Цͼ"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Цͼ"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "ѡ"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
-#, fuzzy
-msgid "Text color"
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
 msgstr "ɫ"
 
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "ɫ"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "бʾ"
+
+#: src/prefs.c:374
+#, fuzzy
+msgid "Show graphical _smileys"
+msgstr "ʾͼЦ"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Ϣʾʱ"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "Գӷʽʾ URL"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "ʾƴĵ"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "յϢɫ"
+
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "ɫ"
+msgid "Ignore font _faces"
+msgstr "յϢ"
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "յϢС"
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "ԶɵϢ"
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr " Enter Ϣ"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Ctrl-Enter Ϣ"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "ʱϢ"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "ESC رմ"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "ESC رմ"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Ctrl-{B/I/U/S}  HTML "
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Ctrl- Цͼ"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "׶"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr " Ϣ/Ϣ/ ť"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "ʾͼЦ"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Ϣʾʱ"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "ڰťʾͼ"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Գӷʽʾ URL"
+msgid "Buddy List Window"
+msgstr "б"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "ʾƴĵ"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "洰ڵĴСλ"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "¼ʱ"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "ʾ"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "ûиǶ¼"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "ʾ"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "бʾ"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "ʾͼ"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "ʾ漶"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "յϢɫ"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "ʾתʱ"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "յϢ"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "յϢС"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "ԶɵϢ"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr " Enter Ϣ"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Ctrl-Enter Ϣ"
+msgid "Grey i_dle buddies"
+msgstr ""
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "ʱϢ"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "µĴڿ趨"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "µĴڸ߶趨"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "봰ڸ߶ȣ"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "¼ʱ"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Ϣش"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "ͼ"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "ESC رմ"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "ظǶǵͼ"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "ESC رմ"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Ctrl-{B/I/U/S}  HTML "
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Ctrl- Цͼ"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr " Ϣ/Ϣ/ ť"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "ڰťʾͼ"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "¼Զʾб"
+msgid "Disable Buddy Icon A_nimation"
+msgstr ""
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "ڽ̸ʾ¼dzϢ"
+
+#: src/prefs.c:471
+msgid "Typing Notification"
+msgstr ""
+
+#: src/prefs.c:472
+msgid "Notify buddies that you are _typing to them"
+msgstr ""
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "TAB Զȫ"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "TAB Զȫdz"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "ʽ TAB Զȫ"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr " applet ʾб"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "洰ڵĴСλ"
-
-#: src/prefs.c:513
-#, fuzzy
-msgid "Raise Window on Events"
-msgstr "¼ʱ"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "ûиǶ¼"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "ʾ"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "ʾͼ"
+#, fuzzy
+msgid "_Show people joining/leaving in window"
+msgstr "ڴʾǼ/뿪Ϣ"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "ʾ漶"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "һҳʾ"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "ʾתʱ"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "ڴڻҳıʾŶ"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr ""
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "һҳʾ"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "µĴڿ趨"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "µĴڸ߶趨"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "봰ڸ߶ȣ"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "¼ʱ"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Ϣش"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "ظǶǵͼ"
-
-#: src/prefs.c:578
-#, fuzzy
-msgid "Disable Buddy Icon Animation"
-msgstr ""
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "ڽ̸ʾ¼dzϢ"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr ""
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "TAB Զȫdz"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "ʽ TAB Զȫ"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "ڴʾǼ/뿪Ϣ"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
-msgstr ""
-
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "һҳʾ"
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "ڴڻҳıʾŶ"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "һҳʾ"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "ͬһһҳʾԻ"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "б"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr ""
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr ""
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "ַ"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "˿"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "¼û"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "¼"
 
-#: src/prefs.c:873
-#, fuzzy
-msgid "Open new window by default"
+#: src/prefs.c:670
+#, fuzzy
+msgid "Browser Selection"
+msgstr "ѡ"
+
+#: src/prefs.c:697
+msgid "Browser Options"
+msgstr "ѡ"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "ȱʡ´"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Ϣ"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "¼жԻ"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "¼ļڵ HTML "
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "鿴ϵͳ¼"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "¼Ƕ¼˳ʱ"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "¼Ƕʲôʱ򷢴ʲôʱ"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "¼Ƕʲôʱ뿪ʲôʱ"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "¼Լʱ¼//뿪"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "ÿһǶʹòͬļ¼ļ"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "ѡ"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "ĵؽȥǹزҪ"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "뿪ʱ"
 
-#: src/prefs.c:990
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr ""
+
+#: src/prefs.c:777
 #, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "\n"
 "(ļ·ʹ %s; Ϊʹڲ)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "ϢʱԶȡʱ뿪״̬"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "ʱ뿪ʱյϢŵ"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "ʱ뿪ʱµĶԻ"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "ҪԶظ"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "ҪԶظ"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "ֻڷʱŷԶظ"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+msgid "Idle"
+msgstr "ת"
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "ʱ뿪"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - "
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 #, fuzzy
 msgid "Test"
 msgstr ""
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "ѡ"
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "༭"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "༭"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 msgid "Interface"
 msgstr ""
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Ϣ"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "ʱϢ"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "촰"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "¼Ч"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "ʱ뿪⣺"
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "ʱ뿪Ϣ"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - 趨"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim "
 
 #: src/prpl.c:70
+msgid "Incompatible protocol detected."
+msgstr ""
+
+#: src/prpl.c:71
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
@@ -3416,11 +3673,11 @@
 "say, it was not successfully loaded."
 msgstr ""
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Э"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3428,65 +3685,56 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Э鶯"
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s ʹ %sѾɾˡ%s ߡ"
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr "Ͽ"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "ܣ"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - ʾ"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 #, fuzzy
 msgid "Gaim - New Mail"
 msgstr "Gaim - ļ"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr ""
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s has made %s their buddy%s%s"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 msgid ""
 "\n"
 "\n"
 "Do you wish to add him or her to your buddy list?"
 msgstr ""
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - ûע"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "ע"
 
@@ -3503,11 +3751,6 @@
 msgid "(1 message)"
 msgstr "(1 Ϣ)"
 
-#: src/server.c:808
-#, fuzzy
-msgid "Warned"
-msgstr ""
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Yes"
@@ -3566,12 +3809,159 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gaim - "
+
+#, fuzzy
+#~ msgid "Couldn't send http request"
+#~ msgstr "ӵ"
+
+#, fuzzy
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "IRC Error"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Password Change Error!"
+#~ msgstr "Gaim - "
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - "
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "MSN Error"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Invalid name"
+#~ msgstr ""
+
+#~ msgid "Chat Error!"
+#~ msgstr ""
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim "
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - "
+
+#, fuzzy
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - "
+
+# #: src/protocols/oscar/oscar.c:1753
+# #, c-format
+# msgid "Your message to %s did not get sent: %s"
+# msgstr " %s Ϣûб"
+#~ msgid "Reason unknown"
+#~ msgstr "ԭ"
+
+#~ msgid "AOL error"
+#~ msgstr "AOL "
+
+#~ msgid "Error"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - û"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC ָ"
+
+#~ msgid "Chat Error"
+#~ msgstr ""
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC ͣ"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "޷дļͷ"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "ڵ¼"
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "ߡ¼"
+
+#, fuzzy
+#~ msgid "Away."
+#~ msgstr "ʱ뿪"
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "޷ Gaim С!"
+
+#~ msgid "About..."
+#~ msgstr "ڡ"
+
+#, fuzzy
+#~ msgid "Message Error"
+#~ msgstr "Ϣ"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "ʱ"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - "
+
+#, fuzzy
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "ܶļ %s"
+
+# #: src/gaimrc.c:1137
+# #, c-format
+# msgid "Could not open config file %s."
+# msgstr "޷ļ"
+#~ msgid "Preferences Error"
+#~ msgstr "ѡ"
+
+#~ msgid "Plugin Error"
+#~ msgstr ""
+
+#~ msgid "Login Error"
+#~ msgstr "¼"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl ű"
+
+#~ msgid "Select"
+#~ msgstr "ѡ"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "¼Զʾб"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr " applet ʾб"
+
+#~ msgid "Edit"
+#~ msgstr "༭"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Э"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Э鶯"
+
+#~ msgid "Disconnect"
+#~ msgstr "Ͽ"
+
+#, fuzzy
+#~ msgid "Warned"
+#~ msgstr ""
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "ʾͼ"
 
-#~ msgid "General Options"
-#~ msgstr "һѡ"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "û⣬е趨Ч"
 
@@ -3604,9 +3994,6 @@
 #~ "for details."
 #~ msgstr "еЭ鶼ʹЩã README ļ"
 
-#~ msgid "Proxy Type"
-#~ msgstr ""
-
 #~ msgid "No Proxy"
 #~ msgstr "޴"
 
@@ -3617,9 +4004,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "бѡ"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "б"
-
 #, fuzzy
 #~ msgid "Tab Placement:"
 #~ msgstr "Իҳλ"
@@ -3627,15 +4011,6 @@
 #~ msgid "Top"
 #~ msgstr ""
 
-#~ msgid "Bottom"
-#~ msgstr "׶"
-
-#~ msgid "Group Displays"
-#~ msgstr "ʾ"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "бʾ"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Իѡ"
 
@@ -3678,18 +4053,12 @@
 #~ msgid "Right"
 #~ msgstr "ұ"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "ͼ"
-
 #~ msgid "Chat Options"
 #~ msgstr "ѡ"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "һҳʾжԻ"
 
-#~ msgid "Tab Completion"
-#~ msgstr "TAB Զȫ"
-
 #~ msgid "Font Options"
 #~ msgstr "ѡ"
 
@@ -3702,13 +4071,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "ֵС"
 
-#~ msgid "Sound Options"
-#~ msgstr "ѡ"
-
-#, fuzzy
-#~ msgid "Sound method"
-#~ msgstr ""
-
 #, fuzzy
 #~ msgid "Sound played when:"
 #~ msgstr ""
@@ -3722,9 +4084,6 @@
 #~ msgid "minutes using"
 #~ msgstr "ʱʹ"
 
-#~ msgid "Messages"
-#~ msgstr "Ϣ"
-
 #~ msgid "Make Away"
 #~ msgstr "趨Ϊʱ뿪"
 
@@ -3773,9 +4132,6 @@
 #~ msgid "Napster registration is currently under development"
 #~ msgstr "Napster עṦڿ, δʵ"
 
-#~ msgid "file not found: %s\n"
-#~ msgstr "Ҳļ %s\n"
-
 #~ msgid "by Email"
 #~ msgstr "ʹõʼ"
 
@@ -3872,12 +4228,6 @@
 #~ msgid "Gaim - Export Buddy List"
 #~ msgstr "Gaim - б"
 
-#~ msgid "couldn't resolve host"
-#~ msgstr "ܽ\n"
-
-#~ msgid "Browser Options"
-#~ msgstr "ѡ"
-
 #~ msgid "Logging Options"
 #~ msgstr "ӵ %s\n"
 
@@ -4004,9 +4354,6 @@
 #~ msgid "Remove buddy from permit/deny"
 #~ msgstr "ij˴ܾɾ"
 
-#~ msgid "Idle"
-#~ msgstr "ת"
-
 #~ msgid "Raise chat windows when people speak"
 #~ msgstr "˵ʱ촰"
 
--- a/po/zh_TW.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/zh_TW.po	Tue Aug 27 02:43:54 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-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"
@@ -27,9 +27,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "關閉"
 
@@ -41,16 +41,17 @@
 msgid "Refresh"
 msgstr "更新"
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "增加"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "移除"
 
@@ -74,6 +75,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -90,7 +92,7 @@
 msgid "Change"
 msgstr "變更"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr ""
 
@@ -98,8 +100,8 @@
 msgid "Available for friends only"
 msgstr "只有好友可以看到我上線"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "離開"
 
@@ -115,7 +117,7 @@
 msgid "Invisible for friends only"
 msgstr "隱身(只好好友可以看到我)"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr ""
 
@@ -147,7 +149,7 @@
 msgid "Unknown Error Code."
 msgstr "未知的錯誤代碼。"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "狀態:%s"
@@ -217,16 +219,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu 錯誤"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "無法取得搜尋結果"
@@ -272,104 +264,151 @@
 msgid "Sex"
 msgstr "性別"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "城市"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "對不起,伺服器上並沒有儲存任何的好友名單!"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "無法自伺服器上取得好友名單"
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "成功的將好朋名單傳送到伺服器上"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Gadu-Gadu 資訊"
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "無法傳送好朋名單到伺服器上"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "成功的將好友名單自伺服器上刪除"
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "無法刪除在伺服器上的好友名單"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "密碼修改成功"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "密碼無法修改"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "無法送出 HTTP 要求"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "自伺服器上匯入好友名單失敗(%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "匯出好友名單到伺服器上失敗(%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "刪除伺服器上的好友名單失敗(%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "連線到搜尋服務失敗(%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "修改密碼失敗(%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "無法自伺服器上取得好友名單"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "無法開啟直接的即時訊息"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "無法送出密碼"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "目錄搜尋"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "自伺服器上匯入好友名單"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "匯出好友名單到伺服器上"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "將伺服器上的好友名單刪除"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "無法讀取檔案 %s。"
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "透過伺服器傳送訊息"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "取得資訊"
@@ -385,20 +424,16 @@
 msgstr "<B>%s 把聊天主題修改為:%s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "沒有那個暱稱或頻道"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "IRC 錯誤"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "沒有那部伺服器"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "沒有給定暱名"
 
 #: src/protocols/irc/irc.c:976
@@ -413,8 +448,8 @@
 msgstr "無法寫入"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "%s 正在呼叫您:%s"
 
 #: src/protocols/irc/irc.c:1076
@@ -427,10 +462,6 @@
 msgid "You have left %s"
 msgstr "您離開了 %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr ""
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Channel:"
@@ -444,245 +475,270 @@
 msgstr "DCC 聊天"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
+#, fuzzy
+msgid "Unable to change password."
+msgstr "無法送出密碼"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
-msgid "Password Change Error!"
-msgstr "密碼修改錯誤!"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "無法送出密碼"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr "未知"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "上線"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Jabber 錯誤"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr "錯誤 %s:%s"
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 msgid "Unknown Error in presence"
 msgstr "未知的錯誤發生。"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他們的好友清單中。"
 
-#: src/protocols/jabber/jabber.c:1655
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "沒有這個使用者"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-msgid "Jabber Error"
-msgstr "Jabber 錯誤"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "未知的登入錯誤"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 msgid "Password successfully changed."
 msgstr "密碼修改成功。"
 
-#: src/protocols/jabber/jabber.c:2035
-msgid "Password Change"
-msgstr "修改密碼"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "失去連線"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "連線成功"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "要求認證的方式"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-msgid "Invalid Jabber I.D."
-msgstr "無效的 Jabber 名稱"
-
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
+msgid "Jabber Error"
+msgstr "Jabber 錯誤"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "聊天室:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "伺服器:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "無法連線"
+
+#: src/protocols/jabber/jabber.c:2718
 msgid "Chats"
 msgstr "聊天"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 msgid "View Error Msg"
 msgstr "觀看錯誤訊息"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "跳出通知"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "給予一個名字"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "其他地址"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "郵遞區號"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "國家"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "電話"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "電子郵件"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "組織名稱"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "組織單位"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "離開原因的標題"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可"
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "使用者識別"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 編輯 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "伺服器註冊成功!"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "未知的註冊錯誤"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -834,107 +890,124 @@
 msgid "Unknown Error Code"
 msgstr "未知的錯誤代碼"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "MSN 錯誤"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+#, fuzzy
+msgid "An MSN message may not have been received."
 msgstr "有個訊息可能沒被收到。"
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim 無法送出訊息"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "使用者 %s(%s)想要將 %s 加入他(她)的好友清單。"
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "使用者 %s(%s)想要將您加入他們的好友清單"
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 msgid "Unable to send password"
 msgstr "無法送出密碼"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 msgid "Unable to write to server"
 msgstr "無法寫入到伺服器"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 msgid "Synching with server"
 msgstr "伺服器同步"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr "去吃午飯了"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 msgid "Set Friendly Name"
 msgstr "設定好友名稱"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 msgid "Set Friendly Name:"
 msgstr "設定好友名稱:"
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
-msgstr "無效的名稱"
-
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
+msgstr "無效的使用者名稱"
+
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "加入群組:"
@@ -967,60 +1040,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "聊天錯誤!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "這個交談目前並不存在"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - 聊天"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "送出密碼,等待回應\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "內部連結錯誤\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "登出。\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "連線建立,送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -1028,24 +1096,47 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "您所使用的 Client 端程式太過老舊。請更新到"
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "認證失敗"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim 無法送出訊息"
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "Gaim 無法送出訊息"
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1055,119 +1146,107 @@
 "使用者 %lu 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ 拒絕認證"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, 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 "Gaim - ICQ 許可認證"
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為那是無效的。"
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為那是無效的。"
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息太大了。"
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息太大了。"
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為訊息的發送速率到了上限。"
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為訊息的發送速率到了上限。"
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這些訊息可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "您因為不明的原因,而遺失了由 %2$s 送來的 %1$d 個訊息。"
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "您因為不明的原因,而遺失了由 %2$s 送來的 %1$d 個訊息。"
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - 錯誤"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>狀態:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>狀態:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Oscar SNAC 錯誤"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "您要送給 %s 的訊息無法送出:%s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "原因不明"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "沒有給予原因。"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "使用者 %s 的個人資訊並不存在:%s"
@@ -1272,47 +1351,85 @@
 msgstr "<i>未提供任何信息</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "您可能斷線了。"
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOL 錯誤"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr "訊息並未送出,因為您已經達到發送訊息速率的上限。請等待十秒後再試一次。"
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "錯誤"
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr "Gaim - ICQ 拒絕認證"
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr "Gaim - ICQ 許可認證"
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "無法讀取檔案 %s。"
+
+#: src/protocols/oscar/oscar.c:2792
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim 無法送出訊息"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-msgid "Gaim - Warning"
-msgstr "Gaim - 警告"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "交換:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1322,7 +1439,7 @@
 "您選擇和 %s 開啟一個即時訊息。這樣子的做法會讓對方知道您的 IP 位址,同時存在"
 "著系統安全上的顧慮。您確定要繼續嗎?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1331,7 +1448,7 @@
 "<B>UIN:</B> %s<BR><B>狀態:</B> %s<BR><HR><BR><I>遠方的客戶端不支援狀態訊息的"
 "傳送。</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1340,15 +1457,15 @@
 "<B>UIN:</B> %s<BR><B>狀態:</B> %s<BR><HR><BR><I>使用都沒有設定狀態訊息。</"
 "I><BR>"
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "直接消息"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "取得相容性資訊"
 
@@ -1480,48 +1597,42 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "TOC 恢复"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "聊天發生錯誤"
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - 修改密碼"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC 暫停"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "無法開啟傳輸的連線!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "無法開啟傳輸的連線!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "無法寫入檔頭!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1543,22 +1654,23 @@
 msgstr "%s 要求您傳送檔案給他們。"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "您的訊息並沒有被送出。"
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "類別:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr ""
 
@@ -1586,7 +1698,7 @@
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 
 #: src/about.c:147
@@ -1610,6 +1722,9 @@
 "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 "網址"
@@ -1619,12 +1734,9 @@
 msgstr "登出"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
-msgstr ""
-
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "登入錯誤"
+#, fuzzy
+msgid "Please enter your login."
+msgstr "請輸入您的密碼"
 
 #: src/aim.c:260
 msgid "Gaim - Login"
@@ -1666,39 +1778,10 @@
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 msgid "Auto-login"
 msgstr "自動登入"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "正在嘗試登入…"
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "斷線。點選以帶出登入視窗。"
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "離開:%d 等待。"
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "離開。"
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "新的離開訊息"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "無法建立 Gaim 小程式!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "關於…"
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - 離開!"
@@ -1711,6 +1794,10 @@
 msgid "Back"
 msgstr "返回"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "新的離開訊息"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "移除離開訊息"
@@ -1719,7 +1806,7 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "群組"
 
@@ -1729,12 +1816,13 @@
 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:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "訊息內容"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "別名"
 
@@ -1754,10 +1842,6 @@
 msgid "Un-Alias"
 msgstr "取消別名"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "好友狀態捕捉"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
@@ -1814,7 +1898,7 @@
 msgid "Information on selected Buddy"
 msgstr "顯示被選取好友的資訊"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "送出即時訊息"
 
@@ -1842,7 +1926,7 @@
 msgid "New Instant Message"
 msgstr "新的即時訊息"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
@@ -1854,6 +1938,10 @@
 msgid "Tools"
 msgstr "工具"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "好友狀態捕捉"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Protocol 相關設定"
@@ -1898,7 +1986,7 @@
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -1931,12 +2019,12 @@
 msgstr "加入聊天為:"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "取消"
 
@@ -1949,7 +2037,7 @@
 msgid "Invite"
 msgstr "邀請"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "好友"
 
@@ -1965,10 +2053,11 @@
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "忽略使用者"
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, fuzzy, c-format
@@ -2017,15 +2106,15 @@
 msgstr "悄悄話"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "送出"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "堵住他的嘴!"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "警告"
@@ -2039,16 +2128,14 @@
 msgstr "Gaim - 加入影像"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "無法送出訊息:太大了"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "訊息錯誤"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "無法送出訊息:未知原因"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "無法送出訊息:太大了"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2060,156 +2147,156 @@
 msgid "Setting position to %d\n"
 msgstr ""
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "粗體文字"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "粗體"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "斜體文字"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "斜體"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "底線文字"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "底線"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "刪除的文字"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "刪除"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "縮小字體"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "小"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "正常字體大小"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "正常"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "增大字體"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "大"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "字型"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "文字顏色"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "顏色"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "背景顏色"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "連結"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "加入一個笑臉"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "微笑"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "加入即時訊息影像"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr "影像"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "開始記錄日誌"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "登入中"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "儲存交談內容"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "儲存"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "音效"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - 交談"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "送出訊息為:"
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 儲存圖示"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "關閉動畫"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "開啟動畫"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "儲存圖示為…"
 
@@ -2253,384 +2340,405 @@
 "您正試著將 '%s'  從您的好友清單\n"
 "中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "接受"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "確定"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - 即時訊息使用者"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "將即時訊息送給:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "使用者:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 取得使用者資訊"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - 加入群組"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 新增好友"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "連絡"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "增加到"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - 離開!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "允許下列的使用者和我聯絡"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "允許清單"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "拒絕所有使用者"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "拒絕以下的使用者"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "拒絕清單"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友來進行狀態捕捉。"
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "好友狀態捕捉錯誤"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - 新增好友狀態捕捉"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "要捕捉誰的狀態"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "帳號"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "好友登入"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "好友暫離"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "好友回來"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "當好友正在發訊息給你時"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "對應的動作"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "開啟即時訊息視窗"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "跳出通知"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "執行指令"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "播放音效"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "儲存設定(這樣才能在每次事件發生時發生作用)"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 設定目錄資訊"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "目錄資訊"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允許在 Web 搜尋來檢視您的個人資訊"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "名"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr ""
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "姓"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr ""
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "省"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "新密碼並不相符"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - 修改密碼錯誤"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "把所有的表格都填了"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "舊密碼"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - 修改密碼"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "舊密碼"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "新密碼"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 設定使用者資訊"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "以下是您所做查詢的結果:"
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "許可"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "拒絕"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - 加入許可"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - 增加禁止人"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - 記錄交談"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "找尋好友"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 以資訊找尋好友"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - 以 Email 來找尋好友"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - 增加 URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "匯入到:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 匯入好友名單"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "您不能建立一個沒有原因的離開訊息"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - 新的離開訊息"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "使用"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 為好友加上別名"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "無法連到伺服器"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - 儲存日誌檔"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "無法刪除檔案 %s - %s"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "真的要清除日誌嗎?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "無法開啟設定檔 %s。"
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "真的要清除日誌嗎?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "確定"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "交談"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - 修改群組名稱"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "新名字:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - 修改好友名稱"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "修改好友名稱"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - 選擇 Perl 命令稿"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "無法開啟設定檔 %s。"
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "偏好設定錯誤"
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2640,9 +2748,10 @@
 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/module.c:106 src/module.c:112
+#, fuzzy
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim 無法送出訊息"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2656,7 +2765,7 @@
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "重置"
 
@@ -2697,17 +2806,22 @@
 msgstr "輸入密碼"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "登入錯誤"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Protocol 相關設定"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2715,40 +2829,40 @@
 "您無法使用這個帳號來登入;您可能沒有設定這個帳號所使用的 Protocol,或者這個 "
 "Protocol 並沒有提供登入的功能。"
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - 帳號管理"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "全部選取"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "選取自動登入"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "取消選取"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "修改"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "登入/登出"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "刪除"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2757,28 +2871,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s 無法登入"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "登入錯誤"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "通知"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s 已經登出"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perl 命令稿"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - 插件列表"
@@ -2787,10 +2901,12 @@
 msgid "Gaim - Plugins"
 msgstr "Gaim - 插件"
 
+#. Left side: frame with list of plugin file names
 #: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "已載入的插件"
 
+#. Right side: frame with description and the filepath of plugin
 #: src/plugins.c:265
 #, fuzzy
 msgid "Selected Plugin"
@@ -2836,425 +2952,592 @@
 msgid "Close this window"
 msgstr "關閉這個視窗"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr "一般選項"
+
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:282
 #, fuzzy
-msgid "Windows"
-msgstr "即時訊息視窗"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "顯示除錯視窗"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "使用沒有邊框的按鈕"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "省"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "使用沒有邊框的按鈕"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "粗體"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "斜體"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "底線"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "刪除的文字"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "取消"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "加入一個笑臉"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "加入一個笑臉"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "選取"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "文字顏色"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "背景顏色"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "好友顯示"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "文字顏色"
+msgid "Show graphical _smileys"
+msgstr "顯示所有的笑臉圖示"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "顯示訊息時間"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "顯示 URL 為超連結"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "標示出錯誤的拼字"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "忽略顏色"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "背景顏色"
+msgid "Ignore font _faces"
+msgstr "忽略字型"
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "忽略字體大小"
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "忽略 Tik 自動訊息"
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "按下 Enter 送出訊息"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "按下 Ctrl-Enter 送出訊息"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "即時訊息視窗"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "按下 Escape 關閉視窗"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "按下 Ctrl-W 關閉視窗"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "按下 Ctrl-{B/I/U/S} 加入 HTML 標籤"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "按下 CTRL-(Number) 來加入一個笑臉"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "視窗下方"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "隱藏「即時訊息、資訊、聊天」按鍵"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "顯示所有的笑臉圖示"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "顯示訊息時間"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "在按鍵上顯示圖示"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "顯示 URL 為超連結"
+msgid "Buddy List Window"
+msgstr "好友名單視窗"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "標示出錯誤的拼字"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "保存視窗的大小和位置"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "當事件發生時,將視窗提到最上方"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "群組顯示"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "隱藏目前沒有線上好友的群組"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "顯示群組裡的好友數目"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "好友顯示"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "顯示好友類別圖示"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "顯示警告等級"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "忽略顏色"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "顯示閒置時間"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "忽略字型"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "忽略字體大小"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "忽略 Tik 自動訊息"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "按下 Enter 送出訊息"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "按下 Ctrl-Enter 送出訊息"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "把閒置的好友設為灰色"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "即時訊息視窗"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "新視窗寬度:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "新視窗高度:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "輸入欄位的高度:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "當事件發生時,將視窗提到最上方"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "送出訊息後關閉視穿"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "好友圖示"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "按下 Escape 關閉視窗"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "隱藏好友圖示"
 
 #: src/prefs.c:466
-msgid "Control-W closes window"
-msgstr "按下 Ctrl-W 關閉視窗"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "按下 Ctrl-{B/I/U/S} 加入 HTML 標籤"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "按下 CTRL-(Number) 來加入一個笑臉"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "隱藏「即時訊息、資訊、聊天」按鍵"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "在按鍵上顯示圖示"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "在登入時自動顯示好友名單"
+#, fuzzy
+msgid "Disable Buddy Icon A_nimation"
+msgstr "關閉好友圖示動畫"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "在視窗中顯示登入訊息"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "跳出通知"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "通知您的好友您正在發訊息給他們"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr ""
+
+#: src/prefs.c:505
+msgid "_Tab-Complete Nicks"
+msgstr ""
+
+#: src/prefs.c:506
+msgid "_Old-Style Tab Completion"
+msgstr ""
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
+#, fuzzy
+msgid "_Show people joining/leaving in window"
+msgstr "在視窗中顯示其他人進入或離開的事件"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "保存視窗的大小和位置"
-
-#: src/prefs.c:513
-#, fuzzy
-msgid "Raise Window on Events"
-msgstr "當事件發生時,將視窗提到最上方"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "隱藏目前沒有線上好友的群組"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "顯示群組裡的好友數目"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "顯示好友類別圖示"
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "顯示警告等級"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "顯示閒置時間"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "把閒置的好友設為灰色"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "新視窗寬度:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "新視窗高度:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "輸入欄位的高度:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "當事件發生時,將視窗提到最上方"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "送出訊息後關閉視穿"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "隱藏好友圖示"
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "關閉好友圖示動畫"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "在視窗中顯示登入訊息"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "通知您的好友您正在發訊息給他們"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
+msgid "Show a_liases in tabs/titles"
 msgstr ""
 
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "聊天"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "在視窗中顯示其他人進入或離開的事件"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
-msgstr ""
-
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
-
-#: src/prefs.c:675
-msgid "Show aliases in tabs/titles"
-msgstr ""
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "好友清單"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "代理伺服器型態"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "主機位址"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "端口"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "使用者"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "密碼"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "代理伺服器選項"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "預設為彈出個一新的視窗"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "訊息"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "記錄所有的交談內容"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "將交談記錄中的 HTML 標籤去除"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "觀看系統日誌"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入/登出"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置/取消閒置"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開/回來"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入/閒置/離開等狀態"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "使用個別的檔案來記錄每一個好友的登入"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "音效選項"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "當登入時不啟動音效"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "離開時發出音效"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "聲音模式"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "音效指令\n"
 "(%s for filename)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "送出訊息時取消離開狀態"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "在離開時,忽略新的交談"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "不要送出自動回應"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "不要送出自動回應"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "閒置時間:"
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "離開"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - 音效設定"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "測試"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "選擇…"
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "編輯"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "編輯"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 msgid "Interface"
 msgstr ""
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "字型"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "訊息送出"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "即時訊息視窗"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "群組聊天視窗"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "音效"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "音效"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "離開原因:"
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - 偏好設定"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim 除錯視窗"
 
 #: src/prpl.c:70
+msgid "Incompatible protocol detected."
+msgstr ""
+
+#: src/prpl.c:71
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
@@ -3262,11 +3545,11 @@
 "say, it was not successfully loaded."
 msgstr ""
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "通訊協定錯誤"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3274,42 +3557,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Protocol 相關設定"
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr ""
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr "中止連線"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "接受?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - 提示"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - 新郵件"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "開啟郵件"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 msgid ""
 "\n"
 "\n"
@@ -3319,21 +3593,21 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "您的系統中並未存在任何可供您註冊一個新帳號的通訊協定。"
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - 註冊"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "註冊資訊"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "註冊"
 
@@ -3350,10 +3624,6 @@
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "警告"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Yes"
@@ -3406,12 +3676,160 @@
 msgid "Someone says your name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gadu-Gadu 錯誤"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Gadu-Gadu 資訊"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "無法送出 HTTP 要求"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "自伺服器上匯入好友名單失敗(%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "匯出好友名單到伺服器上失敗(%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "刪除伺服器上的好友名單失敗(%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "連線到搜尋服務失敗(%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "修改密碼失敗(%s)"
+
+#~ msgid "No such nick/channel"
+#~ msgstr "沒有那個暱稱或頻道"
+
+#~ msgid "IRC Error"
+#~ msgstr "IRC 錯誤"
+
+#~ msgid "No such server"
+#~ msgstr "沒有那部伺服器"
+
+#~ msgid "Password Change Error!"
+#~ msgstr "密碼修改錯誤!"
+
+#~ msgid "Password Change"
+#~ msgstr "修改密碼"
+
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "無效的 Jabber 名稱"
+
+#~ msgid "MSN Error"
+#~ msgstr "MSN 錯誤"
+
+#~ msgid "Invalid name"
+#~ msgstr "無效的名稱"
+
+#~ msgid "Chat Error!"
+#~ msgstr "聊天錯誤!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - 聊天"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - 錯誤"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Oscar SNAC 錯誤"
+
+#~ msgid "Reason unknown"
+#~ msgstr "原因不明"
+
+#~ msgid "AOL error"
+#~ msgstr "AOL 錯誤"
+
+#~ msgid "Error"
+#~ msgstr "錯誤"
+
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - 警告"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC 恢复"
+
+#~ msgid "Chat Error"
+#~ msgstr "聊天發生錯誤"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC 暫停"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "無法寫入檔頭!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "正在嘗試登入…"
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "斷線。點選以帶出登入視窗。"
+
+#~ msgid "Away: %d pending."
+#~ msgstr "離開:%d 等待。"
+
+#~ msgid "Away."
+#~ msgstr "離開。"
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "無法建立 Gaim 小程式!"
+
+#~ msgid "About..."
+#~ msgstr "關於…"
+
+#~ msgid "Message Error"
+#~ msgstr "訊息錯誤"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "無法送出訊息:未知原因"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "好友狀態捕捉錯誤"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - 修改密碼錯誤"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "無法刪除檔案 %s - %s"
+
+#~ msgid "Preferences Error"
+#~ msgstr "偏好設定錯誤"
+
+#~ msgid "Plugin Error"
+#~ msgstr "插件錯誤"
+
+#~ msgid "Login Error"
+#~ msgstr "登入錯誤"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl 命令稿"
+
+#~ msgid "Select"
+#~ msgstr "選取"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "在登入時自動顯示好友名單"
+
+#~ msgid "Edit"
+#~ msgstr "編輯"
+
+#~ msgid "Protocol Error"
+#~ msgstr "通訊協定錯誤"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Protocol 相關設定"
+
+#~ msgid "Disconnect"
+#~ msgstr "中止連線"
+
+#~ msgid "Warned"
+#~ msgstr "警告"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "顯示好友狀態走馬燈"
 
-#~ msgid "General Options"
-#~ msgstr "一般選項"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "所有的選項將在設定後馬上生效。"
 
@@ -3451,9 +3869,6 @@
 #~ msgid "Manual (%s for URL)"
 #~ msgstr "使用者自定(%s for URL)"
 
-#~ msgid "Proxy Options"
-#~ msgstr "代理伺服器選項"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3461,9 +3876,6 @@
 #~ "並不是所有的通訊協定都可以使用這些代理伺服器的選項。\n"
 #~ "請參考 README 來獲得更進一步的資訊。"
 
-#~ msgid "Proxy Type"
-#~ msgstr "代理伺服器型態"
-
 #~ msgid "No Proxy"
 #~ msgstr "沒有代理伺服器"
 
@@ -3479,24 +3891,12 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "好友名單選項"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "好友名單視窗"
-
 #~ msgid "Tab Placement:"
 #~ msgstr "Tab 位置:"
 
 #~ msgid "Top"
 #~ msgstr "視窗上方"
 
-#~ msgid "Bottom"
-#~ msgstr "視窗下方"
-
-#~ msgid "Group Displays"
-#~ msgstr "群組顯示"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "好友顯示"
-
 #~ msgid "Conversation Options"
 #~ msgstr "交談選項"
 
@@ -3539,9 +3939,6 @@
 #~ msgid "Right"
 #~ msgstr "視窗右側"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "好友圖示"
-
 #~ msgid "Chat Options"
 #~ msgstr "聊天選項"
 
@@ -3560,12 +3957,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "文字的字體大小"
 
-#~ msgid "Sound Options"
-#~ msgstr "音效選項"
-
-#~ msgid "Sound method"
-#~ msgstr "聲音模式"
-
 #~ msgid "Sound played when:"
 #~ msgstr "播放音效,當:"
 
@@ -3578,9 +3969,6 @@
 #~ msgid "minutes using"
 #~ msgstr "使用的分鐘數"
 
-#~ msgid "Messages"
-#~ msgstr "訊息"
-
 #~ msgid "Make Away"
 #~ msgstr "設定為離開狀態"