changeset 3388:83314a9985ef

[gaim-migrate @ 3407] Here it is. Added gettext 0.11.x support! It should work fine, but please let me know if anything is broken in 0.10.x or 0.11.x (in my tests, it all worked fine) committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Thu, 08 Aug 2002 18:11:17 +0000
parents c434f13dfa9b
children 7cd904828d3d
files ChangeLog Makefile.am autogen.sh config.rpath intl/.cvsignore po/.cvsignore 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 23 files changed, 21006 insertions(+), 19049 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 08 17:42:08 2002 +0000
+++ b/ChangeLog	Thu Aug 08 18:11:17 2002 +0000
@@ -32,6 +32,7 @@
 	  Etan Reisner)
 	* TOC no longer compiles statically by default--use OSCAR
 	* ICQ plugin no longer gets built--use OSCAR
+	* Added support for gettext 0.11.x.
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)
--- a/Makefile.am	Thu Aug 08 17:42:08 2002 +0000
+++ b/Makefile.am	Thu Aug 08 18:11:17 2002 +0000
@@ -1,5 +1,5 @@
 
-EXTRA_DIST = gaim.spec.in gaim_applet.gnorba gaim.desktop gaim_applet.desktop \
+EXTRA_DIST = config.rpath gaim.spec.in gaim_applet.gnorba gaim.desktop gaim_applet.desktop \
 	HACKING gaim2blt.pl licq2gaim.pl
 
 if DISTRIB
--- a/autogen.sh	Thu Aug 08 17:42:08 2002 +0000
+++ b/autogen.sh	Thu Aug 08 18:11:17 2002 +0000
@@ -1,5 +1,15 @@
 #!/bin/sh
 
+abort() {
+	# Don't break the tree if something goes wrong.
+	if [ -e m4~ ]; then
+		rm -rf m4
+		mv m4~ m4
+	fi
+
+	exit 1
+}
+
 (gettextize --version) < /dev/null > /dev/null 2>&1 || {
 	echo;
 	echo "You must have gettext installed to compile Gaim";
@@ -42,7 +52,26 @@
 echo;
 
 echo "Running gettextize, please ignore non-fatal messages...."
-echo n | gettextize --copy --force || exit;
+
+# Get the major version of gettext.
+GETTEXT_VER=`gettextize --version | sed -n 's/^.*[0-9]\+\.\([0-9]\+\)\..*$/\1/p'`
+
+# Decide how we want to run gettext.
+if [ $GETTEXT_VER -eq 11 ]; then
+	mv -f m4 m4~
+
+	echo n | gettextize --copy --force --intl --no-changelog || abort
+
+	# Now restore the things that brain-dead gettext modified.
+	[ -e configure.in~ ] && mv -f configure.in~ configure.in
+	[ -e Makefile.am~ ]  && mv -f Makefile.am~  Makefile.am
+	rm -rf m4
+	mv -f m4~ m4
+
+	mv -f po/Makevars.template po/Makevars
+else
+	echo n | gettextize --copy --force || exit;
+fi
 echo "Running libtoolize, please ignore non-fatal messages...."
 echo n | libtoolize --copy --force || exit;
 
--- a/intl/.cvsignore	Thu Aug 08 17:42:08 2002 +0000
+++ b/intl/.cvsignore	Thu Aug 08 18:11:17 2002 +0000
@@ -10,11 +10,13 @@
 dcngettext.c
 dgettext.c
 dngettext.c
+eval-plural.h
 explodename.c
 finddomain.c
 gettext.c
 gettext.h
 gettextP.h
+gmo.h
 hash-string.h
 intl-compat.c
 l10nflist.c
@@ -25,8 +27,14 @@
 localcharset.c
 locale.alias
 localealias.c
+localename.c
 ngettext.c
+os2compat.c
+os2compat.h
+osdep.c
 plural.y
+plural-exp.c
+plural-exp.h
 ref-add.sin
 ref-del.sin
 textdomain.c
--- a/po/.cvsignore	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/.cvsignore	Thu Aug 08 18:11:17 2002 +0000
@@ -3,24 +3,12 @@
 Makefile.in.in
 ChangeLog
 POTFILES
+Rules-quot
 cat-id-tbl.c
-de.gmo
-fr.gmo
 stamp-cat-id
 gaim.pot
-es.gmo
-zh_CN.gmo
-ko.gmo
-ru.gmo
-pl.gmo
-nl.gmo
-sv.gmo
-sk.gmo
-fi.gmo
-it.gmo
-da.gmo
-ja.gmo
-bg.gmo
-hu.gmo
-zh_TW.gmo
-cs.gmo
+*.gmo
+Makevars
+*.sed
+*.header
+*.sin
--- a/po/bg.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/bg.po	Thu Aug 08 18:11:17 2002 +0000
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"Project-Id-Version: Gaim 0.60\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -24,11 +24,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim - "
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr ""
 
@@ -41,17 +41,16 @@
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr ""
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr ""
 
@@ -75,7 +74,6 @@
 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 +92,7 @@
 msgid "Change"
 msgstr ":"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 #, fuzzy
 msgid "Available"
 msgstr ""
@@ -103,8 +101,8 @@
 msgid "Available for friends only"
 msgstr ""
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr ""
 
@@ -121,7 +119,7 @@
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr ""
 
@@ -153,7 +151,7 @@
 msgid "Unknown Error Code."
 msgstr "   ."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -278,8 +276,7 @@
 msgid "Sex"
 msgstr ""
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr ""
 
@@ -353,12 +350,9 @@
 msgid "Directory Search"
 msgstr "  "
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: 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
 msgid "Change Password"
 msgstr "  "
 
@@ -379,7 +373,7 @@
 msgstr "    "
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr ""
@@ -445,7 +439,7 @@
 msgid "Channel:"
 msgstr ":"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr ""
 
@@ -453,244 +447,254 @@
 msgid "DCC Chat"
 msgstr "DCC "
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
 msgid "Password Change Error!"
 msgstr "Gaim -   "
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr ""
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "   ."
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr " %d      "
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 msgid "No such user"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
+#: src/protocols/jabber/jabber.c:2681
 msgid "Jabber Error"
 msgstr "Jabber "
 
-#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim -   "
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "   "
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 #, fuzzy
 msgid "Invalid Jabber I.D."
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr "??:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr ""
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr " away "
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "  "
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "??"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr " "
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr ""
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "-"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "  "
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 "  -  .    "
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim -   Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "   !"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr " "
 
@@ -859,8 +863,8 @@
 msgstr "   ."
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -868,106 +872,106 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim     "
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "%s%s%s%s  %s   %s%s%s"
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 msgid "You have been disconnected. You have signed on from another location."
 msgstr " .     ."
 
-#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "    socket."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "     socket"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr ":"
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "      ."
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr ":"
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "  :"
@@ -1045,17 +1049,14 @@
 msgid "Connection established, cookie sent"
 msgstr " ,   cookie"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "   ."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "    ."
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1064,7 +1065,6 @@
 "   .  10    . "
 "  ,      ."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "     .  ."
@@ -1077,7 +1077,7 @@
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "   %s "
@@ -1170,9 +1170,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr " %d   %s   ."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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 - "
 
@@ -1209,68 +1209,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "   %s : %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr ""
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "IM "
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr " "
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr " "
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr " "
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr " "
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "AP "
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "  ICQ Server"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ICQ "
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr " Trillian"
 
@@ -1330,35 +1330,35 @@
 "         . "
 "  10 ."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 #, fuzzy
 msgid "Gaim - Warning"
 msgstr "   ?"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "     "
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1368,30 +1368,30 @@
 "      %s.       IP- "
 ".     .    ."
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 #, fuzzy
 msgid "Get Status Msg"
 msgstr " away "
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr " "
 
@@ -1535,7 +1535,7 @@
 msgid "Password Change Successful"
 msgstr "   "
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim -   "
 
@@ -1668,14 +1668,11 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer ( )   [ markster@marko.net ]"
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr " "
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr ""
 
@@ -1683,7 +1680,7 @@
 msgid "Please enter your logon"
 msgstr "   "
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "  "
 
@@ -1699,11 +1696,11 @@
 msgid "Password: "
 msgstr ":"
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "  Gaim"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr ""
 
@@ -1715,19 +1712,19 @@
 msgid "About"
 msgstr ""
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr ""
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr ""
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr " "
@@ -1781,74 +1778,73 @@
 msgid "Set All Away"
 msgstr " -> "
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr ""
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr ""
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr ""
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr ""
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr ""
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "  "
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr ": %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1859,127 +1855,131 @@
 ": %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr ":"
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s ."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s ."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr ""
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr " "
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr ""
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "    "
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr ""
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr ""
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "  "
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr " "
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr ""
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "  "
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "  "
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr ""
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr " "
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr " "
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "  "
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr " "
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr ""
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr " Debug "
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr " Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr ""
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr ""
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr " "
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "  "
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr ""
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - "
 
@@ -1991,13 +1991,13 @@
 msgid "Join Chat As:"
 msgstr "   :"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr ""
 
@@ -2005,16 +2005,16 @@
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr ""
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr ""
 
@@ -2022,68 +2022,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim -     "
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "-"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr ""
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s  "
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s   "
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s    %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s   (%s)."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s  ."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim -  "
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr ":"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "0   "
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr ""
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr ""
 
@@ -2117,187 +2116,187 @@
 msgid "Setting position to %d\n"
 msgstr "  %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr ""
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr ""
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr ""
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr ""
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr ""
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "  "
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "  "
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "   "
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "  "
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr ""
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "  "
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr ""
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "  "
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr " "
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "  "
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "  "
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "  "
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "  "
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "  e"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "  "
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr " :"
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim -   "
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "  "
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "  "
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "  "
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "   ..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "   ?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "     %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr " ?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "   -."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "  '%s'  .\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim -   %s?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2306,362 +2305,382 @@
 "  '%s'  .\n"
 "  ?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr ""
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr " :"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr ":"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr ""
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr ""
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr " "
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr " "
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr ""
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr " "
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - !"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr " :"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "o "
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "    "
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr " "
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr " "
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "  -"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr " "
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "   "
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "  "
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim -  "
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr " "
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr ""
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr " "
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "  "
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "    "
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "    "
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "    "
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "   "
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "  "
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "  "
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr ""
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "    "
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "    "
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "  "
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "P        ."
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr ""
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr " "
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr " "
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr " "
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr ""
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "  "
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim -     "
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "  "
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr " "
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr " "
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "  ()"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "  "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr ""
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr ""
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim -   Email"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr " "
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr " :"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim -   "
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "      "
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "     "
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim -    "
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "   "
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "  "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "  "
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr ""
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim -    "
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "      %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "  -?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr ""
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr ""
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr " :"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr ""
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim -   Perl "
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "       %s."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "  "
 
@@ -2691,7 +2710,7 @@
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr ""
 
@@ -2732,7 +2751,18 @@
 msgid "Enter Password"
 msgstr ""
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2740,44 +2770,40 @@
 "      .    ,    "
 "  "
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "  "
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "      %s?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim -   "
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr ""
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "  "
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "o"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "/"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2786,21 +2812,21 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s    "
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s "
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr "  "
 
@@ -2808,554 +2834,361 @@
 msgid "Perl Scripts"
 msgstr "Perl "
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim -  "
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - "
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr " "
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr ""
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr ":"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr ""
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "    "
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr ""
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "  "
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr ""
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "  "
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr ""
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "  "
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "  "
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr ""
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "   ,      ."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr ""
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "  "
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "  Ticker"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr " Debug "
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "   "
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "   "
-
-#: src/prefs.c:248
-msgid "None"
-msgstr " "
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "  Gaim"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "  X"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "  "
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr " HTML  "
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "   /"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "   /"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "    /"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "  //"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "       "
+#, fuzzy
+msgid "Windows"
+msgstr "  "
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr ""
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
+msgid "Show Buddy Ticker"
+msgstr "  Ticker"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr " Debug "
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr ""
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "  "
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "  "
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr ""
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "  "
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr ""
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "    "
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME URL "
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr ""
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr ""
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"      !\n"
-" README   ."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr " Proxy"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Proxy "
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr " "
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "  "
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr " "
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr " "
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "   "
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr " URL  "
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "  "
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr " "
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr " "
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "   "
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr ""
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr ""
-
-#: src/prefs.c:496
-msgid "User"
-msgstr ""
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr ""
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr " "
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "  "
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr "  :"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr ""
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr ""
-
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr " // "
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "     "
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "   "
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr " /  "
-
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr " / "
-
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr ""
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "    "
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "   "
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr " - "
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "  "
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "   "
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "   "
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr "  "
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr ""
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr ""
-
-#: src/prefs.c:683
+msgid "Ignore TiK Automated Messages"
+msgstr " TiK  "
+
+#: src/prefs.c:459
 msgid "Enter sends message"
 msgstr "Enter  "
 
-#: src/prefs.c:684
+#: src/prefs.c:460
 msgid "Control-Enter sends message"
 msgstr "Ctrl-Enter  "
 
-#: src/prefs.c:685
+#: src/prefs.c:469
 msgid "Escape closes window"
 msgstr "Esc  "
 
-#: src/prefs.c:686
+#: src/prefs.c:470
 #, fuzzy
 msgid "Control-W closes window"
 msgstr "Esc  "
 
-#: src/prefs.c:692
+#: src/prefs.c:480
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S}  HTML "
 
-#: src/prefs.c:693
+#: src/prefs.c:481
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl-()  "
 
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2    "
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "  "
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr " "
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "   "
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr " URL  "
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "  "
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "  "
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "    "
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr " "
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr " "
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "   "
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr " TiK  "
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "    "
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "?  ?"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "  "
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr " :"
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "  "
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr ""
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr ""
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "      "
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "-     "
-
-#: src/prefs.c:967 src/prefs.c:1119
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr " // "
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr " / "
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "     "
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "   "
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr " /  "
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "   "
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "    "
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "   "
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "  "
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "   "
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "   "
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr "  "
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "  "
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "  "
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "    "
+
+#: src/prefs.c:571 src/prefs.c:633
 msgid "Raise windows on events"
 msgstr "   "
 
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "   "
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "   /"
-
-#: src/prefs.c:970
+#: src/prefs.c:572
 msgid "Hide window on send"
 msgstr "    "
 
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "  "
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "  "
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "  "
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "    "
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "  "
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr ""
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr ""
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr ""
-
-#: src/prefs.c:1031
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "  "
 
-#: src/prefs.c:1037
+#: src/prefs.c:582
 msgid "Disable Buddy Icon Animation"
 msgstr "   "
 
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr ""
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "   "
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr "-     "
-
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "     "
-
-#: src/prefs.c:1120
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "   "
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "   "
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "Tab -  "
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "    "
+
+#: src/prefs.c:652
 msgid "Show people joining/leaving in window"
 msgstr " /    "
 
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr " "
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "Tab -  "
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "    "
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr ""
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr " "
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr ""
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "  "
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "    "
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim -  - "
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr ""
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr ""
-
-#: src/prefs.c:1649
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "-     "
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "   /"
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "-     "
+
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "-     "
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Proxy "
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr ""
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr ""
+
+#: src/prefs.c:801
+msgid "User"
+msgstr ""
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr ""
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "    "
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "  "
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr " HTML  "
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "   /"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "   /"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "    /"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "  //"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "       "
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "    "
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "  "
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr " "
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3364,106 +3197,125 @@
 " \n"
 "(%s  )"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr " :"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "  "
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "  "
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "    "
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "    "
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "  -"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "-   "
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr " /   ( ):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "  "
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr " "
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr ""
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim -  - "
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr ""
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr ""
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr " "
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr ""
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr " :"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "o "
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "    "
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr " "
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr " "
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "  -"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr " "
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr ":"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr ""
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr ""
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "  "
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "   "
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr ""
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr ""
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr ""
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr ""
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "  "
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "  "
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim debug"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr ""
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr ""
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr ""
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr ""
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr ""
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3478,37 +3330,50 @@
 msgid "Protocol Error"
 msgstr " "
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "  "
+
+#: src/prpl.c:101
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s  %s   . %s  ."
 
-#: src/prpl.c:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr ""
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "?Gaim - ?"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim -  "
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "? ?"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s  %s   %s%s%s"
 
-#: src/prpl.c:578
+#: src/prpl.c:586
 msgid ""
 "\n"
 "\n"
@@ -3518,21 +3383,21 @@
 "\n"
 "      ?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "         ."
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - "
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "??"
 
@@ -3540,28 +3405,28 @@
 msgid "Please enter your password"
 msgstr "  "
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d )"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 )"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr ""
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr ""
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr " "
 
@@ -3609,6 +3474,184 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "General Options"
+#~ msgstr ""
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr "   ,      ."
+
+#~ msgid "Miscellaneous"
+#~ msgstr ""
+
+#~ msgid "Report Idle Times"
+#~ msgstr "   "
+
+#~ msgid "None"
+#~ msgstr " "
+
+#~ msgid "Gaim Use"
+#~ msgstr "  Gaim"
+
+#~ msgid "X Use"
+#~ msgstr "  X"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URL "
+
+#~ msgid "Galeon"
+#~ msgstr ""
+
+#~ msgid "Proxy Options"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Not all protocols can use these proxy options. Please see the README file "
+#~ "for details."
+#~ msgstr ""
+#~ "      !\n"
+#~ " README   ."
+
+#~ msgid "Proxy Type"
+#~ msgstr " Proxy"
+
+#~ msgid "No Proxy"
+#~ msgstr " "
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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 ""
+
+#~ msgid "Keyboard Options"
+#~ msgstr ""
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2    "
+
+#~ msgid "Display and General Options"
+#~ msgstr "  "
+
+#~ msgid "IM Options"
+#~ msgstr "?  ?"
+
+#~ msgid "Show buttons as: "
+#~ msgstr " :"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "  "
+
+#~ msgid "Pictures"
+#~ msgstr ""
+
+#~ msgid "Text"
+#~ msgstr ""
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "      "
+
+#~ msgid "Window Sizes"
+#~ msgstr "  "
+
+#~ msgid "Tab Placement"
+#~ msgstr "  "
+
+#~ msgid "Left"
+#~ msgstr ""
+
+#~ msgid "Right"
+#~ msgstr ""
+
+#~ msgid "Buddy Icons"
+#~ msgstr ""
+
+#~ msgid "Chat Options"
+#~ msgstr ""
+
+#~ msgid "Show conversations in the same tabbed window"
+#~ msgstr "     "
+
+#~ msgid "Tab Completion"
+#~ msgstr " "
+
+#~ msgid "Font Options"
+#~ msgstr ""
+
+#~ msgid "Italic Text"
+#~ msgstr " "
+
+#~ msgid "Font Face for Text"
+#~ msgstr "  "
+
+#~ msgid "Font Size for Text"
+#~ msgstr "    "
+
+#~ msgid "Sound Options"
+#~ msgstr ""
+
+#~ msgid "Sound method"
+#~ msgstr " "
+
+#~ msgid "Sound played when:"
+#~ msgstr " :"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr " /   ( ):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "  "
+
+#~ msgid "minutes using"
+#~ msgstr " "
+
+#~ msgid "Messages"
+#~ msgstr ""
+
+#~ msgid "Make Away"
+#~ msgstr " "
+
+#~ msgid "Privacy Options"
+#~ msgstr ""
+
+#~ msgid "General"
+#~ msgstr ""
+
+#~ msgid "Conversations"
+#~ msgstr ""
+
 #~ msgid "Enable sounds"
 #~ msgstr "  "
 
--- a/po/cs.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/cs.po	Thu Aug 08 18:11:17 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -23,11 +23,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Zavt"
 
@@ -40,17 +40,16 @@
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "Pidat"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "Zruit"
 
@@ -74,7 +73,6 @@
 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 +91,7 @@
 msgid "Change"
 msgstr "Kanl:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Ptomen"
 
@@ -101,8 +99,8 @@
 msgid "Available for friends only"
 msgstr "Ptomen jen pro ptele"
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Pry"
 
@@ -118,7 +116,7 @@
 msgid "Invisible for friends only"
 msgstr "Neviditeln jen pro ptele"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "Nedostupn"
 
@@ -150,7 +148,7 @@
 msgid "Unknown Error Code."
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
@@ -279,8 +277,7 @@
 msgid "Sex"
 msgstr "Pohlav"
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Msto"
 
@@ -354,12 +351,9 @@
 msgid "Directory Search"
 msgstr "Prohledvn seznamu"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: src/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
 msgid "Change Password"
 msgstr "Zmnit heslo"
 
@@ -383,7 +377,7 @@
 msgstr "Poli zprvu pes server"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Zskej Info"
@@ -449,7 +443,7 @@
 msgid "Channel:"
 msgstr "Kanl:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -458,47 +452,47 @@
 msgid "DCC Chat"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: 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:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr "Neznm"
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "Pipojen"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr "Neruit"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -506,182 +500,192 @@
 "\n"
 "Pejete si pidat jeho nebo ji do Vaeho Buddy Listu?"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 #, fuzzy
 msgid "No such user"
 msgstr "dn uivatel"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: 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/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Kontakty"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autentifikace"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "Neznm chyba pi pihlaovn"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Heslo bylo spn zmnno"
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim - Zmna hesla"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "Spojen ztraceno"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "Nemu se pipojit"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "Pipojen"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "dm autentifikan metodu"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 #, fuzzy
 msgid "Connecting"
 msgstr "Spojuji"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: 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:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Mstnost:"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Zobrazit LOG"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "Zobrazit notifikaci"
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "Cel jmno"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "Jmno"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "Pjmen"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "Pezdvka"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Ulice"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 #, fuzzy
 msgid "Locality"
 msgstr "Lokalita"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "PS"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Stt"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 #, fuzzy
 msgid "Telephone"
 msgstr "telefon"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "Nzev organizace"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Nzev"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "Datum narozen"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Popis"
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 #, fuzzy
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
@@ -690,23 +694,23 @@
 "Vechny nsledujc daje jsou voliteln. Zadejte pouze ty informace kter "
 "chcete."
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Upravit Jaaber vizitku"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 #, fuzzy
 msgid "Set User Info"
 msgstr "Zskat informace o uivateli"
@@ -875,8 +879,8 @@
 msgstr "Neznmy chybov kd."
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -884,107 +888,107 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 #, fuzzy
 msgid "Gaim was unable to send a message"
 msgstr "Gaim nemohl odeslat zprvu"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "%s%s%s%s udlal %s jeho kamardem%s%s%s"
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 #, 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:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Chyba pri ten ze socketu."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Nemu st ze socketu"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "Heslo: "
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Nemu se pripojit na server."
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 msgid "Synching with server"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1920
-msgid "Away From Computer"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1921
-msgid "Be Right Back"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1922
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1923
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "Kamard"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "Skryj ikonu"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Pjmen"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "ID: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 msgid "Invalid name"
 msgstr "Nesprvne jmno"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Ke kter skupin pripojit:"
@@ -1063,18 +1067,15 @@
 msgid "Connection established, cookie sent"
 msgstr "Spojen vytvoeno, cookie poslno"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Nesprvne heslo alebo pezdvka."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 #, fuzzy
 msgid "Your account is currently suspended."
 msgstr "V et je momentln suspendovm"
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1084,7 +1085,6 @@
 "toznova. Jestli budete pokraovat v pipojovn, budete muset ekat jet "
 "dle."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
@@ -1098,7 +1098,7 @@
 msgid "Internal Error"
 msgstr "Vnitn chyba"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Pam IM spojen s %s vytvoeno"
@@ -1191,9 +1191,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Ztratil jste %d zprv z %s z neznmch dvod."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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"
 
@@ -1231,72 +1231,72 @@
 msgid "User information for %s unavailable: %s"
 msgstr "Informcie o uivateli %s nejsou pstupn: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "Kamardova ikona"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "Hlas"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 #, fuzzy
 msgid "IM Image"
 msgstr "IM Obrzek"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Zskat soubor"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Poslat soubor"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Hry"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "Poslat Buddy List"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 #, fuzzy
 msgid "AP User"
 msgstr "AP Uivatel"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr ""
 
@@ -1357,35 +1357,35 @@
 "Vae posledn zprva nebyla odeslna protoe u mte pes limit. "
 "Pokejteprosm 10 sekund a pokus opakujte."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 #, fuzzy
 msgid "Gaim - Warning"
 msgstr "Gaim - Varovat uivatele?"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vmna:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Nemu otevt Pme IM spojen"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1395,30 +1395,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:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Stav: %s"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "Pm IM"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "Zskat Monosti"
 
@@ -1565,7 +1565,7 @@
 msgid "Password Change Successful"
 msgstr "Heslo bylo spn zmnn"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Zmna hesla"
 
@@ -1683,14 +1683,11 @@
 "Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Internetov strnka"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Odhlsit"
 
@@ -1699,7 +1696,7 @@
 msgid "Please enter your logon"
 msgstr "Prosm zadejte svj logon"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Chyba pi pihlaovn"
 
@@ -1715,11 +1712,11 @@
 msgid "Password: "
 msgstr "Heslo: "
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Konec"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "ty"
 
@@ -1732,19 +1729,19 @@
 msgid "About"
 msgstr "O aplikaci Gaim"
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "Volby"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "Nastaven"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "Aotomatick pihlaovn"
@@ -1800,74 +1797,73 @@
 msgid "Set All Away"
 msgstr "Nastav ve na 'Pry'"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Skupina"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Info"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Zobrazit LOG"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Pejmenovat"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Zruit alias"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Klikni pro pravu]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Pihlen v: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Vstrahy: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "monosti: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1878,130 +1874,134 @@
 "ID: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "Neinn:"
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s prihlen."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s odhlen."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Informace o vybranm kamardovi"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 #, fuzzy
 msgid "Send Instant Message"
 msgstr "Poslat zprvu"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Zat/Pripojit se k chatu s kamardem"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 #, fuzzy
 msgid "Activate Away Message"
 msgstr "Aktivuj 'Pry' sprvu"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Soubor"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Pridat kamarda"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Pripojit se k chatu"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Nov zprva"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Zskat informace o uivateli"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Importuj Buddy List"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Nstroje"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Akce protokolu"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Soukrom"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Zobrazit systmov LOG"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Nahrt skript"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Zruit vechny skripty"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Seznam script"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr "Pipojen"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr "Zobraz ladc okno"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "O aplikaci Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Prida novho kamarda"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Pridat novou skupinu"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Vymazat vybranho kamarda/skupinu"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Editovat kamardy"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Buddy List"
 
@@ -2013,13 +2013,13 @@
 msgid "Join Chat As:"
 msgstr "Pipojit se k chatu jako:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Zruit"
 
@@ -2027,16 +2027,16 @@
 msgid "Join"
 msgstr "Pripojit"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Pozvat"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Kamard"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 #, fuzzy
 msgid "Message"
 msgstr "Zprva"
@@ -2045,68 +2045,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Pozvat kamarda do chatovac mstnosti"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Od-ignorovat"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s v mstnosti"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s vstoupil do mstnosti."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je te znm jako %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, fuzzy, c-format
 msgid "%s left the room (%s)."
 msgstr "%s opustil mstnost (%s)."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s opustil miestnost."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Skupinov chaty"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Tma:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "0 lid v mstnosti"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "eptat"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Poslat"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Blokovat"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Varovat"
 
@@ -2145,193 +2144,193 @@
 msgid "Setting position to %d\n"
 msgstr "Nastavuji pozici na %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Tun text"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Tun"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Kurzva"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Kurzva"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Podtren text"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Podtren"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Pekrtnut text"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Pekrtnut"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Zmenit velikost psma"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Mal"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Normlna vekost psma"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normln"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Zvtit velikost psma"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Velk"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Vybrat psmo"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Psmo"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Barva textu"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Barva"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Barva pozad"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Vloit odkaz"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Odkaz"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Vloit smajlk"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Smajlk"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Vloit IM obrzek"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Povolit logovn"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Logovn"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 #, fuzzy
 msgid "Save Conversation"
 msgstr "Uloit konverzaci"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Uloit"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konverzace"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 #, fuzzy
 msgid "Send message as: "
 msgstr "Poslat zprvu jako: "
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Uloit ikonu"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 #, fuzzy
 msgid "Disable Animation"
 msgstr "Zakzat animace"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Povolit animace"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Skryj ikonu"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Uloit ikonu jako..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Varovat uivatele?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "opravdu chcete varovat %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Varovat anonymn?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonymn varovn nejsou tak krut."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Mau '%s' z buddy Listu.\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, fuzzy, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Odstranit %s?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 #, fuzzy
 msgid "Remove Buddy"
 msgstr "Pejmenovat kamarda"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2340,370 +2339,390 @@
 "Chystte se odstranit '%s' z Vaeho\n"
 "Buddy Listu. Opravdu to chcete udlat?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Akceptovat"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - IM uivatel"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr ""
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Uivatel:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr "et"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Zskat informace o uivateli"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Pidat skupinu"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Pidat skupinu"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Pidat kamarda"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Pidat kamarda"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Kontakt"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Pidat k"
 
-#: src/dialogs.c:1134
-msgid "Please enter a buddy to pounce."
-msgstr ""
-
-#: src/dialogs.c:1134
-msgid "Buddy Pounce Error"
-msgstr ""
-
-#: src/dialogs.c:1270
-msgid "Gaim - New Buddy Pounce"
-msgstr ""
-
-#. <pounce type="who">
-#: src/dialogs.c:1281
-msgid "Pounce Who"
-msgstr ""
-
-#: src/dialogs.c:1292
-msgid "Account"
-msgstr "et"
-
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
-msgid "Pounce When"
-msgstr ""
-
-#: src/dialogs.c:1328
-msgid "Pounce on sign on"
-msgstr ""
-
-#: src/dialogs.c:1337
-msgid "Pounce on return from away"
-msgstr ""
-
-#: src/dialogs.c:1346
-msgid "Pounce on return from idle"
-msgstr ""
-
-#: src/dialogs.c:1355
+#: src/dialogs.c:1417
 #, fuzzy
-msgid "Pounce when buddy is typing to you"
-msgstr "Zvuk kdy se kamard pihls"
-
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
-msgid "Pounce Action"
-msgstr ""
-
-#: src/dialogs.c:1376
-msgid "Open IM Window"
-msgstr "Otevt IM okno"
-
-#: src/dialogs.c:1385
-msgid "Popup Notification"
-msgstr "Zobrazit notifikaci"
-
-#: src/dialogs.c:1394
-#, fuzzy
-msgid "Send Message"
-msgstr "Poslat zprvu"
-
-#: src/dialogs.c:1415
-msgid "Execute command on pounce"
+msgid "Gaim - Privacy"
+msgstr "Gaim - Pry"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
 msgstr ""
 
 #: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Nastav soukrom pro:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Povo vem uivatelm kontaktovat m"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Povol jen uvedenm uivatelm"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Seznam povolench"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Odmietnout vechny uivatele"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Blokovat uveden uivatele"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Seznam blokovanch"
+
+#: src/dialogs.c:1546
+msgid "Please enter a buddy to pounce."
+msgstr ""
+
+#: src/dialogs.c:1546
+msgid "Buddy Pounce Error"
+msgstr ""
+
+#: src/dialogs.c:1682
+msgid "Gaim - New Buddy Pounce"
+msgstr ""
+
+#: src/dialogs.c:1693
+msgid "Pounce Who"
+msgstr ""
+
+#: src/dialogs.c:1704
+msgid "Account"
+msgstr "et"
+
+#: src/dialogs.c:1730
+msgid "Pounce When"
+msgstr ""
+
+#: src/dialogs.c:1740
+msgid "Pounce on sign on"
+msgstr ""
+
+#: src/dialogs.c:1749
+msgid "Pounce on return from away"
+msgstr ""
+
+#: src/dialogs.c:1758
+msgid "Pounce on return from idle"
+msgstr ""
+
+#: src/dialogs.c:1767
+#, fuzzy
+msgid "Pounce when buddy is typing to you"
+msgstr "Zvuk kdy se kamard pihls"
+
+#: src/dialogs.c:1777
+msgid "Pounce Action"
+msgstr ""
+
+#: src/dialogs.c:1788
+msgid "Open IM Window"
+msgstr "Otevt IM okno"
+
+#: src/dialogs.c:1797
+msgid "Popup Notification"
+msgstr "Zobrazit notifikaci"
+
+#: src/dialogs.c:1806
+#, fuzzy
+msgid "Send Message"
+msgstr "Poslat zprvu"
+
+#: src/dialogs.c:1827
+msgid "Execute command on pounce"
+msgstr ""
+
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr ""
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr ""
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Povolit Internetovm vyhladvam najt informace o Vs"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Jmno"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Prostedn jmno"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Pjmen"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Jmno za svobodna"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "Stt"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "Nov heslo nesouhlas"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Chyba zmny hesla"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Vyplte vechny polka"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Star heslo"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Nov heslo"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Nov heslo (znova)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Nastavit informace o uivateli"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Zde jsou vsledky Vaeho hledn: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Povolit"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Zamtnout"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Pidat povolen"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Pidat zkaz"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 #, fuzzy
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Loguj konverzaci"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Njt kamarda"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Najt kamarda podle informac"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Najt kamarda podle emailu"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - Pidat URL"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Vyberte barvu textu"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Vyberte barvu pozad"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importuj Buddy List"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 #, fuzzy
 msgid "You cannot create an away message with a blank title"
 msgstr "Nemete vytvoit 'Pry' zprvu s przdnm nzvem"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 #, fuzzy
 msgid "You cannot create an empty away message"
 msgstr "Nemete vytvoit przdnou 'Pry' zprvu"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 #, fuzzy
 msgid "Gaim - New away message"
 msgstr "Gaim - Nov 'Pry' zprva"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 #, fuzzy
 msgid "New away message"
 msgstr "Nov 'Pry' zprva"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Nzev 'Pry': "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Pout"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Uloit a Pout"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "smv"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Alias kamarda"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias kamarda"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Uloit LOG"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Nemu vymazat soubor %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Skuten vymazat LOG?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 #, fuzzy
 msgid "Conversation"
 msgstr "Konverzace"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Vymazat"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Pejmenovat skupinu"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Pejmenovat skupinu"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Nov jmno"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Pejmenovat kamarda"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Pejmenovat kamarda"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vyberte si Perlov skript"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nemu otevt konfiguran soubor %s."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Chyba nastaven"
 
@@ -2733,7 +2752,7 @@
 msgid "Browse"
 msgstr "Prochzet"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Zruit"
 
@@ -2774,7 +2793,18 @@
 msgid "Enter Password"
 msgstr "Vlote heslo"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2782,65 +2812,61 @@
 "Nemete se pihlsit na tento et, nemte nahran protokol, nebo protokol "
 "nem funkci pihlen"
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "Chyba pi Pihlaovn"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Jste si jisti, e chcete vymazat %s"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor t"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Vybrat ve"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Vybrat automatick"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Vybrat dn"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Zmnit"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Prihlsit/Odhlsit"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nebyl schopn se pihlsit"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s byl odhlen"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 #, fuzzy
 msgid "Connection Error"
 msgstr "Chyba spojen"
@@ -2849,571 +2875,368 @@
 msgid "Perl Scripts"
 msgstr "Perlov skripty"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Seznam plugin"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Pluginy"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 #, fuzzy
 msgid "Loaded Plugins"
 msgstr "Gaim - Pluginy"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Vybrat ve"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Cesta k souboru:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Nahrt"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Nahraj plugin ze souboru"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Nastavit"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Nastaven zvolenho pluginu"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Obnovit"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Obnovit zvolen plugin"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Zruit"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Zruit zvolen plugin"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Zavi toto okno"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Veobecn monosti"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "vechny nastaven vejdou okamit v platnost, pokud nen eeno jinak."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Rzn"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Pout tlatka bez okraj"
-
-#: src/prefs.c:224
+#: src/prefs.c:269
+#, fuzzy
+msgid "Windows"
+msgstr "IM okno"
+
+#: src/prefs.c:279
 msgid "Show Buddy Ticker"
 msgstr ""
 
-#: src/prefs.c:229
+#: src/prefs.c:280
 msgid "Show Debug Window"
 msgstr "Zobraz ladc okno"
 
-#. Preferences should be positive
-#: src/prefs.c:233
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "Stt"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Pout tlatka bez okraj"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Pekrtnut text"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Zruit"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Vloit smajlk"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Vybrat"
+
+#: src/prefs.c:345
+msgid "Use custom size"
+msgstr ""
+
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Barva textu"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Barva pozad"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Zobraz grafick smajlky"
+
+#: src/prefs.c:424
+#, fuzzy
+msgid "Show timestamp on messages"
+msgstr "Zobraz asovou znaku u zprv"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "Zobraz URL jako odkazy"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Zvrazni nesprvn napsan slovo"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "Ignoruj barvy"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "Ignoruj psmo"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "Ignoruj velikost psma"
+
+#: src/prefs.c:439
+#, fuzzy
+msgid "Ignore TiK Automated Messages"
+msgstr "Ignoruj TiK automatick zprvy"
+
+#: src/prefs.c:459
+#, fuzzy
+msgid "Enter sends message"
+msgstr "Enter pole zprvu"
+
+#: src/prefs.c:460
+#, fuzzy
+msgid "Control-Enter sends message"
+msgstr "Control-Enter pole zprvu"
+
+#: src/prefs.c:469
+msgid "Escape closes window"
+msgstr "Klvesa Escape zave okno"
+
+#: src/prefs.c:470
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "Klvesa Control-W zatve okno"
+
+#: src/prefs.c:480
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "Control-{B/I/U/S} vlo HTML znaky"
+
+#: src/prefs.c:481
+msgid "Control-(number) inserts smileys"
+msgstr "Control-(slo) vlo smajlka"
+
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr "Skryj tlatka IM/Informace/Chat"
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "Zobraz obrzky na tlatkch"
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Automaticky zobraz Buddy List pi pihlen"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "Zobraz Buddy List u appletu"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Ulo velikost/pozici okna"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Zvtit okno pi udlostech"
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "Skrt skupiny s dnmi online kamardy"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "Zobraz sla ve skupinch"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr ""
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "Zobraz rove varovn"
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "Zobraz dobu neinnosti"
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr "Neinn kamard ed"
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "Vka novho okna:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "ka novho okna:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Vka vstupnho oknka:"
+
+#: src/prefs.c:571 src/prefs.c:633
+msgid "Raise windows on events"
+msgstr "Zvtit okno pi udlostech"
+
+#: src/prefs.c:572
+msgid "Hide window on send"
+msgstr "Schovat okno pi udlostech"
+
+#: src/prefs.c:581
+msgid "Hide Buddy Icons"
+msgstr "Skryj ikony kamard"
+
+#: src/prefs.c:582
+#, fuzzy
+msgid "Disable Buddy Icon Animation"
+msgstr "zakzat animace"
+
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Zobrazuj pihlaovac jmna v okn"
+
+#: src/prefs.c:600
 msgid "Notify buddies that you are typing to them"
 msgstr "Upozornit kamardy, e jim pete"
 
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Reportuj doby neinnosti"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "dne"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Pout Gaim"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "Pout X"
-
-#: src/prefs.c:262
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "Tab-dokon pezdvku"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr ""
+
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "Zobraz pichzejc/odchzejc lidi v okne"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Zobraz vechny chaty v jednom okn se zlokami"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "Zobrazuj aliasy v zlokch/nadpisech"
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "Zobraz vechny chaty v jednom okn se zlokami"
+
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Zobraz vechny chaty v jednom okn se zlokami"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Proxy Server"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Hostitel"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Port"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Uivatel"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Heslo"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "Standartn otevi nov okno"
+
+#: src/prefs.c:896
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Logovat vechny rozhovory"
 
-#: src/prefs.c:263
+#: src/prefs.c:897
 msgid "Strip HTML from logs"
 msgstr "Vyma HTML z LOG"
 
-#: src/prefs.c:269
+#: src/prefs.c:906
 msgid "Log when buddies sign on/sign off"
 msgstr "Logovat kdy se kamardi pihls/odhls"
 
-#: src/prefs.c:271
+#: src/prefs.c:908
 msgid "Log when buddies become idle/un-idle"
 msgstr "Logovat kdy se kamardi stanou neinnmi/innmi"
 
-#: src/prefs.c:273
+#: src/prefs.c:910
 msgid "Log when buddies go away/come back"
 msgstr "Logovat kdy kamardi odejdou pry/vrt se"
 
-#: src/prefs.c:274
+#: src/prefs.c:911
 msgid "Log your own signons/idleness/awayness"
 msgstr "Logovat vlastn pihlen/neinnosti/odchody pry"
 
-#: src/prefs.c:276
+#: src/prefs.c:913
 msgid "Individual log file for each buddy's signons"
 msgstr "Samostatn LOG pro kadho pipojenho kamarda"
 
-#: src/prefs.c:279
-msgid "Browser"
-msgstr "Prohle"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
-msgstr ""
-
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "Standartn otevi nov okno"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME URL ???"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Nastaven proxy"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Ne vechny protokoly mou vyuvat tyto nastaven proxy. Zkonsultujte,\n"
-"prosm, README soubor kvli detailm."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Typ proxy"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Bez proxy"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "Hostitel"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Port"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "Uivatel"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "Heslo"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "Monosti Buddy Listu"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "Okno Buddy Listu"
-
-#: src/prefs.c:569
-#, fuzzy
-msgid "Tab Placement:"
-msgstr "Poloha tabulky:"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "Nahoe"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "Dole"
-
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Skryj tlatka IM/Informace/Chat"
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "Automaticky zobraz Buddy List pi pihlen"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "Zobraz Buddy List u appletu"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Ulo velikost/pozici okna"
-
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "Zobraz obrzky na tlatkch"
-
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "Zobrazen skupin"
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "Skrt skupiny s dnmi online kamardy"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "Zobraz sla ve skupinch"
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "Zobrazen kamard"
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr ""
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "Zobraz rove varovn"
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "Zobraz dobu neinnosti"
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr "Neinn kamard ed"
-
-#: src/prefs.c:659
-#, fuzzy
-msgid "Conversation Options"
-msgstr "Monosti konverzace"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Monosti klvesnice"
-
-#: src/prefs.c:683
-#, fuzzy
-msgid "Enter sends message"
-msgstr "Enter pole zprvu"
-
-#: src/prefs.c:684
-#, fuzzy
-msgid "Control-Enter sends message"
-msgstr "Control-Enter pole zprvu"
-
-#: src/prefs.c:685
-msgid "Escape closes window"
-msgstr "Klvesa Escape zave okno"
-
-#: src/prefs.c:686
-#, fuzzy
-msgid "Control-W closes window"
-msgstr "Klvesa Control-W zatve okno"
-
-#: src/prefs.c:692
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} vlo HTML znaky"
-
-#: src/prefs.c:693
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(slo) vlo smajlka"
-
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 ppn zobrazen asov znaky"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "Monosti zobrazen a veobecn monosti"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "Zobraz grafick smajlky"
-
-#: src/prefs.c:709
-#, fuzzy
-msgid "Show timestamp on messages"
-msgstr "Zobraz asovou znaku u zprv"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "Zobraz URL jako odkazy"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Zvrazni nesprvn napsan slovo"
-
-#: src/prefs.c:712 src/prefs.c:1923
-#, fuzzy
-msgid "Sending messages removes away status"
-msgstr "Posln zprv zru stav 'Pry'"
-
-#: src/prefs.c:713 src/prefs.c:1936
-#, fuzzy
-msgid "Queue new messages when away"
-msgstr "Kdy jsem 'Pry' nov zprvy zaa do fronty"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "Ignoruj barvy"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "Ignoruj psmo"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "Ignoruj velikost psma"
-
-#: src/prefs.c:722
-#, fuzzy
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignoruj TiK automatick zprvy"
-
-#: src/prefs.c:723 src/prefs.c:1921
-#, fuzzy
-msgid "Ignore new conversations when away"
-msgstr "Ignoruj nov konverzace kdy jsem 'Pry'"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "Voby IM"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "IM okno"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "Zobraz tlatka jako:"
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "Obrzky a text"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "Obrzky"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "Text"
-
-#: src/prefs.c:958
-#, fuzzy
-msgid "Show all conversations in one tabbed window"
-msgstr "Zobraz vechny konverzace v jednom okn se zlokami"
-
-#: src/prefs.c:960
-#, fuzzy
-msgid "Show chats in the same tabbed window"
-msgstr "Zobraz vechny chaty v jednom okn se zlokami"
-
-#: src/prefs.c:967 src/prefs.c:1119
-msgid "Raise windows on events"
-msgstr "Zvtit okno pi udlostech"
-
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "Zobrazuj pihlaovac jmna v okn"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "Zobrazuj aliasy v zlokch/nadpisech"
-
-#: src/prefs.c:970
-msgid "Hide window on send"
-msgstr "Schovat okno pi udlostech"
-
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "Velikosti okna"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "Vka novho okna:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "ka novho okna:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Vka vstupnho oknka:"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Poloha zloky"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "Vlevo"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "Vpravo"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "Kamardova ikona"
-
-#: src/prefs.c:1031
-msgid "Hide Buddy Icons"
-msgstr "Skryj ikony kamard"
-
-#: src/prefs.c:1037
-#, fuzzy
-msgid "Disable Buddy Icon Animation"
-msgstr "zakzat animace"
-
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "Monosti chatu"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "Okno skupinovho chatu"
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr "Zobraz vechny chaty v jednom okn se zlokami"
-
-#: src/prefs.c:1112
-#, fuzzy
-msgid "Show conversations in the same tabbed window"
-msgstr "Zobraz vechny konverzace v jednom okn se zlokami"
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "Zobraz pichzejc/odchzejc lidi v okne"
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "Tab dokon"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "Tab-dokon pezdvku"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr ""
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "Monosti psma"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "Kurzva"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "Vybrat"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "Vzhled psma pro text"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "Velikost psma pro text"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Nastaven zvuku"
-
-#: src/prefs.c:1543
-#, fuzzy
-msgid "Test"
-msgstr "Test"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "Vyberte..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Monosti zvuku"
-
-#: src/prefs.c:1649
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "dn zvuky pi pihlen"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Zvuky pi 'Pre'"
 
-#: src/prefs.c:1665
-#, fuzzy
-msgid "Sound method"
-msgstr "Metody zvuku"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, fuzzy, c-format
 msgid ""
 "Sound command\n"
@@ -3422,111 +3245,131 @@
 "Pkaz na pehrvn zvukovch soubor\n"
 "(%s pro jmno souboru)"
 
-#: src/prefs.c:1751
+#: src/prefs.c:1036
+#, fuzzy
+msgid "Sending messages removes away status"
+msgstr "Posln zprv zru stav 'Pry'"
+
+#: src/prefs.c:1037
 #, fuzzy
-msgid "Sound played when:"
-msgstr "Pehrt zvuk pi:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
+msgid "Queue new messages when away"
+msgstr "Kdy jsem 'Pry' nov zprvy zaa do fronty"
+
+#: src/prefs.c:1038
 #, fuzzy
-msgid "Away Messages"
-msgstr "'Pry' zprvy"
-
-#: src/prefs.c:1930
+msgid "Ignore new conversations when away"
+msgstr "Ignoruj nov konverzace kdy jsem 'Pry'"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "Neposlat aotumatickou odpov"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 #, fuzzy
 msgid "Only send auto-response when idle"
 msgstr "Poslat automatickou opov pouze pi neinnosti"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "as mezi poslnm auto-odpovd"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "Automaticky 'Pry' po"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "minut pouvn"
-
-#: src/prefs.c:1988
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Nastaven zvuku"
+
+#: src/prefs.c:1338
 #, fuzzy
-msgid "Messages"
-msgstr "Zprvy"
-
-#: src/prefs.c:2045
+msgid "Test"
+msgstr "Test"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Vyberte..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Edituj"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Edituj"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "Udlej 'Pre'"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Monosti Soukrom"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Nastav soukrom pro:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "Povo vem uivatelm kontaktovat m"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "Povol jen uvedenm uivatelm"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "Seznam povolench"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "Odmietnout vechny uivatele"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "Blokovat uveden uivatele"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "Seznam blokovanch"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "Instance:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Psmo"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Zprvy"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "IM okno"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Okno skupinovho chatu"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Prohle"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Zvuky"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Zvuky"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Nzev 'Pry': "
+
+#: src/prefs.c:1670
+#, fuzzy
+msgid "Away Messages"
+msgstr "'Pry' zprvy"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Nastaven"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim ladc vstupn okno"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Hlavn"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/prefs.c:2916
-#, fuzzy
-msgid "Conversations"
-msgstr "Konverzace"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Zvuky"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Soukrom"
-
 #: src/prpl.c:70
 #, fuzzy
 msgid ""
@@ -3543,37 +3386,50 @@
 msgid "Protocol Error"
 msgstr "Chyba Protokolu"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Akce protokolu"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Odpojit"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Akceptovat?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "GFaim - Dotaz"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nov Pota"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "Otevt potu"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 #, fuzzy
 msgid ""
 "\n"
@@ -3584,23 +3440,23 @@
 "\n"
 "Pejete si pidat jeho nebo ji do Vaeho Buddy Listu?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 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:658
+#: src/prpl.c:666
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrace"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 #, fuzzy
 msgid "Register"
 msgstr "Registrovat"
@@ -3609,29 +3465,29 @@
 msgid "Please enter your password"
 msgstr "Zadejte, prosm, Vae heslo"
 
-#: src/server.c:585
+#: src/server.c:610
 #, fuzzy, c-format
 msgid "(%d messages)"
 msgstr "(%d zprv)"
 
-#: src/server.c:591
+#: src/server.c:616
 #, fuzzy
 msgid "(1 message)"
 msgstr "(1 zprva)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "Varovn"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Ano"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "Ne"
 
-#: src/server.c:1076
+#: src/server.c:1101
 #, fuzzy
 msgid "More Info"
 msgstr "Vc informac"
@@ -3679,6 +3535,193 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "General Options"
+#~ msgstr "Veobecn monosti"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr ""
+#~ "vechny nastaven vejdou okamit v platnost, pokud nen eeno jinak."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Rzn"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Reportuj doby neinnosti"
+
+#~ msgid "None"
+#~ msgstr "dne"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Pout Gaim"
+
+#~ msgid "X Use"
+#~ msgstr "Pout X"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URL ???"
+
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "Buddy List Options"
+#~ msgstr "Monosti Buddy Listu"
+
+#~ msgid "Buddy List Window"
+#~ msgstr "Okno Buddy Listu"
+
+#, fuzzy
+#~ msgid "Tab Placement:"
+#~ msgstr "Poloha tabulky:"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Monosti klvesnice"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 ppn zobrazen asov znaky"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Monosti zobrazen a veobecn monosti"
+
+#~ msgid "IM Options"
+#~ msgstr "Voby IM"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Zobraz tlatka jako:"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Obrzky a text"
+
+#~ msgid "Pictures"
+#~ msgstr "Obrzky"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#, fuzzy
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Zobraz vechny konverzace v jednom okn se zlokami"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Velikosti okna"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Poloha zloky"
+
+#~ msgid "Left"
+#~ msgstr "Vlevo"
+
+#~ msgid "Right"
+#~ msgstr "Vpravo"
+
+#~ msgid "Buddy Icons"
+#~ msgstr "Kamardova ikona"
+
+#~ msgid "Chat Options"
+#~ msgstr "Monosti chatu"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Kurzva"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Vzhled psma pro text"
+
+#~ 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:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "as mezi poslnm auto-odpovd"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Automaticky 'Pry' po"
+
+#~ msgid "minutes using"
+#~ msgstr "minut pouvn"
+
+#, fuzzy
+#~ msgid "Messages"
+#~ msgstr "Zprvy"
+
+#~ msgid "Make Away"
+#~ msgstr "Udlej 'Pre'"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Monosti Soukrom"
+
+#~ msgid "General"
+#~ msgstr "Hlavn"
+
+#, fuzzy
+#~ msgid "Conversations"
+#~ msgstr "Konverzace"
+
 #~ msgid "Enable sounds"
 #~ msgstr "Povolit zvuky"
 
--- a/po/da.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/da.po	Thu Aug 08 18:11:17 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GAIM 0.55\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -26,11 +26,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Luk"
 
@@ -43,17 +43,16 @@
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "Tilfj"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "Slet"
 
@@ -77,7 +76,6 @@
 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 ""
@@ -96,7 +94,7 @@
 msgid "Change"
 msgstr "Kanal:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 #, fuzzy
 msgid "Available"
 msgstr "Ikke tilgngelig"
@@ -105,8 +103,8 @@
 msgid "Available for friends only"
 msgstr ""
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Fravrende"
 
@@ -123,7 +121,7 @@
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "Ikke tilgngelig"
 
@@ -155,7 +153,7 @@
 msgid "Unknown Error Code."
 msgstr "Ukendt fejlkode."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -280,8 +278,7 @@
 msgid "Sex"
 msgstr "Kn"
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "By"
 
@@ -355,12 +352,9 @@
 msgid "Directory Search"
 msgstr "Databasesgning"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: src/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
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
@@ -381,7 +375,7 @@
 msgstr "Send besked gennem server"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Brugerinformation"
@@ -447,7 +441,7 @@
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Adgangskode:"
 
@@ -455,47 +449,47 @@
 msgid "DCC Chat"
 msgstr "DCC Chat"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: 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:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "Logget ind"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr "Totalt fravrende"
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr "Vil ikke forstyrres"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Ukendt fejlkode."
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -503,178 +497,188 @@
 "\n"
 "Vil du tilfje vedkommende til din venne-liste?"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 #, fuzzy
 msgid "No such user"
 msgstr "Ingen server af den type"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: 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/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Venner"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "Ukendt logind-fejl"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Adgangskoden er ndret"
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim - Skift adgangskode"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "Kunne ikke tilslutte"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "Finder godkendelsesmetode"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 #, fuzzy
 msgid "Invalid Jabber I.D."
 msgstr "Ugyldigt navn"
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Rum:"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr "Klenavn:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Ls log"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Hent fravrsbesked"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "Vis besked"
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "Efternavn"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "Fornavn"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "Klenavn"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "Hjemmeside"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Adresse 1"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "Adresse 2"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr "Omrde"
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "E-post adresse"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "Organisationsnavn"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "Organisatorisk enhed"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr "Rolle"
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "Fdselsdato"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -682,23 +686,23 @@
 "Alle oplysninger er valgfri. Skriv kun de ting, du nsker andre skal vide om "
 "dig"
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr "Brugeroplysninger"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Redigr Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "Du er nu registreret p serveren!"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "Ukendt fejl under registrering"
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "Ret brugeroplysninger"
 
@@ -867,8 +871,8 @@
 msgstr "Ukendt fejlkode."
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -876,108 +880,108 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim kunne ikke sende en besked"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 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:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Fejl under lsning fra netvrket."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Kan ikke lse fra netvrket"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "Adgangskode:"
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Kunne ikke kontakte server"
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "Registrr p server"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "Ven"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "Skjul ikon"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Efternavn"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Brugernavn:"
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 msgid "Invalid name"
 msgstr "Ugyldigt navn"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Hvilken gruppe:"
@@ -1055,17 +1059,14 @@
 msgid "Connection established, cookie sent"
 msgstr "Forbindelse oprettet, infokage sendt"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Forkert navn eller adgangskode."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Din konto er ikke aktiv for jeblikket."
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1074,7 +1075,6 @@
 "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."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Din klient er for gammel. Hent en opgradering p"
@@ -1087,7 +1087,7 @@
 msgid "Internal Error"
 msgstr "Intern fejl"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte forbindelse til %s oprettet"
@@ -1182,9 +1182,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Du har ikke modtaget %d beskeder fra %s af ukendte rsager"
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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"
 
@@ -1221,68 +1221,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "Oplysninger om %s ikke tilgngelige: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "Venne-ikon"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "Tale"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "Billede"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Modtag fil"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Send fil"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Spil"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "Aktier"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "Send venne-liste"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "AP Bruger"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "ICQ Send gennem server"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ICQ Ukendt"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "Trillian Kryptering"
 
@@ -1341,35 +1341,35 @@
 "Den seneste besked blev ikke sendt, fordi serveren har for travlt. Vent 10 "
 "sekunder og prv s igen."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 #, fuzzy
 msgid "Gaim - Warning"
 msgstr "Gaim - Advar bruger?"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Deltagere:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Kunne ikke oprette direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1379,30 +1379,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:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Hent fravrsbesked"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "Direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "Klientinformation"
 
@@ -1547,7 +1547,7 @@
 msgid "Password Change Successful"
 msgstr "Adgangskode skiftet"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Skift adgangskode"
 
@@ -1686,14 +1686,11 @@
 "===============\n"
 "Lars Sarauw Hansen                 [ sarauw@dk.ibm.com ]"
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Hjemmeside"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Log af"
 
@@ -1701,7 +1698,7 @@
 msgid "Please enter your logon"
 msgstr "Indtast dit brugernavn"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Logind-fejl"
 
@@ -1717,11 +1714,11 @@
 msgid "Password: "
 msgstr "Adgangskode:"
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Luk"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "Konti"
 
@@ -1733,19 +1730,19 @@
 msgid "About"
 msgstr "Om"
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "Valgmuligheder"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "Udvidelsesmoduler"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "Auto-logind"
@@ -1799,74 +1796,73 @@
 msgid "Set All Away"
 msgstr "St alle fravrende"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "Besked"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Information"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "Tilfj handling"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Ls log"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Omdb"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Slet alias"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "Handling"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "Opret handling"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Slet handling"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Klik for at ndre]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Logget ind: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Advarsler: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Understtter: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1877,127 +1873,131 @@
 "Brugernavn: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggede ind."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggede ud."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Information om markeret ven"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "Send besked"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Start/deltag i chat"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Jeg er fravrende"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Handlinger"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Tilfj en ven"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Deltag i chat"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "Ny besked"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Se brugeroplysninger"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Importr venne-liste"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Vrktjer"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Protokolhandlinger"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Privatliv"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Se systemlog"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "bn skript"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Luk alle skripts"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Vis skripts"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Hjlp"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr "Logget ind"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr "Vis fejlsgningsvindue"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Venne-liste"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Tilfj en ven"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Tilfj en gruppe"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Slet markeret ven/gruppe"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Redigr liste"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Mine venner"
 
@@ -2009,13 +2009,13 @@
 msgid "Join Chat As:"
 msgstr "Deltag i chat som:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Annullr"
 
@@ -2023,16 +2023,16 @@
 msgid "Join"
 msgstr "Deltag"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Invitr"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Ven"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Besked"
 
@@ -2040,68 +2040,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invitr ven med i chat-rum"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Ignorr ikke"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "Ignorr"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s i rum"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s er nu i rummet"
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s kalder sig nu for %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlod rummet (%s)."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlod rummet."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Gruppe-chats"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Emne:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "Ingen chattere i rummet"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Hvisk"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Send"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Ignorr"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Advar"
 
@@ -2135,187 +2134,187 @@
 msgid "Setting position to %d\n"
 msgstr "Flytter position til %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Fed tekst"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Fed"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Kursiv tekst"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Kursiv"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Understreget tekst"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Understregning"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Gennemstreget tekst"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Gennemstregning"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Mindre skrift"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Lille"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Normal skriftstrrelse"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Strre skrift"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Stor"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Vlg skrifttype"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Skrifttype"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Tekstfarve"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Farve"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Baggrundsfarve"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Indst lnke"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Lnke"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Indst humr-ansigt"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Humr-ansigt"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "Indst billede"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr "Billede"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Registrr i logfil"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Logger"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Gem samtale"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Gem"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Lyd"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - Samtaler"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Send besked som:"
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Gem ikon"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Brug ikke animation"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Brug animation"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Gem ikon som..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Advar bruger?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Er du sikker p at du vil advare %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Advar anonymt?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyme advarsler er mindre grove."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Sletter %s fra venne-liste.\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Slet %s?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "Slet ven"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2324,362 +2323,382 @@
 "Du er ved at slette %s fra din\n"
 "venneliste. Vil du fortstte?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Acceptr"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "O.k."
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - Bruger"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "Besked til:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Bruger:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr "Konto"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Se brugeroplysninger"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Tilfj gruppe"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Tilfj gruppe"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Tilfj ven"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Tilfj ven"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Kontakt"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Tilfj til"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Fravrende!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Indstil for:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Tillad alle brugere at kontakte mig"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Tillad kun nedenstende brugere"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Tilladte brugere"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Ignorr alle brugere"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Ignorr kun nedenstende brugere"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Ignorerede brugere"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Hvem vil du sende en handling ved logind?"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Fejl ved udfrsel af handling"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Ny handling"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "Hvem vil du vente p:"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "Konto"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "Hvornr skal handlingen udfres:"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Nr ven logger ind"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Nr ikke lngere fravrende"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Nr ven bliver aktiv igen"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "Nr ven skriver til dig"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Hvad skal der ske:"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "bn besked-vindue"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "Vis besked"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "Send besked"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Udfr kommando"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Afspil lyd"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Gem denne handling til senere brug"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Ret kataloginformation"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "Kataloginformation"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Tillad netsgninger at finde information om dig"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Fornavn"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Mellemnavn"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Efternavn"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Dbsnavn"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "Landsdel"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "Adgangskoder er ikke ens"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Fejl ved skift af adgangskode"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Udfyld alle felter ordentligt"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Oprindelig adgangskode"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Ny adgangskode"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Ny adgangskode (igen)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Ret brugerinformation"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Her er resultatet af din sgning:"
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Tillad"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Ignorr"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Tilfj tilladelse"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ignorr fra nu af"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Sg efter ven"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Find ven udfra information"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Find ven udfra e-post adresse"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - Tilfj hjemmesideadresse"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Vlg tekstfarve"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Vlg baggrundsfarve"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importr til:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importr venne-liste"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "Du kan ikke lave en fravrsbesked uden en titel"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "Du kan ikke lave en tom fravrsbesked"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - Ny fravrsbesked"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Ny fravrsbesked"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Titel:"
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Brug"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Gem og brug"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Smil!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Lav alias for ven"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Lav alias for ven"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Gem logfil"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Kunne ikke slette filen %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Er du sikker p at du vil slette loggen?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "O.k."
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Dato"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Samtale"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Ryd"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Omdb gruppe"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Omdb gruppe"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Nyt navn:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Omdb ven"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Omdb ven"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vlg Perl-skript"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunne ikke bne konfigurationsfilen %s."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Fejl i indstillinger"
 
@@ -2709,7 +2728,7 @@
 msgid "Browse"
 msgstr "Gennemse"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Nulstil"
 
@@ -2750,7 +2769,18 @@
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2758,44 +2788,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:949
-msgid "Login Error"
-msgstr "Fejl ved logind"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker p at du vil slette %s?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Ret konto"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Vlg alle"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Vlg auto-logind"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Vlg ingen"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Ret"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Log ind/ud"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Slet"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2804,21 +2830,21 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s kunne ikke logge ind"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "Bemrk!"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s er logget ud"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr "Forbindelsesfejl"
 
@@ -2826,660 +2852,486 @@
 msgid "Perl Scripts"
 msgstr "Perl-skripter"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim "
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Udvidelsesmoduler"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Indlste udvidelsesmoduler"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Vlg alle"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Filsti:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Indls"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Indls et udvidelsesmodul fra en fil"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Konfigurr"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Konfigurr det valgte udvidelsesmodul"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Genindls"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Genindls det valgte udvidelsesmodul"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Udls"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Udls det valgte udvidelsesmodul"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Luk dette vindue"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Generelle indstillinger"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "ndringer bliver aktive jeblikkeligt, medmindre andet er beskrevet."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Diverse"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Ingen kant p knapper"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "Vis status lbende i separat vindue"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "Vis fejlsgningsvindue"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "Vis venner at du er ved at skrive til dem"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Mling af inaktiv tid:"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "Ingen mling"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Seneste brug af Gaim"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "Seneste brug af X"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Gem alle samtaler"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "Ingen HTML-koder i logfilen"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "Registrr at venner logger ind/ud"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "Registrr at venner bliver aktive/inaktive"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "Registrr venners fravr/genkomst"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "Registrr eget logind/inaktivitet/fravr"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "Separat logfil for hver ven"
+#, fuzzy
+msgid "Windows"
+msgstr "Besked-vindue"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "Netlser/browser"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
+msgid "Show Buddy Ticker"
+msgstr "Vis status lbende i separat vindue"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "Vis fejlsgningsvindue"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "Landsdel"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Ingen kant p knapper"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Gennemstreget tekst"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Annullr"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Indst humr-ansigt"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Vlg"
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "Start altid program i nyt vindue"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME URL Behandler"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Indstillinger for mellemvrt (proxy)"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Ikke alle protokoller kan bruge en mellemvrt (proxy). Ls README-filen for "
-"detaljer."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Mellemvrtstype"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Mellemvrt"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Ingen mellemvrt"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Tekstfarve"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Baggrundsfarve"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Vis grafiske humransigter"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Vis tidspunkt i beskeder"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "Vis URLer som henvisninger"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Fremhv forkert stavede ord"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "Ignorr farver"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "Ignrer skrifttyper"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "Ignrer skriftstrrelser"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "Vrtsnavn"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Port"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "Brugernavn"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "Adgangskode"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "Udseende"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "Venne-liste"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr "Placering af faneblade"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "I toppen"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "I bunden"
-
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Skjul besked/info/chat-knapperne"
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "Vis automatisk venne-listen efter logind"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "Vis venne-listen tt ved panelet"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Husk vinduets strrelse og placering"
-
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "Brug billeder p knapper"
-
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "Visning af grupper"
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "Vis ikke gruppe, hvis ingen er logget ind"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "Vis tal for hver gruppe"
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "Visning af venner"
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "Brug status-ikoner"
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "Vis advarselsniveau"
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "Vis inaktiv tid"
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr "Vis inaktive venner med gr farve"
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "Indstillinger for samtaler"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Genvejstaster"
-
-#: src/prefs.c:683
+msgid "Ignore TiK Automated Messages"
+msgstr "Ignrer TiK's automatiske beskeder"
+
+#: src/prefs.c:459
 msgid "Enter sends message"
 msgstr "ENTER sender besked"
 
-#: src/prefs.c:684
+#: src/prefs.c:460
 msgid "Control-Enter sends message"
 msgstr "CTRL+ENTER sender besked"
 
-#: src/prefs.c:685
+#: src/prefs.c:469
 msgid "Escape closes window"
 msgstr "ESC lukker vindue"
 
-#: src/prefs.c:686
+#: src/prefs.c:470
 #, fuzzy
 msgid "Control-W closes window"
 msgstr "ESC lukker vindue"
 
-#: src/prefs.c:692
+#: src/prefs.c:480
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "CTRL+{B/I/U/S} indstter HTML-koder"
 
-#: src/prefs.c:693
+#: src/prefs.c:481
 msgid "Control-(number) inserts smileys"
 msgstr "CTRL+nummer indstter humransigt"
 
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 slr visning af tidspunkt til og fra"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "Diverse indstillinger"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "Vis grafiske humransigter"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "Vis tidspunkt i beskeder"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "Vis URLer som henvisninger"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Fremhv forkert stavede ord"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "Beskedafsendelse ophver fravrsstatus"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "St nye beskeder i k under fravr"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "Ignorr farver"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "Ignrer skrifttyper"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "Ignrer skriftstrrelser"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignrer TiK's automatiske beskeder"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "Ignrer nye samtaler under fravr"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "Indstillinger for beskeder"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "Besked-vindue"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "Vis knapper som:"
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "Billeder og tekst"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "Billeder"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "Tekst"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "Vis alle samtaler som faneblade i et vindue"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "Vis hver chat som et faneblad i samme vindue"
-
-#: src/prefs.c:967 src/prefs.c:1119
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr "Skjul besked/info/chat-knapperne"
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "Brug billeder p knapper"
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Vis automatisk venne-listen efter logind"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "Vis venne-listen tt ved panelet"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Husk vinduets strrelse og placering"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Send vindue i forgrunden ved aktivitet"
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "Vis ikke gruppe, hvis ingen er logget ind"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "Vis tal for hver gruppe"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "Brug status-ikoner"
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "Vis advarselsniveau"
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "Vis inaktiv tid"
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr "Vis inaktive venner med gr farve"
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "Bredde i punkter:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "Hjde i punkter:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Hjde p skrivefeltet:"
+
+#: src/prefs.c:571 src/prefs.c:633
 msgid "Raise windows on events"
 msgstr "Send vindue i forgrunden ved aktivitet"
 
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "Besked nr venner logger ind/ud"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "Vis aliaser i faneblade/titler"
-
-#: src/prefs.c:970
+#: src/prefs.c:572
 msgid "Hide window on send"
 msgstr "Luk vindue nr besked er sendt"
 
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "Besked-vinduets strrelse"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "Bredde i punkter:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "Hjde i punkter:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Hjde p skrivefeltet:"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Placering af faneblade"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "Til venstre"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "Til hjre"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "Ikoner/knapper"
-
-#: src/prefs.c:1031
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "Skjul knapper"
 
-#: src/prefs.c:1037
+#: src/prefs.c:582
 msgid "Disable Buddy Icon Animation"
 msgstr "Animr ikke venne-ikoner"
 
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "Indstillinger for chat"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "Gruppechat-vindue"
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr "Vis hver chat som faneblad i et vindue"
-
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "Vis samtaler som faneblade i samme vindue"
-
-#: src/prefs.c:1120
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Besked nr venner logger ind/ud"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "Vis venner at du er ved at skrive til dem"
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "Autofuldfr navne ved tryk p TAB"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "TAB som i gamle Gaim-versioner"
+
+#: src/prefs.c:652
 msgid "Show people joining/leaving in window"
 msgstr "Vis nr nogen logger ind eller ud "
 
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "Autofuldfrelse"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "Autofuldfr navne ved tryk p TAB"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "TAB som i gamle Gaim-versioner"
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "Indstillinger for skrifttyper"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "Kursiv tekst"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "Vlg"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "Skrifttype:"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "Skriftstrrelse:"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Opstning af lyd"
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "Test"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "Vlg..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Indstillinger for lyd"
-
-#: src/prefs.c:1649
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Vis hver chat som faneblad i et vindue"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "Vis aliaser i faneblade/titler"
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "Vis hver chat som faneblad i et vindue"
+
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Vis hver chat som et faneblad i samme vindue"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Mellemvrt"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Vrtsnavn"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Port"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Brugernavn"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Adgangskode"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "Start altid program i nyt vindue"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Gem alle samtaler"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "Ingen HTML-koder i logfilen"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "Registrr at venner logger ind/ud"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Registrr at venner bliver aktive/inaktive"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Registrr venners fravr/genkomst"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Registrr eget logind/inaktivitet/fravr"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "Separat logfil for hver ven"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "Ingen lyde, nr du logger ind"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Afspil lyde under fravr"
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "Afspil lyd ved hjlp af:"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
 "(%s for filename)"
 msgstr "Kommando (brug %s istedet for filnavn):"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "Afspil lyd, nr:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "Fravrsbeskeder"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "Beskedafsendelse ophver fravrsstatus"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "St nye beskeder i k under fravr"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "Ignrer nye samtaler under fravr"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "Send ikke automatisk svar"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "Send kun automatisk svar, nr fravrende"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Tid mellem afsendelse af automatiske svar (i sekunder):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "St som fravrende efter"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "minutter og send"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "Beskeder"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Opstning af lyd"
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr "Test"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Vlg..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Ret"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Ret"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "St fravrende"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Privatlivets fred"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Indstil for:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "Tillad alle brugere at kontakte mig"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "Tillad kun nedenstende brugere"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "Tilladte brugere"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "Ignorr alle brugere"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "Ignorr kun nedenstende brugere"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "Ignorerede brugere"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "Instans:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Skrifttype"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Beskeder"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "Besked-vindue"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Gruppechat-vindue"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Mellemvrt"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Netlser/browser"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Lydeffekter"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Lydeffekter"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Titel:"
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "Fravrsbeskeder"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Indstillinger"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim fejlsgningsvindue"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Generelt"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Mellemvrt"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "Samtaler"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Lydeffekter"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Privatliv"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3496,37 +3348,50 @@
 msgid "Protocol Error"
 msgstr "Protokol-fejl"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Protokolhandlinger"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Afbryd forbindelse"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Acceptr?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - Sprgsml"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Ny post"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "bn post"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 #, fuzzy
 msgid ""
 "\n"
@@ -3537,7 +3402,7 @@
 "\n"
 "Vil du tilfje vedkommende til din venne-liste?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3545,15 +3410,15 @@
 "Du har ikke nogen protokoller indlst, som understtter oprettelsen af nye "
 "konti."
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrering"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "Registreringsinformation"
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "Registrr"
 
@@ -3561,28 +3426,28 @@
 msgid "Please enter your password"
 msgstr "Indtast din adgangskode"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d beskeder)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 besked)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "Advaret!"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "Nej"
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr "Flere oplysninger"
 
@@ -3630,6 +3495,185 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "General Options"
+#~ msgstr "Generelle indstillinger"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr ""
+#~ "ndringer bliver aktive jeblikkeligt, medmindre andet er beskrevet."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diverse"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Mling af inaktiv tid:"
+
+#~ msgid "None"
+#~ msgstr "Ingen mling"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Seneste brug af Gaim"
+
+#~ msgid "X Use"
+#~ msgstr "Seneste brug af X"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URL Behandler"
+
+#~ 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."
+#~ msgstr ""
+#~ "Ikke alle protokoller kan bruge en mellemvrt (proxy). Ls README-filen "
+#~ "for detaljer."
+
+#~ msgid "Proxy Type"
+#~ msgstr "Mellemvrtstype"
+
+#~ msgid "No Proxy"
+#~ msgstr "Ingen mellemvrt"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Genvejstaster"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 slr visning af tidspunkt til og fra"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Diverse indstillinger"
+
+#~ msgid "IM Options"
+#~ msgstr "Indstillinger for beskeder"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Vis knapper som:"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Billeder og tekst"
+
+#~ msgid "Pictures"
+#~ msgstr "Billeder"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Vis alle samtaler som faneblade i et vindue"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Besked-vinduets strrelse"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Placering af faneblade"
+
+#~ msgid "Left"
+#~ msgstr "Til venstre"
+
+#~ msgid "Right"
+#~ msgstr "Til hjre"
+
+#~ msgid "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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Kursiv tekst"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Skrifttype:"
+
+#~ 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:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "Tid mellem afsendelse af automatiske svar (i sekunder):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "St som fravrende efter"
+
+#~ msgid "minutes using"
+#~ msgstr "minutter og send"
+
+#~ msgid "Messages"
+#~ msgstr "Beskeder"
+
+#~ msgid "Make Away"
+#~ msgstr "St fravrende"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Privatlivets fred"
+
+#~ msgid "General"
+#~ msgstr "Generelt"
+
+#~ msgid "Conversations"
+#~ msgstr "Samtaler"
+
 #~ msgid "Enable sounds"
 #~ msgstr "Brug lyde"
 
--- a/po/de.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/de.po	Thu Aug 08 18:11:17 2002 +0000
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -33,11 +33,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Schlieen"
 
@@ -50,17 +50,16 @@
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "Hinzufgen"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -84,7 +83,6 @@
 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 ""
@@ -103,7 +101,7 @@
 msgid "Change"
 msgstr "Kanal:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Erreichbar"
 
@@ -111,8 +109,8 @@
 msgid "Available for friends only"
 msgstr "Nur fr Freunde erreichbar"
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Abwesend"
 
@@ -128,7 +126,7 @@
 msgid "Invisible for friends only"
 msgstr "Nur fr Freunde unsichtbar"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "Unerreichbar"
 
@@ -160,7 +158,7 @@
 msgid "Unknown Error Code."
 msgstr "Unbekannter Fehlercode."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -287,8 +285,7 @@
 msgid "Sex"
 msgstr "Geschlecht"
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Stadt"
 
@@ -362,12 +359,9 @@
 msgid "Directory Search"
 msgstr "Verzeichnissuche"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: src/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
 msgid "Change Password"
 msgstr "Passwort ndern"
 
@@ -388,7 +382,7 @@
 msgstr "Nachricht mittels Server senden"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Benutzer-Info"
@@ -457,7 +451,7 @@
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -465,47 +459,47 @@
 msgid "DCC Chat"
 msgstr "DCC-Chat"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: 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:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "Online"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr "Nicht stren"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode."
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -513,180 +507,190 @@
 "\n"
 "Mchten Sie sie zu Ihrer Buddy-List hinzufgen?"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 #, fuzzy
 msgid "No such user"
 msgstr "Dieser Server existiert nicht"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: 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/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Buddies"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "Unbekannter Anmeldefehler"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Das Passwort wurde erfolgreich gendert"
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim - Passwort-nderung"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "Verbindung abgebrochen"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "Verbindung kann nicht hergestellt werden"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "Verbunden"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "Anfrage der Authentifizierungsmethode fehlgeschlagen"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 #, fuzzy
 msgid "Invalid Jabber I.D."
 msgstr "Ungltiger Name"
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Raum:"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr "Krzel:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Mitschnitt anzeigen"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Abwesenheits-Mitteilung holen"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "Popup-Benachrichtigung"
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "Vollstndiger Name"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "Nachname"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "Vorname"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Strae"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
 # ???
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "rtlichkeit"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr "Bezirk"
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "Telefon"
 
 # Die offizielle GNOME-bersetzung
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "E-Mail"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr "Funktion"
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -694,23 +698,23 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben mchten."
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr "Benutzer Identitt"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCard bearbeiten"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "Server-Anmeldung erfolgreich!"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "Unbekannter Fehler bei der Anmeldung"
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
@@ -879,8 +883,8 @@
 msgstr "Unbekannter Fehlercode."
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -888,108 +892,108 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim konnte keine Nachricht senden"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 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:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen aus Socket."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Socket kann nicht gelesen werden."
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "Passwort: "
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Verbindung zum Server nicht mglich."
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "Beim Server anmelden"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "Buddy"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "Icon verbergen"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Zweiter Name"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Benutzername: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 msgid "Invalid name"
 msgstr "Ungltiger Name"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "An welcher Gruppe teilnehmen:"
@@ -1069,17 +1073,14 @@
 msgid "Connection established, cookie sent"
 msgstr "Verbindung hergestellt. Cookie gesendet"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Ungltiger Benutzername oder Passwort."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1089,7 +1090,6 @@
 "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, mssen Sie sogar "
 "noch lnger warten"
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Ihre AIM-Software ist zu alt. Aktuelle Software finden Sie unter "
@@ -1102,7 +1102,7 @@
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte Verbindung mit %s hergestellt"
@@ -1200,9 +1200,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Sie haben %d Nachricht von %s aus unbekannten Grnden verpasst."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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"
 
@@ -1239,68 +1239,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "Benutzerinformationen fr %s sind nicht verfgbar: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "Stimme"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "IM Bild"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Datei holen"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Datei versenden"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Spiele"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "Bestnde"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "Buddy-Liste senden"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "AP Benutzer"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ICQ Unbekannt"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "Trillian Verschlsselung"
 
@@ -1360,38 +1360,38 @@
 "Die letzte Nachricht wurde nicht verschickt, da die Senderate berschritten "
 "wurde. Bitte warten Sie 10 Sekunden und versuchen Sie es erneut."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: 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:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Austausch:"
 
 # "Direct IM"
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Direkte Verbindung nicht mglich"
 
 # Direct IM
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1402,30 +1402,30 @@
 "kann er Ihre ipadresse sehn und knnte ein sicherheitsrisiko darstellen. "
 "Mchten Sie weitermachen?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Abwesenheits-Mitteilung holen"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "Fhigkeiten holen"
 
@@ -1574,7 +1574,7 @@
 msgid "Password Change Successful"
 msgstr "Passwort-nderung erfolgreich"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Passwort-nderung"
 
@@ -1714,14 +1714,11 @@
 "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"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Abmelden"
 
@@ -1729,7 +1726,7 @@
 msgid "Please enter your logon"
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Anmeldefehler"
 
@@ -1745,11 +1742,11 @@
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "Konten"
 
@@ -1762,19 +1759,19 @@
 msgid "About"
 msgstr "Info"
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "Einstellungen"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "Auto-Login"
@@ -1829,74 +1826,73 @@
 msgid "Set All Away"
 msgstr "Alle auf Abwesend setzen"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "Nachricht"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Info"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alarm hinzufgen"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Mitschnitt anzeigen"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Name ndern"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Alias entfernen"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "Buddy-Alarm"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alarm"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Buddy-Alarm entfernen"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Zum Bearbeiten anklicken]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Angemeldet: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Warnungen: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Fhigkeiten: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1907,128 +1903,132 @@
 "Bildschirmname: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s hat sich angemeldet."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s hat sich abgemeldet."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Info ber ausgewhlten Buddy"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "Nachricht senden"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Buddy-Chat starten"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Abwesenheits-Mitteilung aktivieren"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Datei"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Buddy hinzufgen"
 
 # vgl. "Join Chat"
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Einen Chat betreten"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "Neue Nachricht"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Benutzer-Info holen"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Buddy-Liste importieren"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "System"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Protokoll-Aktionen"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Privatsphre"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "System-Mitschnitt anzeigen"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Skript laden"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Alle Skripte entladen"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Skripte zeigen"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr "Online"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr "Debug-Fenster zeigen"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "Info ber Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Buddy hinzufgen"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Neue Gruppe hinzufgen"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Ausgewhlten Buddy/Gruppe entfernen"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Buddies bearbeiten"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Buddy-Liste"
 
@@ -2041,13 +2041,13 @@
 msgid "Join Chat As:"
 msgstr "Chat betreten als:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -2055,16 +2055,16 @@
 msgid "Join"
 msgstr "Betreten"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Buddy"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Nachricht"
 
@@ -2072,68 +2072,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Buddy in einen Chatraum einladen"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Beachten"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s im Raum"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heit jetzt %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen"
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Gruppenchats"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Thema:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "0 Leute im Raum"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Flstern"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Sperren"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Warnen"
 
@@ -2167,187 +2166,187 @@
 msgid "Setting position to %d\n"
 msgstr "Setze Position auf %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Fetter Text"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Fett"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Kursiver Text"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Kursiv"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Unterstrichener Text"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Durchgestrichener Text"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Durchgestrichen"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Schrift verkleinern"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Klein"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Normale Schriftgre"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Schrift vergrern"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Gro"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Schriftart whlen "
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Text-Farbe"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Farbe"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Link einfgen"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Smiley-Gesicht einfgen"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "IM Bild einfgen"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr "Bild"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Mitschnitt aktivieren"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Speichern"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Klnge"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - Unterhaltungen"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Nachricht senden als: "
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Icon speichern"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Animation deaktivieren"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Animation aktivieren"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Benutzer warnen?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Wollen Sie %s wirklich verwarnen?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Anonym warnen?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyme Warnungen sind nicht so barsch."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "'%s' wird von der Buddy-Liste entfernt.\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - %s entfernen?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2356,365 +2355,385 @@
 "Sie sind dabei '%s' aus Ihrer\n"
 "Buddy-List zu entfernen. Fortsetzen?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - Nachricht-Benutzer"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "Nachricht an:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Benutzer:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr "Konto"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Benutzer-Info holen"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Gruppe hinzufgen"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Gruppe hinzufgen"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Buddy hinzufgen"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Buddy hinzufgen"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Kontakt"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Hinzufgen zu"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Ich bin abwesend!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Setze Privatsphre fr:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Allen Benutzern erlauben, mich zu kontaktieren"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Nur den untenstehenden Benutzern erlauben"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Erlauben"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Allen Usern verwehren"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Nur den untenstehenden Benutzern verwehren"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Verwehren"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte Buddy zum Alarmieren angeben."
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Buddy-Alarmierungsfehler"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Neuer Buddy-Alarm"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "Wen alarmieren"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "Konto"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "Wann alarmieren"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Alarm beim Anmelden"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Alarm bei Rckkehr von Abwesenheit"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Alarm bei Rckkehr von Inaktivitt"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "Alarm wenn der Buddy schreibt"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Alarm-Aktion"
 
 # IM benutzen?
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "Nachricht-Fenster ffnen"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "Popup-Benachrichtigung"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Befehl bei Alarm ausfhren"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Klang bei Alarm abspielen"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Diesen Alarm nach Aktivierung speichern"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Profil anlegen"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "Profil"
 
 # Die bersetzung stimmt nicht, oder?
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Ermglicht Personen, Ihr Profil im Web zu finden"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Vorname"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Nachname"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Mdchenname"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "Die neuen Passwrter stimmen nicht berein"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Fehler beim ndern des Passworts"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Bitte alle Felder komplett ausfllen"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Altes Passwort"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Neues Passwort (wiederholen)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Benutzerinfo setzen"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Das Resultat Ihrer Suche:"
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Zulassen"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Sperren"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Zulassung hinzufgen"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Sperre hinzufgen"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Unterhaltungs-Mitschnitt"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Nach Buddies suchen"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Buddy nach Profil suchen"
 
 # E-Mail
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Buddy nach E-Mail-Adresse suchen"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - Url hinzufgen"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Textfarbe auswhlen"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Hintergrundfarbe auswhlen"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importieren zu:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Buddy-Liste laden"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "Fgen Sie bitte einen Titel ein"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "Sie knnen keine leere Abwesenheitsmeldung erstellen"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Abwesenheits-Titel:"
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "bernehmen"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Speichern & bernehmen"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Lchle!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Alias fr Buddy"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias fr Buddy"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Mitschnitt speichern"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Datei %s kann nicht entfernt werden - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Mitschnitt wirklich lschen?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Lschen"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Gruppe umbenennen"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Neuer Name:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Buddy umbenennen"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Buddy umbenennen"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Perl-Skript auswhlen"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Konfigurationsdatei %s kann nicht geffnet werden."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Einstellungen-Fehler"
 
@@ -2744,7 +2763,7 @@
 msgid "Browse"
 msgstr "Stbern"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Zurcksetzen"
 
@@ -2785,7 +2804,18 @@
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2794,44 +2824,40 @@
 "Protokoll nicht geladen haben oder da dieses Protokoll keine Anmelde-"
 "Funktion besitzt."
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "Anmelde-Fehler"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich lschen?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Konten-Editor"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Alles auswhlen"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "\"Auto\" auswhlen"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Nichts auswhlen"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "An-/Abmelden"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Lschen"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2840,21 +2866,21 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s konnte sich nicht anmelden"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "Hinweis"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s wurde abgemeldet"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
@@ -2862,554 +2888,361 @@
 msgid "Perl Scripts"
 msgstr "Perl-skripte"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim Plugin-Liste"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Geladene Plugins"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Alles auswhlen"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Dateipfad:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Laden"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Plugin aus einer Datei laden"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Einstellungen des ausgewhlten Plugins konfigurieren"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Neu laden"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Ausgewhltes Plugin neu laden"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Plugin entladen"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Ausgewhltes Plugin entladen"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Dieses Fenster schlieen"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Allgemeine Einstellungen"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "Alle Einstellungen werden sofort wirksam, wenn nicht anders angegeben."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Verschiedenes"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Randlose Knpfe benutzen"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "Buddy-Ticker zeigen"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "Debug-Fenster zeigen"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "Buddies benachrichten, dass man Ihnen schreibt"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Leerlaufzeiten anzeigen"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "Nein"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "von Gaim"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "von X"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Alles mitschneiden"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "HTML aus Mitschnitt entfernen"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "An/Abmeldung eines Buddies mitschneiden"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "Mitschnitt, wenn Buddies in/aktiv werden"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "Mitschneiden, wenn Buddys gehen oder wiederkommen"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "Eigene Anmeldung/Leerlauf/Abwesenheit mitschneiden"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "Eigene Mitschnitts-Datei fr Anmeldung jedes Buddys"
+#, fuzzy
+msgid "Windows"
+msgstr "Nachrichten-Fenster"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "Browser"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
+msgid "Show Buddy Ticker"
+msgstr "Buddy-Ticker zeigen"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "Debug-Fenster zeigen"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "Provinz/Bundesland"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Randlose Knpfe benutzen"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Durchgestrichener Text"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Abbrechen"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Smiley-Gesicht einfgen"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Auswhlen"
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "Per Vorgabe neues Fenster ffnen"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME URL-Handler"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Proxy-Einstellungen"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Nicht alle Protokolle knnen diese Proxy-Einstellungen nutzen. Bitte lesen "
-"Sie die README-Datei."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Proxy-Typ"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Proxy-Server"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Kein Proxy"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Text-Farbe"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Hintergrundfarbe"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Grafische Smileys anzeigen"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Zeit bei Nachrichten zeigen"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "URLs als Link zeigen"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Falsch geschriebene Wrter hervorheben"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "Schriftfarben ignorieren"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "Schriftarten ignorieren"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "Schriftgre ignorieren"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "Rechner"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Port"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "Benutzer"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "Passwort"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "Einstellungen fr Buddy-Liste"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "Buddy-Listen-Fenster"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr "Reiter-Platzierung:"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "Oben"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "Unten"
-
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Nachrichten/Info/Chat-Knpfe verstecken"
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "Buddy-Liste automatisch beim Anmelden zeigen"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "Buddy-List beim Applet anzeigen"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Fensterposition und -gre speichern"
-
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "Bild auf Knpfen anzeigen"
-
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "Gruppen-Anzeige"
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "Gruppen verstecken, wenn kein Buddy online ist"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "Anzahl in Gruppe anzeigen"
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "Buddy-Anzeige"
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "Typ-Icon fr Buddy anzeigen"
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "Warn-Stufen anzeigen"
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "Inaktivittszeiten anzeigen"
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr "Inaktive Buddies grau anzeigen"
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "Unterhaltungens-Einstellungen"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Tastatur-Einstellungen"
-
-#: src/prefs.c:683
+msgid "Ignore TiK Automated Messages"
+msgstr "TiK-automatisierte Mitteilungen ignorieren"
+
+#: src/prefs.c:459
 msgid "Enter sends message"
 msgstr "Enter-Taste verschickt Nachricht"
 
-#: src/prefs.c:684
+#: src/prefs.c:460
 msgid "Control-Enter sends message"
 msgstr "Strg+Enter-Taste verschickt Nachricht"
 
-#: src/prefs.c:685
+#: src/prefs.c:469
 msgid "Escape closes window"
 msgstr "Esc schliet Fenster"
 
-#: src/prefs.c:686
+#: src/prefs.c:470
 #, fuzzy
 msgid "Control-W closes window"
 msgstr "Esc schliet Fenster"
 
-#: src/prefs.c:692
+#: src/prefs.c:480
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Strg-{B/I/U/S} fgt HTML-Tags ein"
 
-#: src/prefs.c:693
+#: src/prefs.c:481
 msgid "Control-(number) inserts smileys"
 msgstr "Strg-(ziffer) fgt Smileys ein"
 
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 schaltet Zeitanzeige um"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "Anzeige und Allgemeine Einstellungen"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "Grafische Smileys anzeigen"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "Zeit bei Nachrichten zeigen"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "URLs als Link zeigen"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Falsch geschriebene Wrter hervorheben"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "Senden von Nachrichten hebt Abwesenheit auf"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "Neue Nachrichten bei Abwesenheit sammeln"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "Schriftfarben ignorieren"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "Schriftarten ignorieren"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "Schriftgre ignorieren"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "TiK-automatisierte Mitteilungen ignorieren"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "Neue Unterhaltungen bei Abwesenheit ignorieren"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "Einstellungen fr Nachrichten"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "Nachrichten-Fenster"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "Knpfe zeigen als:"
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "Bilder und Text"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "nur Bilder"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "nur Text"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "Alle Unterhaltungen in einem Reiter-Fenster zeigen"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "Chats im selben Reiter-Fenster anzeigen"
-
-#: src/prefs.c:967 src/prefs.c:1119
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr "Nachrichten/Info/Chat-Knpfe verstecken"
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "Bild auf Knpfen anzeigen"
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Buddy-Liste automatisch beim Anmelden zeigen"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "Buddy-List beim Applet anzeigen"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Fensterposition und -gre speichern"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Fenster bei Ereignis in Vordergrund bringen"
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "Gruppen verstecken, wenn kein Buddy online ist"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "Anzahl in Gruppe anzeigen"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "Typ-Icon fr Buddy anzeigen"
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "Warn-Stufen anzeigen"
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "Inaktivittszeiten anzeigen"
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr "Inaktive Buddies grau anzeigen"
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "Neue Fensterbreite:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "Neue Fensterhhe:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Hhe des Eingabefelds:"
+
+#: src/prefs.c:571 src/prefs.c:633
 msgid "Raise windows on events"
 msgstr "Fenster bei Ereignis in Vordergrund bringen"
 
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "Anmeldungen im Fenster zeigen"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "Aliase in Reitern/Titeln anzeigen"
-
-#: src/prefs.c:970
+#: src/prefs.c:572
 msgid "Hide window on send"
 msgstr "Fenster beim Senden verbergen"
 
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "Fenstergre"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "Neue Fensterbreite:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "Neue Fensterhhe:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Hhe des Eingabefelds:"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Reiter-Platzierung"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "Links"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "Rechts"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "Buddy-Icons"
-
-#: src/prefs.c:1031
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "Buddy-Icons verbergen"
 
-#: src/prefs.c:1037
+#: src/prefs.c:582
 msgid "Disable Buddy Icon Animation"
 msgstr "Buddy-Icon-Animation deaktivieren"
 
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "Chat-Optionen"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "Gruppenchat-Fenster"
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr "Alle Chats in einem Reiter-Fenster zeigen"
-
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "Alle Unterhaltungen im selben Reiter-Fenster zeigen"
-
-#: src/prefs.c:1120
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Anmeldungen im Fenster zeigen"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "Buddies benachrichten, dass man Ihnen schreibt"
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "Spitznamen vervollstndigen"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "Alte Tabulator-Vervollstndigung"
+
+#: src/prefs.c:652
 msgid "Show people joining/leaving in window"
 msgstr "Eintretende im Fenster anzeigen"
 
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "Tabulator-Vervollstndigung"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "Spitznamen vervollstndigen"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "Alte Tabulator-Vervollstndigung"
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "Schriften-Optionen"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "Kursiver Text"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "Auswhlen"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "Schriftart fr Text"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "Schriftgre fr Text"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Klang-Konfiguration"
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "Testen"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "Auswhlen..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Klang-Einstellungen"
-
-#: src/prefs.c:1649
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Alle Chats in einem Reiter-Fenster zeigen"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "Aliase in Reitern/Titeln anzeigen"
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "Alle Chats in einem Reiter-Fenster zeigen"
+
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Chats im selben Reiter-Fenster anzeigen"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Proxy-Server"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Rechner"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Port"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Benutzer"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Passwort"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "Per Vorgabe neues Fenster ffnen"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Alles mitschneiden"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "HTML aus Mitschnitt entfernen"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "An/Abmeldung eines Buddies mitschneiden"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Mitschnitt, wenn Buddies in/aktiv werden"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Mitschneiden, wenn Buddys gehen oder wiederkommen"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Eigene Anmeldung/Leerlauf/Abwesenheit mitschneiden"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "Eigene Mitschnitts-Datei fr Anmeldung jedes Buddys"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "Kein Klang beim Anmelden"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Klnge bei Abwesenheit"
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "Klang-Ausgabesystem"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3418,106 +3251,125 @@
 "Klang-Abspielbefehl\n"
 "(%s fr Dateiname)"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "Klang abspielen bei:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "Abwesenheits-Mitteilungen"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "Senden von Nachrichten hebt Abwesenheit auf"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "Neue Nachrichten bei Abwesenheit sammeln"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "Neue Unterhaltungen bei Abwesenheit ignorieren"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "Keine automatische Antwort schicken"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "Automatische Antwort nur bei Inaktivitt schicken"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Zeit zwischen dem Senden einer automatischen Antwort (in Sekunden):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "Auto-Abwesenheit nach"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "Minuten und benutze"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "Nachrichten"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Klang-Konfiguration"
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr "Testen"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Auswhlen..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Bearbeiten"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "Jetzt abwesend"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Einstellungen zur Privatsphre"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Setze Privatsphre fr:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "Allen Benutzern erlauben, mich zu kontaktieren"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "Nur den untenstehenden Benutzern erlauben"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "Erlauben"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "Allen Usern verwehren"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "Nur den untenstehenden Benutzern verwehren"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "Verwehren"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "Instanz:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Schriftart"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Nachrichten"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "Nachrichten-Fenster"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Gruppenchat-Fenster"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Browser"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Klnge"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Klnge"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Abwesenheits-Titel:"
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "Abwesenheits-Mitteilungen"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Einstellungen"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim Debug-Ausgabefenster"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Allgemein"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "Unterhaltungen"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Klnge"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Privatsphre"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3534,37 +3386,50 @@
 msgid "Protocol Error"
 msgstr "Protokoll-Fehler"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Protokoll-Aktionen"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Trennen"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Akzeptieren?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - Anforderungszeichen"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Neue Post"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "Mail ffnen"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 #, fuzzy
 msgid ""
 "\n"
@@ -3575,7 +3440,7 @@
 "\n"
 "Mchten Sie sie zu Ihrer Buddy-List hinzufgen?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3583,15 +3448,15 @@
 "Sie haben momentan keine verfgbaren Protokolle, die das\n"
 "Registrieren neuer Benutzeraccounts ermglichen."
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - Anmeldung"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "Anmeldungsinformationen"
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "Anmelden"
 
@@ -3599,28 +3464,28 @@
 msgid "Please enter your password"
 msgstr "Bitte geben Sie Ihr Passwort ein"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d Nachrichten)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 Nachricht)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "Verwarnt"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "Nein"
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr "Mehr Informationen"
 
@@ -3668,6 +3533,185 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ 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."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Verschiedenes"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Leerlaufzeiten anzeigen"
+
+#~ msgid "None"
+#~ msgstr "Nein"
+
+#~ msgid "Gaim Use"
+#~ msgstr "von Gaim"
+
+#~ msgid "X Use"
+#~ msgstr "von X"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URL-Handler"
+
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Tastatur-Einstellungen"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 schaltet Zeitanzeige um"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Anzeige und Allgemeine Einstellungen"
+
+#~ msgid "IM Options"
+#~ msgstr "Einstellungen fr Nachrichten"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Knpfe zeigen als:"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Bilder und Text"
+
+#~ msgid "Pictures"
+#~ msgstr "nur Bilder"
+
+#~ msgid "Text"
+#~ msgstr "nur Text"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Alle Unterhaltungen in einem Reiter-Fenster zeigen"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Fenstergre"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Reiter-Platzierung"
+
+#~ msgid "Left"
+#~ msgstr "Links"
+
+#~ 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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Kursiver Text"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Schriftart fr Text"
+
+#~ 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:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "Zeit zwischen dem Senden einer automatischen Antwort (in Sekunden):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Auto-Abwesenheit nach"
+
+#~ msgid "minutes using"
+#~ msgstr "Minuten und benutze"
+
+#~ msgid "Messages"
+#~ msgstr "Nachrichten"
+
+#~ msgid "Make Away"
+#~ msgstr "Jetzt abwesend"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Einstellungen zur Privatsphre"
+
+#~ msgid "General"
+#~ msgstr "Allgemein"
+
+#~ msgid "Conversations"
+#~ msgstr "Unterhaltungen"
+
 #~ msgid "Enable sounds"
 #~ msgstr "Klnge aktivieren"
 
--- a/po/es.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/es.po	Thu Aug 08 18:11:17 2002 +0000
@@ -5,8 +5,8 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-11 22:46-0700\n"
+"Project-Id-Version: Gaim 0.60\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -14,6 +14,112 @@
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Conversacin de Amigos"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+msgid "Gaim Chat"
+msgstr "Gaim Conversaciones"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
+msgid "Close"
+msgstr "Cerrar"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "Opciones del Chat"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr "Refrescar"
+
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
+msgid "Add"
+msgstr "Aadir"
+
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
+msgid "Remove"
+msgstr "Quitar"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr "Lista de conversaciones disponibles"
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr "Lista de conversaciones subscritas"
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "No"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "Canal:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+msgid "Available"
+msgstr "En lnea"
+
+#: src/protocols/gg/gg.c:72
+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:499 src/buddy.c:2586 src/buddy.c:2731
+msgid "Away"
+msgstr "Ausente"
+
+#: src/protocols/gg/gg.c:74
+msgid "Away for friends only"
+msgstr "Ausente slo para los amigos"
+
+#: src/protocols/gg/gg.c:75
+msgid "Invisible"
+msgstr "Invisible"
+
+#: src/protocols/gg/gg.c:76
+msgid "Invisible for friends only"
+msgstr "Invisible slo para los amigos"
+
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+msgid "Unavailable"
+msgstr "No disponible"
+
 #: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "No se pudo resolver el nombre del host."
@@ -44,7 +150,7 @@
 msgid "Unknown Error Code."
 msgstr "Cdigo de error desconocido."
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
@@ -170,8 +276,7 @@
 msgid "Sex"
 msgstr "Sexo"
 
-#. Line 5
-#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Ciudad"
 
@@ -250,7 +355,9 @@
 msgid "Directory Search"
 msgstr "Bsqueda en el Directorio"
 
-#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: 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
 msgid "Change Password"
 msgstr "Cambiar Contrasea"
 
@@ -271,8 +378,8 @@
 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:2112 src/protocols/oscar/oscar.c:3436
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Obtener Informacin"
 
@@ -311,7 +418,7 @@
 msgstr ""
 "%s ha solicitado un IM privado. Deseara establecer la conexin directa?"
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "No se pudo escribir"
 
@@ -338,7 +445,7 @@
 msgid "Channel:"
 msgstr "Canal:"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Contrasea:"
 
@@ -347,517 +454,625 @@
 msgid "DCC Chat"
 msgstr "Hablar"
 
-#: src/protocols/jabber/jabber.c:699
-msgid "Unavailable"
-msgstr "No disponible"
-
-#: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
-#: src/protocols/jabber/jabber.c:703
-msgid "Away"
-msgstr "Ausente"
-
-#: src/buddy.c:2801 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
-msgid "Online"
-msgstr "Conectado"
-
-#: src/protocols/jabber/jabber.c:707
-msgid "Extended Away"
-msgstr "Ausencia Extendida"
-
-#: src/protocols/jabber/jabber.c:709
-msgid "Do Not Disturb"
-msgstr "No Molestar"
-
-#: src/protocols/jabber/jabber.c:1042
-#, fuzzy
-msgid "No such user"
-msgstr "No existe el usuario"
-
-#: src/protocols/jabber/jabber.c:1044
-#, fuzzy
-msgid "Jabber Error"
-msgstr "Error de Mensaje"
-
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
-msgid "Buddies"
-msgstr "Amigos"
-
-#: src/protocols/jabber/jabber.c:1188
-#, fuzzy
-msgid "Authenticating"
-msgstr "Autorizando"
-
-#: src/protocols/jabber/jabber.c:1225
+#: 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 "Unknown login error"
-msgstr "Cdigo de error desconocido."
-
-#: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
-#, fuzzy
-msgid "Connection lost"
-msgstr "Conexin Cerrada"
-
-#: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
-#: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
-#, fuzzy
-msgid "Unable to connect"
-msgstr "No se pudo conectar."
-
-#: src/protocols/jabber/jabber.c:1463
-#, fuzzy
-msgid "Connected"
-msgstr "Conectado"
-
-#: src/protocols/jabber/jabber.c:1466
-#, fuzzy
-msgid "Requesting Authentication Method"
-msgstr "Fall la Autorizacin"
-
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:1484
-#, fuzzy
-msgid "Connecting"
-msgstr "Conectando"
-
-#: src/protocols/jabber/jabber.c:1783
-msgid "Room:"
-msgstr "Sala:"
-
-#: src/protocols/jabber/jabber.c:1787
-msgid "Server:"
-msgstr "Servidor:"
-
-#: src/protocols/jabber/jabber.c:1792
-msgid "Handle:"
-msgstr "Gestor:"
-
-#: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
+msgid "Password Change Error!"
+msgstr "Gaim - Cambiar Contrasea"
+
+#: src/protocols/jabber/jabber.c:955
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1115
 #, fuzzy
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
-#: src/protocols/oscar/oscar.c:3443
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
+msgid "Online"
+msgstr "Conectado"
+
+#: src/protocols/jabber/jabber.c:1145
+msgid "Extended Away"
+msgstr "Ausencia Extendida"
+
+#: src/protocols/jabber/jabber.c:1147
+msgid "Do Not Disturb"
+msgstr "No Molestar"
+
+#: src/protocols/jabber/jabber.c:1457
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1460
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Cdigo de error desconocido"
+
+#: src/protocols/jabber/jabber.c:1630
+#, 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
+#, fuzzy
+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
+msgid "Buddies"
+msgstr "Amigos"
+
+#: src/protocols/jabber/jabber.c:1805
+#, fuzzy
+msgid "Authenticating"
+msgstr "Autorizando"
+
+#: src/protocols/jabber/jabber.c:1842
+#, fuzzy
+msgid "Unknown login error"
+msgstr "Cdigo de error desconocido."
+
+#: src/protocols/jabber/jabber.c:2033
+#, 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
+#, 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
+#, fuzzy
+msgid "Unable to connect"
+msgstr "No se pudo conectar."
+
+#: src/protocols/jabber/jabber.c:2085
+#, fuzzy
+msgid "Connected"
+msgstr "Conectado"
+
+#: src/protocols/jabber/jabber.c:2088
+#, fuzzy
+msgid "Requesting Authentication Method"
+msgstr "Fall la Autorizacin"
+
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#, fuzzy
+msgid "Connecting"
+msgstr "Conectando"
+
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr "Usuario no vlido"
+
+#: src/protocols/jabber/jabber.c:2648
+msgid "Room:"
+msgstr "Sala:"
+
+#: src/protocols/jabber/jabber.c:2652
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/protocols/jabber/jabber.c:2657
+msgid "Handle:"
+msgstr "Gestor:"
+
+#: src/protocols/jabber/jabber.c:2714
+#, fuzzy
+msgid "Chats"
+msgstr "Hablar"
+
+#: src/protocols/jabber/jabber.c:3029
+#, fuzzy
+msgid "View Error Msg"
+msgstr "Ver registro"
+
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Mensaje de Ausencia"
 
-#: src/protocols/jabber/jabber.c:2299
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "Notificacin con un Popup"
+
+#: src/protocols/jabber/jabber.c:3281
 #, fuzzy
 msgid "Full Name"
 msgstr "Nombre Completo"
 
-#: src/protocols/jabber/jabber.c:2300
+#: src/protocols/jabber/jabber.c:3282
 #, fuzzy
 msgid "Family Name"
 msgstr "Nombre"
 
-#: src/protocols/jabber/jabber.c:2301
+#: src/protocols/jabber/jabber.c:3283
 #, fuzzy
 msgid "Given Name"
 msgstr "Apellido de Soltera"
 
-#: src/protocols/jabber/jabber.c:2302
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2303
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2304
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Calle"
 
-#: src/protocols/jabber/jabber.c:2305
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "Direccin extendida"
 
-#: src/protocols/jabber/jabber.c:2306
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "Localidad"
 
-#: src/protocols/jabber/jabber.c:2307
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr "Regin"
 
-#: src/protocols/jabber/jabber.c:2308
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "Cdigo postal"
 
-#. Line 7
-#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2309
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Pas"
 
-#: src/protocols/jabber/jabber.c:2310
+#: src/protocols/jabber/jabber.c:3292
 #, fuzzy
 msgid "Telephone"
 msgstr "Numero de telefono"
 
-#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2311
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "Correo Electrnico"
 
-#: src/protocols/jabber/jabber.c:2312
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "Nombre de empresa"
 
-#: src/protocols/jabber/jabber.c:2313
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2314
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Ttulo"
 
-#: src/protocols/jabber/jabber.c:2315
+#: src/protocols/jabber/jabber.c:3297
 #, fuzzy
 msgid "Role"
 msgstr "Papel"
 
-#: src/protocols/jabber/jabber.c:2316
+#: src/protocols/jabber/jabber.c:3298
 #, fuzzy
 msgid "Birthday"
 msgstr "Ao de nacimiento"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2317
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Descripcin"
 
-#: src/protocols/jabber/jabber.c:2342
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
-"Todos los campos siguientes son opcionales. Introduzca solo la informacin"
-"que siente confortable compartir"
-
-#: src/protocols/jabber/jabber.c:2343
+"Todos los campos siguientes son opcionales. Introduzca solo la "
+"informacinque siente confortable compartir"
+
+#: src/protocols/jabber/jabber.c:3325
 #, fuzzy
 msgid "User Identity"
 msgstr "Informacin de Usuario"
 
-#: src/protocols/jabber/jabber.c:2759
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Editar datos en Jabber"
 
-#: src/protocols/jabber/jabber.c:2833
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "Registro en el servidor efectuado exitosamente"
 
-#: src/protocols/jabber/jabber.c:2860
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "Error desconocido al registrar"
 
-#: src/protocols/jabber/jabber.c:2969 src/protocols/jabber/jabber.c:2984
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 #, fuzzy
 msgid "Set User Info"
 msgstr "Informacin de Usuario"
 
-#: src/protocols/msn/msn.c:826 src/protocols/msn/msn.c:2107
-#: src/protocols/msn/msn.c:2264 src/protocols/msn/msn.c:2297
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:547
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr "Error de sintaxis (problabemente un bug de Gaim)"
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr "Parmetro invlido (problabemente un bug de Gaim)"
+
+#: src/protocols/msn/msn.c:236
+msgid "Invalid User"
+msgstr "Usuario no vlido"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+#, fuzzy
+msgid "Already Login"
+msgstr "Ya en lista"
+
+#: src/protocols/msn/msn.c:245
+msgid "Invalid Username"
+msgstr "Nombre de usuario no vlido"
+
+#: src/protocols/msn/msn.c:248
+msgid "Invalid Friendly Name"
+msgstr "Nombre no vlido"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr "Lista llena"
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr "Ya en lista"
+
+#: src/protocols/msn/msn.c:257
+msgid "Not on list"
+msgstr "No est en la lista"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr "El usuario no est conectado"
+
+#: src/protocols/msn/msn.c:263
+#, fuzzy
+msgid "Already in the mode"
+msgstr "Ya en lista"
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr "Ya est en la lista contraria"
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr "Fall el servidor Switchboard"
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+msgid "Not logged in"
+msgstr "No ha iniciado sesin"
+
+#: src/protocols/msn/msn.c:283
+msgid "Internal server error"
+msgstr "Error interno del servidor"
+
+#: src/protocols/msn/msn.c:286
+#, fuzzy
+msgid "Database server error"
+msgstr "Error interno del servidor"
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "error interno de conexin\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "error grave de conexin\n"
+
+#: src/protocols/msn/msn.c:296
+msgid "Server busy"
+msgstr "Servidor ocupado"
+
+#: src/protocols/msn/msn.c:299
+msgid "Server unavailable"
+msgstr "Servidor no disponible"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "error interno de conexin\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr "El servidor est apagndose (Slvese quien pueda)"
+
+#: src/protocols/msn/msn.c:312
+msgid "Error creating connection"
+msgstr "Error al crear la conexin"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+#, fuzzy
+msgid "User is too active"
+msgstr "El usuario no est conectado"
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "Demasiados resultados."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+msgid "Authentication failed"
+msgstr ""
+"Fall la autentificacin.Compruebe\n"
+"nombre de usuario y contrasea"
+
+#: src/protocols/msn/msn.c:337
+msgid "Not allowed when offline"
+msgstr "No puede mandar mensajes fuera de lnea"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+#, fuzzy
+msgid "User unverified"
+msgstr "El usuario no est conectado"
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+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:547
+#: src/protocols/msn/msn.c:558
 msgid "A message may not have been received."
 msgstr "Puede que no se haya recibido un mensaje"
 
-#: src/protocols/msn/msn.c:826
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim no pudo envar el mensaje"
 
-#: src/protocols/msn/msn.c:1176
+#: src/protocols/msn/msn.c:919
+#, 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
+#, 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
 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:2264 src/protocols/msn/msn.c:2297
-msgid "Invalid name"
-msgstr "Nombre no vlido"
-
-#: src/protocols/msn/msn.c:1915 src/protocols/msn/msn.c:2016
-msgid "Available"
-msgstr "En lnea"
-
-#: src/protocols/msn/msn.c:1916
-msgid "Away From Computer"
-msgstr "Ausente"
-
-#: src/protocols/msn/msn.c:2008
-msgid "Away from the computer"
-msgstr "Ausente"
-
-#: src/protocols/msn/msn.c:2014
-msgid "Idle"
-msgstr "Ausente"
-
-#: src/protocols/msn/msn.c:1917
-msgid "Be Right Back"
-msgstr "Vuelvo enseguida"
-
-#: src/protocols/msn/msn.c:2006
-msgid "Be right back"
-msgstr "Vuelvo enseguida"
-
-#: src/protocols/msn/msn.c:1918 src/protocols/msn/msn.c:2004
-msgid "Busy"
-msgstr "No Disponible"
-
-#: src/protocols/msn/msn.c:1919
-msgid "On The Phone"
-msgstr "Al telfono"
-
-#: src/protocols/msn/msn.c:2010
-msgid "On the phone"
-msgstr "Al telfono"
-
-#: src/protocols/msn/msn.c:1920
-msgid "Out To Lunch"
-msgstr "Sal a comer"
-
-#: src/protocols/msn/msn.c:2012
-msgid "Out to lunch"
-msgstr "Sal a comer"
-
-#: src/protocols/msn/msn.c:1921
-msgid "Hidden"
-msgstr "Oculto"
-
-#: src/protocols/msn/msn.c:2037
-msgid "Reset friendly name"
-msgstr "Actualizar nombre"
-
-#: src/protocols/msn/msn.c:2121 src/protocols/msn/msn.c:2122
-#: src/protocols/msn/msn.c:2142
-msgid "Set Friendly Name"
-msgstr "Establecer nombre"
-
-#: src/protocols/msn/msn.c:924 src/protocols/msn/msn.c:1075
-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:2107
-msgid "Friendly name too long."
-msgstr "Nombre demasiado largo"
-
-#: src/protocols/msn/msn.c:1111
-msgid "Buddies"
-msgstr "Amigos"
-
-#: src/protocols/msn/msn.c:1739 src/protocols/msn/msn.c:1766
-msgid "Unable to connect"
-msgstr "No se puede conectar"
-
-#: src/protocols/msn/msn.c:1746
-msgid "Unable to write to server"
-msgstr "No se puede escribir al servidor"
-
-#: src/protocols/msn/msn.c:1752
-msgid "Synching with server"
-msgstr "Redirigiendo al servidor"
-
-#: src/protocols/msn/msn.c:1436 src/protocols/msn/msn.c:1677
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 msgid "Error reading from server"
 msgstr "Error al leer del servidor"
 
-#: src/protocols/msn/msn.c:1621
-msgid "Password sent"
-msgstr "Contrasea enviada"
-
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1570
+msgid "Requesting to send password"
+msgstr "Enviando contrasea"
+
+#: src/protocols/msn/msn.c:1620
 msgid "Unable to send password"
 msgstr "No se puede enviar la contrasea"
 
-#: src/protocols/msn/msn.c:1760
-msgid "Connecting"
-msgstr "Conectando"
-
-#: src/protocols/msn/msn.c:1569
-msgid "Requesting to send password"
-msgstr "Enviando contrasea"
-
-#: src/protocols/msn/msn.c:2046
-msgid "Status: %s"
-msgstr "Estado: %s"
- 
-#: src/protocols/msn/msn.c:2123 src/protocols/msn/msn.c:2143
+#: src/protocols/msn/msn.c:1625
+msgid "Password sent"
+msgstr "Contrasea enviada"
+
+#: src/protocols/msn/msn.c:1750
+msgid "Unable to write to server"
+msgstr "No se puede escribir al servidor"
+
+#: src/protocols/msn/msn.c:1756
+msgid "Synching with server"
+msgstr "Redirigiendo al servidor"
+
+#: src/protocols/msn/msn.c:1922
+msgid "Away From Computer"
+msgstr "Ausente"
+
+#: src/protocols/msn/msn.c:1923
+msgid "Be Right Back"
+msgstr "Vuelvo enseguida"
+
+#: src/protocols/msn/msn.c:1924
+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 "Hidden"
+msgstr "Oculto"
+
+#: src/protocols/msn/msn.c:2043
+msgid "Reset friendly name"
+msgstr "Actualizar nombre"
+
+#: src/protocols/msn/msn.c:2116
+msgid "Friendly name too long."
+msgstr "Nombre demasiado largo"
+
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+msgid "Set Friendly Name"
+msgstr "Establecer nombre"
+
+#: src/protocols/msn/msn.c:2132
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "Establecer nombre"
+
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr "Actualizar todos los nombres"
 
-#: src/protocols/msn/msn.c:225
-msgid "Syntax Error (probably a Gaim bug)"
-msgstr "Error de sintaxis (problabemente un bug de Gaim)"
-
-#: src/protocols/msn/msn.c:228
-msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr "Parmetro invlido (problabemente un bug de Gaim)"
-
-#: src/protocols/msn/msn.c:231
-msgid "Invalid User"
-msgstr "Usuario no vlido"
-
-#: src/protocols/msn/msn.c:240
-msgid "Invalid Username"
-msgstr "Nombre de usuario no vlido"
-
-#: src/protocols/msn/msn.c:243
-msgid "Invalid Friendly Name"
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
+msgid "Invalid name"
 msgstr "Nombre no vlido"
 
-#: src/protocols/msn/msn.c:246
-msgid "List Full"
-msgstr "Lista llena"
-
-#: src/protocols/msn/msn.c:249
-msgid "Already there"
-msgstr "Ya en lista"
-
-#: src/protocols/msn/msn.c:252
-msgid "Not on list"
-msgstr "No est en la lista"
-
-#: src/protocols/msn/msn.c:255
-msgid "User is offline"
-msgstr "El usuario no est conectado"
-
-#: src/protocols/msn/msn.c:261
-msgid "Already in opposite list"
-msgstr "Ya est en la lista contraria"
-
-#: src/protocols/msn/msn.c:264
-msgid "Switchboard failed"
-msgstr "Fall el servidor Switchboard"
-
-#: src/protocols/msn/msn.c:274
-msgid "Not logged in"
-msgstr "No ha iniciado sesin"
-
-#: src/protocols/msn/msn.c:278
-msgid "Internal server error"
-msgstr "Error interno del servidor"
-
-#: src/protocols/msn/msn.c:291
-msgid "Server busy"
-msgstr "Servidor ocupado"
-
-#: src/protocols/msn/msn.c:294
-msgid "Server unavailable"
-msgstr "Servidor no disponible"
-
-#: src/protocols/msn/msn.c:303
-msgid "Server is going down (abandon ship)"
-msgstr "El servidor est apagndose (Slvese quien pueda)"
-
-#: src/protocols/msn/msn.c:307
-msgid "Error creating connection"
-msgstr "Error al crear la conexin"
-
-#: src/protocols/msn/msn.c:329
-msgid "Authentication failed"
-msgstr "Fall la autentificacin.Compruebe\nnombre de usuario y contrasea"
-
-#: src/protocols/msn/msn.c:332
-msgid "Not allowed when offline"
-msgstr "No puede mandar mensajes fuera de lnea"
-
-#: src/protocols/msn/msn.c:341
-msgid "Unknown error code"
-msgstr "Cdigo de error desconocido"
-
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3075
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Unirse a qu grupo:"
 
-#: src/protocols/oscar/oscar.c:333
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Se cerr el IM con %s"
 
-#: src/protocols/oscar/oscar.c:335
+#: src/protocols/oscar/oscar.c:332
 #, fuzzy, c-format
 msgid "Direct IM with %s failed"
 msgstr "Se cerr el IM con %s"
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "error de conexin\n"
 
-#: src/protocols/oscar/oscar.c:384
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "error grave de conexin\n"
 
-#: src/protocols/oscar/oscar.c:385 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: src/protocols/oscar/oscar.c:397 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala: %s"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "Error de Conversacin!"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "La conversacin no est disponible"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - Conversaciones"
 
-#: src/protocols/oscar/oscar.c:470 src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al host"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "Contrasea enviada, esperando respuesta\n"
 
-#: src/protocols/oscar/oscar.c:511
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "error interno de conexin\n"
 
-#: src/protocols/oscar/oscar.c:512
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/protocols/oscar/oscar.c:517
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "Desconectado.\n"
 
-#: src/protocols/oscar/oscar.c:608 src/protocols/oscar/oscar.c:732
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr "Conexin establecida, cookie enviada"
 
-#. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:642 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contrasea incorrecta."
 
-#. Suspended account
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Su cuenta est deshabilitada actualmente."
 
-#. connecting too frequently
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -866,231 +1081,240 @@
 "intntelo de nuevo. Si sigue intentndolo, necesitar esperar incluso ms "
 "tiempo."
 
-#. client too old
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 "La versin del cliente que usa es demasiado antigua. Por favor, actualcela "
 "en "
 
-#: src/protocols/oscar/oscar.c:660 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Fall la Autorizacin"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Se estableci un IM Directo con %s"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
-#, c-format
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#, fuzzy, c-format
 msgid ""
-"The user %d has denied your request to add them to your contact list for the "
-"following reason:\n"
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
+msgstr ""
+"El usuario %d ha negado su peticin de aadirlo a su lista de contactos por "
+"laSiguiente razon:\n"
 "\n"
-msgstr ""
-"El usuario %d ha negado su peticin de aadirlo a su lista de contactos por la"
-"Siguiente razon:\n"
-"\n"
-
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "No se indic una razn"
 
-#: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr "Gaim - Autorizacin ICQ negada"
 
-#: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
-#, c-format
-msgid "The user %d has granted your request to add them to your contact list."
-msgstr "El usuario %d ha autorizado su peticin de aadirlo a su lista de contactos"
-
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#, fuzzy, c-format
+msgid "The user %lu has granted your request to add them to your contact list."
+msgstr ""
+"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:1577
+#: src/protocols/oscar/oscar.c:1585
 #, 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:1578
+#: src/protocols/oscar/oscar.c:1586
 #, 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:1587
+#: src/protocols/oscar/oscar.c:1595
 #, 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:1588
+#: src/protocols/oscar/oscar.c:1596
 #, 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:1597
+#: src/protocols/oscar/oscar.c:1605
 #, 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:1598
+#: src/protocols/oscar/oscar.c:1606
 #, 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:1607
+#: src/protocols/oscar/oscar.c:1615
 #, 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:1608
+#: src/protocols/oscar/oscar.c:1616
 #, 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:1617
+#: src/protocols/oscar/oscar.c:1625
 #, 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:1618
-#, 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:1626
 #, 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
+#, 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:1627
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Usted perdi %d mensajes de %s por motivos desconocidos."
 
-#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1632
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:1688
-#: src/protocols/oscar/oscar.c:2141 src/protocols/yahoo/yahoo.c:585
+#: src/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:1649
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC envi el error: %s\n"
 
-#: src/protocols/oscar/oscar.c:1651
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Error de OSCAR SNAC"
 
-#: src/protocols/oscar/oscar.c:1668
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
-msgstr "Su mensaje a %d no fu enviado: %s"
-
-#: src/protocols/oscar/oscar.c:1669 src/protocols/oscar/oscar.c:1687
+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:1686
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Informacin de usuario de %s no disponible: %s"
 
-#: src/buddy.c:2060 src/protocols/oscar/oscar.c:1717
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "Icono de Amigo"
 
-#: src/buddy.c:2063 src/protocols/oscar/oscar.c:1720
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "Voz"
 
-#: src/buddy.c:2066 src/protocols/oscar/oscar.c:1723
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "Imagen de IM"
 
-#: src/buddy.c:494 src/buddy.c:2069 src/buddy.c:2507 src/prefs.c:2912
-#: src/protocols/oscar/oscar.c:1726
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Hablar"
 
-#: src/buddy.c:2072 src/protocols/oscar/oscar.c:1729
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Recibir Archivo"
 
-#: src/buddy.c:2075 src/protocols/oscar/oscar.c:1732
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Enviar Archivo"
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1736
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Juegos"
 
-#: src/buddy.c:2082 src/protocols/oscar/oscar.c:1739
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "Bolsa"
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1742
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "Enviar Lista de Amigos"
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1745
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "Bug de EveryBuddy"
 
-#: src/buddy.c:2091 src/protocols/oscar/oscar.c:1748
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: src/buddy.c:2094 src/protocols/oscar/oscar.c:1751
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2097 src/protocols/oscar/oscar.c:1754
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/buddy.c:2100 src/protocols/oscar/oscar.c:1757
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/buddy.c:2103 src/protocols/oscar/oscar.c:1760
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ICQ Desconocido"
 
-#: src/buddy.c:2106 src/protocols/oscar/oscar.c:1763
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1886
 #, fuzzy
 msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
-"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
-"SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
-"Device User<br>"
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Leyenda:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Usuario Normal de AIM<br><IMG SRC=\"aol_icon.gif\"> "
-": Usuario de AOL<br><IMG SRC=\"dt_icon.gif\"> : Usuario de prueba de "
-"AIM<br><IMG SRC=\"admin_icon.gif\"> : Administrador <br><IMG SRC=\"ab_icon.gif\"> : "
-"Agente Interactivo de ActiveBuddy<br><IMG SRC=\"wireless_icon.gif\"> : Usuario de"
-"dispositivo inalmbrico"
-
-#: src/protocols/oscar/oscar.c:1829
-#, fuzzy
+"<br><BODY BGCOLOR=WHITE><hr><I>Leyenda:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Usuario Normal de AIM<br><IMG SRC=\"aol_icon.gif\"> : Usuario de "
+"AOL<br><IMG SRC=\"dt_icon.gif\"> : Usuario de prueba de AIM<br><IMG SRC="
+"\"admin_icon.gif\"> : Administrador <br><IMG SRC=\"ab_icon.gif\"> : Agente "
+"Interactivo de ActiveBuddy<br><IMG SRC=\"wireless_icon.gif\"> : Usuario "
+"dedispositivo inalmbrico"
+
+#: src/protocols/oscar/oscar.c:1914
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1102,27 +1326,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1861
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>El usuario no tiene mensaje de ausencia</i>"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "Funcionalidades del Cliente: "
 
-#: src/protocols/oscar/oscar.c:1881
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>No se aport informacin</i>"
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "Su conexin puede haberse perdido."
 
-#: src/protocols/oscar/oscar.c:1905
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "Error de AOL"
 
-#: src/protocols/oscar/oscar.c:2140
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
@@ -1130,23 +1354,35 @@
 "El ltimo mensaje no se envi, por haber superado el lmite de cadencia. Por "
 "favor, espere 10 segundos y vuelva a intentarlo."
 
-#: src/dialogs.c:3563 src/protocols/oscar/oscar.c:2482
-#: src/protocols/oscar/oscar.c:3407 src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
+#: src/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:3079 src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3207
+#, 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
 msgid "Exchange:"
 msgstr "Intercambio:"
 
-#: src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a IM"
 
-#: src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1157,11 +1393,30 @@
 "permitir ver su direccin IP y puede ser un riesgo de seguridad. Desea "
 "continuar?"
 
-#: src/protocols/oscar/oscar.c:3450
+#: src/protocols/oscar/oscar.c:3583
+#, 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
+#, 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
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "Mensaje de Ausencia"
+
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "IM Directo"
 
-#: src/protocols/oscar/oscar.c:3458
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "Obtener funcionalidades"
 
@@ -1309,7 +1564,7 @@
 msgid "Password Change Successful"
 msgstr "Se cambi la Contrasea con xito"
 
-#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Cambiar Contrasea"
 
@@ -1327,68 +1582,69 @@
 msgid "TOC Pause"
 msgstr "Pausa de TOC"
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Obtener Informacin del Directorio"
 
-#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "No se pudo conectar para realizar la transferencia!"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "No se pudo escribir la cabecera del archivo!"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - Guardar Como..."
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s le pide a %s que acepte el archivo %d: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s le pide a %s que acepte %d archivos: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s le pide que le mande un archivo"
 
-#: src/protocols/yahoo/yahoo.c:585
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "Su mensaje no se envi."
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Clase:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "Instancia:"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "Destinatario:"
 
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Acerca de Gaim v%s"
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1399,6 +1655,16 @@
 "URL: "
 
 #: src/about.c:137
+msgid ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+msgstr ""
+"\n"
+"\n"
+"IRC: canal #gaim en irc.openprojects.net"
+
+#: src/about.c:147
 #, fuzzy
 msgid ""
 "Active Developers\n"
@@ -1437,98 +1703,93 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (autor original)      [ markster@marko.net ]"
 
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2633 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2795
-#: src/dialogs.c:568 src/dialogs.c:3858 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1050
-msgid "Close"
-msgstr "Cerrar"
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Pgina Web"
 
-#: src/aim.c:151 src/buddy.c:2626
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Desconectar"
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "Por favor, indique su nombre de cuenta"
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Error de Conexin"
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Conexin - Gaim"
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "Nombre de Usuario:"
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr "Contrasea: "
 
-#: src/aim.c:316 src/buddy.c:2630
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Salir"
 
-#: src/aim.c:321 src/aim.c:819 src/buddy.c:2656
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "Conectar"
 
-#: src/aim.c:355
+#: src/aim.c:357
 msgid "About"
 msgstr "Acerca de..."
 
-#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
+#: src/aim.c:358
 msgid "Options"
 msgstr "Opciones"
 
-#: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:816 src/buddy.c:2666
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/applet.c:199
+#: src/aim.c:844 src/multi.c:1479
+#, fuzzy
+msgid "Auto-login"
+msgstr "Auto Conectarse"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "Tratando de conectar..."
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "Desconectado. Haga click para abrir ventana para conectarse."
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr "Ausente: %d en espera."
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "Ausente."
 
-#: src/applet.c:296 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "No pudo crearse el programa Gaim"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr "Acerca de..."
 
@@ -1552,87 +1813,73 @@
 msgid "Set All Away"
 msgstr "Ausente en todas las cuentas"
 
-#. Put the buttons in the box
-#: src/buddy.c:488 src/buddy.c:2741 src/buddy_chat.c:1443
-#: src/conversation.c:2328 src/conversation.c:2810 src/dialogs.c:890
-#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
-#: src/prefs.c:2371 src/prefs.c:2405
-msgid "Add"
-msgstr "Aadir"
-
-#: src/buddy.c:489 src/buddy.c:2742 src/dialogs.c:900 src/dialogs.c:1047
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Grupo"
 
-#: src/buddy.c:490 src/buddy.c:2743 src/buddy_chat.c:1445
-#: src/conversation.c:2314 src/conversation.c:2807 src/prefs.c:2043
-#: src/prefs.c:2375 src/prefs.c:2409
-msgid "Remove"
-msgstr "Quitar"
-
-#: src/buddy.c:495 src/buddy.c:646 src/buddy.c:798 src/buddy.c:2505
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "Mensaje"
 
-#: src/buddy.c:496 src/buddy.c:2506 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2828
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Informacin"
 
-#. Put the buttons in the box
-#: src/buddy.c:651 src/buddy.c:803 src/dialogs.c:1039 src/dialogs.c:3417
-#: src/dialogs.c:3432
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:656 src/buddy.c:822
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "Aadir Aviso de Amigo"
 
-#: src/buddy.c:663 src/buddy.c:828
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Ver registro"
 
-#: src/buddy.c:785 src/buddy.c:816
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/buddy.c:810
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Quitar Alias"
 
-#: src/buddy.c:1581 src/buddy.c:2649
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "Aviso de Amigo"
 
-#: src/buddy.c:1661
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "Nuevo Aviso de Amigo"
 
-#: src/buddy.c:1679
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Quitar Aviso de Amigo"
 
-#: src/buddy.c:1707
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Haga click para editar]"
 
-#: src/buddy.c:2183
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Conectado: %s\n"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2270
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Advertencias: %d%%\n"
 
-#: src/buddy.c:2207
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Capacidades: %s\n"
 
-#: src/buddy.c:2211
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1643,117 +1890,131 @@
 "Nombre: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2215
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "Inactivo: "
 
-#: src/buddy.c:2286 src/buddy.c:2291
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s conectado."
 
-#: src/buddy.c:2350 src/buddy.c:2355
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s desconectado."
 
-#: src/buddy.c:2540
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Informacin sobre el Amigo seleccionado"
 
-#: src/buddy.c:2541 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "Mandar Mensaje Instantneo"
 
-#: src/buddy.c:2542
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Empezar/unirse a Conversacin de Amigos"
 
-#: src/buddy.c:2543
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Activar Mensaje de Ausencia"
 
-#: src/buddy.c:2606
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Archivo"
 
-#: src/buddy.c:2610
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Aadir Amigo"
 
-#: src/buddy.c:2612
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Unirse a una Conversacin"
 
-#: src/buddy.c:2614
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "Nuevo Mensaje Instantneo"
 
-#: src/buddy.c:2616 src/dialogs.c:749
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Informacin de Usuario"
 
-#: src/buddy.c:2621
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Importar Lista de Amigos"
 
-#: src/buddy.c:2639
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Herramientas"
 
-#: src/buddy.c:2662
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Acciones del Protocolo"
 
-#: src/buddy.c:2668
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Privacidad"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Ver Registro del Sistema"
 
-#: src/buddy.c:2680
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2683
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Cargar Script"
 
-#: src/buddy.c:2687
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Liberar Todos los Scripts"
 
-#: src/buddy.c:2691
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Enumerar Scripts"
 
-#: src/buddy.c:2699
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2793
+#, fuzzy
+msgid "Online Help"
+msgstr "Conectado"
+
+#: src/buddy.c:2794
+#, fuzzy
+msgid "Debug Window"
+msgstr "Mostrar ventana de Depuracin"
+
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: src/buddy.c:2721 src/prefs.c:2891
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Lista de Amigos"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Aadir un nuevo Amigo"
 
-#: src/buddy.c:2775
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Aadir un nuevo Grupo"
 
-#: src/buddy.c:2776
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Quitar Amigo/Grupo seleccionado"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Editar Amigos"
 
-#: src/buddy.c:2846
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista de Amigos"
 
@@ -1761,21 +2022,17 @@
 msgid "Join Chat"
 msgstr "Unirse a Conversacin"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "Conversacin de Amigos"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "Unirse a Conversacin como:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
-#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
-#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
-#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3419 src/dialogs.c:3600
-#: src/dialogs.c:3971 src/dialogs.c:4077 src/dialogs.c:4736 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c: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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1783,16 +2040,16 @@
 msgid "Join"
 msgstr "Unirse"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3427
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Amigo"
 
-#: src/buddy_chat.c:417 src/prefs.c:1992
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Mensaje"
 
@@ -1800,647 +2057,669 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invitar a un Amigo a la Conversacin"
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "No Ignorar"
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "Ignorar"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s en la sala"
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrado en la sala."
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ahora se llama %s"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha salido de la sala."
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Conversaciones"
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Topic:"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "0 personas en la sala"
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2839
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Enviar"
 
-#: src/buddy_chat.c:1447 src/conversation.c:2816
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/buddy_chat.c:1449 src/conversation.c:2822 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Advertir"
 
-#: src/conversation.c:413
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Guardar Conversacin"
 
-#: src/conversation.c:474
+#: src/conversation.c:492
 #, fuzzy
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Insertar Imagen"
 
-#: src/conversation.c:1278
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "No se pudo enviar el mensaje: Demasiado grande"
 
-#: src/conversation.c:1278 src/conversation.c:1282
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "Error de Mensaje"
 
-#: src/conversation.c:1282
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "No se pudo enviar el mensaje: Motivo desconocido"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1559
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Actualmente en %d, "
 
-#: src/conversation.c:1509
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Moviendo posicin a %d\n"
 
-#: src/conversation.c:2110 src/prefs.c:1305
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Texto en Negrita"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Negrita"
 
-#: src/conversation.c:2114
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Texto Inclinado"
 
-#: src/conversation.c:2115
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Inclinado"
 
-#: src/conversation.c:2118 src/prefs.c:1317
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Subrayar Texto"
 
-#: src/conversation.c:2119
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Subrayar"
 
-#: src/conversation.c:2123 src/prefs.c:1323
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Tachar el Texto"
 
-#: src/conversation.c:2123
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Tachar"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Disminuir tamao de fuente"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Pequeo"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Tamao de fuente normal"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2135
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Incrementar tamao de fuente"
 
-#: src/conversation.c:2135
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:2142 src/dialogs.c:2841 src/dialogs.c:2865
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Seleccionar fuente"
 
-#: src/conversation.c:2143
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Fuente"
 
-#: src/conversation.c:2146 src/prefs.c:1353
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Color del texto"
 
-#: src/conversation.c:2147 src/conversation.c:2151
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Color"
 
-#: src/conversation.c:2151 src/prefs.c:1371
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Color del fondo"
 
-#: src/conversation.c:2158 src/dialogs.c:2464
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Insertar Enlace"
 
-#: src/conversation.c:2159
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Enlace"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Insertar smiley"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2242
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Imagen de IM"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2242
 #, fuzzy
 msgid "Image"
 msgstr "Imagen"
 
-#: src/conversation.c:2172
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Habilitar registro"
 
-#: src/conversation.c:2173 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Registro"
 
-#: src/conversation.c:2182
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Guardar Conversacin"
 
-#: src/conversation.c:2183 src/dialogs.c:1640 src/dialogs.c:1824
-#: src/dialogs.c:3178 src/dialogs.c:3867 src/dialogs.c:4744
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Guardar"
 
-#: src/conversation.c:2187
-msgid "Enable sounds"
-msgstr "Habilitar Sonidos"
-
-#: src/conversation.c:2188
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/conversation.c:2668
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversaciones"
 
-#: src/conversation.c:2755
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Enviar mensaje como:"
 
-#: src/conversation.c:3373
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Guardar Icono"
 
-#: src/conversation.c:3400
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Deshabilitar Animaciones"
 
-#: src/conversation.c:3405
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Habilitar Animaciones"
 
-#: src/conversation.c:3411
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Ocultar Icono"
 
-#: src/conversation.c:3417
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Guardar Icono Como..."
 
-#: src/dialogs.c:413
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Advertir al usuario?"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Est seguro de querer advertir a %s?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Advertir annimamente?"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "Las advertencias annimas son menos duras."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Quitando '%s' de la lista de amigos.\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Borrar a %s?"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "Borrar Amigo"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
-msgstr "Est a punto de borrar a '%s' \nde su lista de amigos. Desea continuar?"
-
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+msgstr ""
+"Est a punto de borrar a '%s' \n"
+"de su lista de amigos. Desea continuar?"
+
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Aceptar"
 
-#. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
-#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
-#: src/dialogs.c:2469 src/dialogs.c:3976 src/dialogs.c:4082 src/multi.c:774
+#: src/dialogs.c: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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - Usuario de IM"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "Quien: "
 
-#: src/dialogs.c:756
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Usuario:"
 
-#. Finish up
-#: src/dialogs.c:783
+#: src/dialogs.c:802
+#, fuzzy
+msgid "Account:"
+msgstr "Cuenta"
+
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Obtener Informacin del Usuario"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Aadir Grupo"
 
-#: src/dialogs.c:923
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Aadir Grupo"
 
-#: src/dialogs.c:1007
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Aadir Amigo"
 
-#: src/dialogs.c:1019
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Aadir Amigo"
 
-#: src/dialogs.c:1029
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Contacto"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1055
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Aadir a"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Ausente!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Privacidad para"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Permitir que todos los usuarios me contacten"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Permitir slo a los siguientes usuarios"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Lista de Usuarios Permitidos"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Negar a todos"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Bloquear los siguientes usuarios"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Lista de Bloqueados"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Por favor indique el amigo con aviso."
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Error en Aviso de Amigo"
 
-#: src/dialogs.c:1228
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuevo Aviso de Amigo"
 
-#. <pounce type="who">
-#: src/dialogs.c:1239
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "Avisar a quin"
 
-#: src/dialogs.c:1250
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "Cuenta"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1276
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "Avisar Cundo"
 
-#: src/dialogs.c:1286
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Aviso al conectarse"
 
-#: src/dialogs.c:1295
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Aviso al dejar de estar ausente"
 
-#: src/dialogs.c:1304
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Aviso al dejar de estar inactivo"
 
-#: src/dialogs.c:1313
+#: src/dialogs.c:1767
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Aviso cuando el amigo le est escribiendo"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1323
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Accin del Aviso"
 
-#: src/dialogs.c:1334
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "Abrir Ventana de Mensage"
 
-#: src/dialogs.c:1343
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "Notificacin con un Popup"
 
-#: src/dialogs.c:1352
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "Enviar Mensaje"
 
-#: src/dialogs.c:1373
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Ejecutar orden para avisar"
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Avisar mediante sonido"
 
-#. </pounce type="action">
-#: src/dialogs.c:1417
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Guardar este aviso tras la activacin"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Crear Informacin del directorio"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "Informacin del Directorio"
 
-#: src/dialogs.c:1534
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dejar que bsquedas en la Web encuentren su informacin"
 
-#. Line 1
-#: src/dialogs.c:1537 src/dialogs.c:2242
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Nombre"
 
-#. Line 2
-#: src/dialogs.c:1548 src/dialogs.c:2254
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Segundo Nombre"
 
-#. Line 3
-#: src/dialogs.c:1560 src/dialogs.c:2266
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Apellido"
 
-#. Line 4
-#: src/dialogs.c:1571 src/dialogs.c:2278
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Apellido de Soltera"
 
-#. Line 6
-#: src/dialogs.c:1593 src/dialogs.c:2301
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "Estado"
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "Las contraseas no coinciden"
 
-#: src/dialogs.c:1658 src/dialogs.c:1663
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Error cambiando la contrasea"
 
-#: src/dialogs.c:1663
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Rellene todos los campos completamente"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Contrasea Original"
 
-#: src/dialogs.c:1732
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Nueva Contrasea"
 
-#: src/dialogs.c:1746
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Nueva Contrasea (de nuevo)"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Crear Informacin del Usuario"
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "A continucacin, los resultados de su bsqueda: "
 
-#: src/dialogs.c:2032 src/dialogs.c:2039
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Negar"
 
-#: src/dialogs.c:2078
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Aadir Permiso"
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Aadir Negacin"
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Guardar Conversacin"
 
-#: src/dialogs.c:2218 src/dialogs.c:2381
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Buscar un Amigo"
 
-#: src/dialogs.c:2346
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Encontrar amigo por informacin"
 
-#: src/dialogs.c:2375
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electrnico"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - Aadir URL"
 
-#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Seleccionar Color del Texto"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Seleccionar Color de Fondo"
 
-#: src/dialogs.c:2942
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importar a:"
 
-#: src/dialogs.c:2966
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar Lista de Amigos"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3033
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "No se puede crear un mensaje sin ttulo"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3040
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "No se puede crear un mensaje de ausencia vaco"
 
-#: src/dialogs.c:3108
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3118
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Ttulo del mensaje de ausencia: "
 
-#: src/dialogs.c:3170
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Usar"
 
-#: src/dialogs.c:3174
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Guardar y Usar"
 
-#. show everything
-#: src/dialogs.c:3372
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Sonrisa!"
 
-#: src/dialogs.c:3425
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Aadir Alias al Amigo"
 
-#: src/dialogs.c:3458
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Aadir Alias al Amigo"
 
-#: src/dialogs.c:3530
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Guardar Archivo de Registro"
 
-#: src/dialogs.c:3562
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "No se pudo borrar archivo %s - %s."
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Limpiar el registro?"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3776
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Fecha"
 
-#: src/dialogs.c:3839
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Conversacin"
 
-#: src/dialogs.c:3862
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Renombrar Grupo"
 
-#: src/dialogs.c:3950
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Renombrar Grupo"
 
-#: src/dialogs.c:3957 src/dialogs.c:4063
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Nuevo Nombre:"
 
-#: src/dialogs.c:4046
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Renombrar Amigo"
 
-#: src/dialogs.c:4056
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Renombrar Amigo"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4140
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Seleccionar Script en Perl"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "No se pudo abrir el archivo de configuracin %s."
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Error en las Preferencias"
 
@@ -2453,55 +2732,75 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error abriendo la conexin. \n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+msgid "Plugin Error"
+msgstr "Error de aadido"
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Cargar Icono de Amigo"
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "Icono de Amigo:"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/multi.c:511 src/prefs.c:1545
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Resetear"
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "Nombre de Usuario:"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "Alias"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "Recordar Constrasea"
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "Auto Conectarse"
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "Notificaciones de Correo Nuevo"
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr "Registrarse en el servidor"
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Modificar Cuenta"
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr "Introduzca Contrasea"
 
-#: src/multi.c:935
+#: src/multi.c:948
+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
 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."
@@ -2509,44 +2808,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:937
-msgid "Login Error"
-msgstr "Error de Conexin"
-
-#: src/multi.c:966
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Seguro que quiere borrar a %s?"
 
-#: src/multi.c:1003
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor de Cuentas"
 
-#: src/multi.c:1022
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Seleccionar Todo"
 
-#: src/multi.c:1027
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Seleccionar Auto"
 
-#: src/multi.c:1031
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "No Seleccionar Nada"
 
-#: src/multi.c:1045
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/multi.c:1049
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Conectar/Desconectar"
 
-#: src/multi.c:1053
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/multi.c:1368
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2555,567 +2850,384 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1387
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s no pudo conectarse"
 
-#: src/multi.c:1398
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "Aviso"
 
-#: src/multi.c:1408
+#: src/multi.c:1427
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s no pudo conectarse"
 
-#: src/multi.c:1409
+#: src/multi.c:1428
 #, fuzzy
 msgid "Connection Error"
 msgstr "Error de Conexin"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Scripts de Perl"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista de Plugins"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Plugins cargados"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Seleccionar Todo"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Ruta de Archivo:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Cargar"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Cargar plugin desde un archivo"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Configurar"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Configurar propiedades del plugin"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Recargar"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Recargar en plugin seleccionado"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Descargar"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Descargar el plugin seleccionado"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Opciones Generales"
-
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
-#: src/prefs.c:1889 src/prefs.c:2322
-msgid "All options take effect immediately unless otherwise noted."
-msgstr ""
-"Todas la opciones toman efecto inmediatamente si no se indica lo contrario"
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Miscelnea"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Usar botones sin bordes"
-
-#: src/prefs.c:224
+#: src/prefs.c:269
+#, fuzzy
+msgid "Windows"
+msgstr "Ventana de Mensajes"
+
+#: src/prefs.c:279
 msgid "Show Buddy Ticker"
 msgstr "Mostrar ventana de noticias"
 
-#: src/prefs.c:229
+#: src/prefs.c:280
 msgid "Show Debug Window"
 msgstr "Mostrar ventana de Depuracin"
 
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "Notificar a los amigos cuando les este escribiendo"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Mostrar el Tiempo de Inactividad de los Amigos"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "Ninguno"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Uso de Gaim"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "Uso de X"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Guardar todas las conversaciones"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "Quitar HTML de los registros"
-
-#: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "Registrar cundo se concetan/desconcetan los amigos"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "Registrar cundo los amigos estn activos/inactivos"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "Registrar cundo los amigos se ausentan o regresan"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "Registrar sus propias conexiones/ausencias/inactividades"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "Un archivo de registro para la conexin de cada Amigo"
-
-#: src/prefs.c:279
-msgid "Browser"
-msgstr "Navegador"
-
-#: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:296
-msgid "Pop up new window by default"
-msgstr "Crear una nueva ventana por omisin"
-
-#: src/prefs.c:303
-msgid "GNOME URL Handler"
-msgstr "Manejador de URLs de GNOME"
-
-#: src/prefs.c:305
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:306
-msgid "Manual"
-msgstr "Manual"
-
-#: src/prefs.c:375
-msgid "Proxy Options"
-msgstr "Opciones del Proxy"
-
-#: src/prefs.c:387
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "Estado"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Usar botones sin bordes"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Tachar el Texto"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Cancelar"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Insertar smiley"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
-"No todos los protocolos pueden usar estas opciones del proxy. Por favor, lea "
-"el archivo README para ver los detalles."
-
-#: src/prefs.c:392
-msgid "Proxy Type"
-msgstr "Tipo de Proxy"
-
-#: src/prefs.c:404
-msgid "Proxy Server"
-msgstr "Servidor Proxy"
-
-#: src/prefs.c:407
-msgid "No Proxy"
-msgstr "Sin Proxy"
-
-#: src/prefs.c:419
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:429
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Color del texto"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Color del fondo"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Mostar caritas grficas"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Mostar la hora de los mensajes"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "Mostrar URLs como enlaces"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Destacar las faltas de ortografa"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "Ignorar colores"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "Ignorar estilos de fuente"
 
 #: src/prefs.c:438
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:462
-msgid "Host"
-msgstr "Host"
-
-#: src/prefs.c:478
-msgid "Port"
-msgstr "Puerto"
-
-#: src/prefs.c:495
-msgid "User"
-msgstr "Usuario"
+msgid "Ignore font sizes"
+msgstr "Ignorar tamaos de fuente"
+
+#: src/prefs.c:439
+msgid "Ignore TiK Automated Messages"
+msgstr "Ignorar Mensaje automticos de TiK"
+
+#: src/prefs.c:459
+msgid "Enter sends message"
+msgstr "Enter enva el mensaje"
+
+#: src/prefs.c:460
+msgid "Control-Enter sends message"
+msgstr "Control-Enter enva el mensaje"
+
+#: src/prefs.c:469
+msgid "Escape closes window"
+msgstr "Escape cierra la ventana"
+
+#: src/prefs.c:470
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "Escape cierra la ventana"
+
+#: src/prefs.c:480
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "Control-{B/I/U/S} inserta etiquetas HTML"
+
+#: src/prefs.c:481
+msgid "Control-(number) inserts smileys"
+msgstr "Control-(nmero) inserta smileys"
+
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr "Ocultar Botones de IM/Info/Chat"
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "Mostrar dibujos en los botones"
 
 #: src/prefs.c:511
-msgid "Password"
-msgstr "Contrasea"
-
-#: src/prefs.c:543
-msgid "Buddy List Options"
-msgstr "Opciones de la Lista de Amigos"
-
-#: src/prefs.c:555
-msgid "Buddy List Window"
-msgstr "Ventana de la Lista de Amigos"
-
-#: src/prefs.c:568
-#, fuzzy
-msgid "Tab Placement:"
-msgstr "Ubicacin de las pestaas"
-
-#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
-msgid "Top"
-msgstr "Arriba"
-
-#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
-msgid "Bottom"
-msgstr "Abajo"
-
-#: src/prefs.c:585
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Ocultar Botones de IM/Info/Chat"
-
-#: src/prefs.c:587
 msgid "Automatically show buddy list on sign on"
 msgstr "Mostrar automticamente la lista de amigos al conectarse"
 
-#: src/prefs.c:589
+#: src/prefs.c:513
 msgid "Display Buddy List near applet"
 msgstr "Mostar Lista de Amigos cerca del applet"
 
-#: src/prefs.c:592
+#: src/prefs.c:516
 msgid "Save Window Size/Position"
 msgstr "Guardar el Tamao/Posicin de las Ventanas"
 
-#: src/prefs.c:595
-msgid "Show pictures on buttons"
-msgstr "Mostrar dibujos en los botones"
-
-#: src/prefs.c:600
-msgid "Group Displays"
-msgstr "Grupos"
-
-#: src/prefs.c:612
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Alzar ventanas cuando se reciba un evento"
+
+#: src/prefs.c:526
 msgid "Hide groups with no online buddies"
 msgstr "Ocultar los grupos sin miembros conectados"
 
-#: src/prefs.c:618
+#: src/prefs.c:527
 msgid "Show numbers in groups"
 msgstr "Mostar nmeros en los grupos"
 
-#: src/prefs.c:620
-msgid "Buddy Displays"
-msgstr "Amigos"
-
-#: src/prefs.c:632
+#: src/prefs.c:536
 msgid "Show buddy type icons"
 msgstr "Mostar iconos de los tipos de amigos"
 
-#: src/prefs.c:633
+#: src/prefs.c:537
 msgid "Show warning levels"
 msgstr "Mostrar niveles de aviso"
 
-#: src/prefs.c:639
+#: src/prefs.c:538
 msgid "Show idle times"
 msgstr "Mostar el tiempo de inactividad"
 
-#: src/prefs.c:640
+#: src/prefs.c:539
 msgid "Grey idle buddies"
 msgstr "Poner en gris a los amigos inactivos"
 
-#: src/prefs.c:657
-msgid "Conversation Options"
-msgstr "Opciones de Conversacin"
-
-#: src/prefs.c:669
-msgid "Keyboard Options"
-msgstr "Opciones de teclado"
-
-#: src/prefs.c:681
-msgid "Enter sends message"
-msgstr "Enter enva el mensaje"
-
-#: src/prefs.c:682
-msgid "Control-Enter sends message"
-msgstr "Control-Enter enva el mensaje"
-
-#: src/prefs.c:683
-msgid "Escape closes window"
-msgstr "Escape cierra la ventana"
-
-#: src/prefs.c:689
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} inserta etiquetas HTML"
-
-#: src/prefs.c:690
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(nmero) inserta smileys"
-
-#: src/prefs.c:691
-msgid "F2 toggles timestamp display"
-msgstr "F2 muestra/oculta la hora"
-
-#: src/prefs.c:693
-msgid "Display and General Options"
-msgstr "Aspecto y Opciones generales"
-
-#: src/prefs.c:705
-msgid "Show graphical smileys"
-msgstr "Mostar caritas grficas"
-
-#: src/prefs.c:706
-msgid "Show timestamp on messages"
-msgstr "Mostar la hora de los mensajes"
-
-#: src/prefs.c:707
-msgid "Show URLs as links"
-msgstr "Mostrar URLs como enlaces"
-
-#: src/prefs.c:708
-msgid "Highlight misspelled words"
-msgstr "Destacar las faltas de ortografa"
-
-#: src/prefs.c:709 src/prefs.c:1911
-msgid "Sending messages removes away status"
-msgstr "El envo de un mensaje quita el estado de ausencia"
-
-#: src/prefs.c:710 src/prefs.c:1924
-msgid "Queue new messages when away"
-msgstr "Encolar nuevos mensajes durante las ausencias"
-
-#: src/prefs.c:716
-msgid "Ignore colors"
-msgstr "Ignorar colores"
-
-#: src/prefs.c:717
-msgid "Ignore font faces"
-msgstr "Ignorar estilos de fuente"
-
-#: src/prefs.c:718
-msgid "Ignore font sizes"
-msgstr "Ignorar tamaos de fuente"
-
-#: src/prefs.c:719
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignorar Mensaje automticos de TiK"
-
-#: src/prefs.c:720 src/prefs.c:1909
-msgid "Ignore new conversations when away"
-msgstr "Ignorar nuevas conversaciones mientras es ausente"
-
-#: src/prefs.c:909
-msgid "IM Options"
-msgstr "Opciones de Mensajes"
-
-#: src/prefs.c:922 src/prefs.c:2907
-msgid "IM Window"
-msgstr "Ventana de Mensajes"
-
-#: src/prefs.c:938 src/prefs.c:1088
-msgid "Show buttons as: "
-msgstr "Mostar los botonoes como:"
-
-#: src/prefs.c:942 src/prefs.c:1093
-msgid "Pictures And Text"
-msgstr "Dibujos y Texto"
-
-#: src/prefs.c:943 src/prefs.c:1095
-msgid "Pictures"
-msgstr "Dibujos"
-
-#: src/prefs.c:944 src/prefs.c:1096
-msgid "Text"
-msgstr "Texto"
-
-#: src/prefs.c:955
-msgid "Show all conversations in one tabbed window"
-msgstr "Mostar todas las conversaciones en una ventana con pestaas"
-
-#: src/prefs.c:957
-msgid "Show chats in the same tabbed window"
-msgstr "Mostar todas los chats en una unica ventana con pestaas"
-
-#: src/prefs.c:964 src/prefs.c:1116
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "Ancho de la nueva ventana:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "Alto de la nueva ventana:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Alto del campo de texto:"
+
+#: src/prefs.c:571 src/prefs.c:633
 msgid "Raise windows on events"
 msgstr "Alzar ventanas cuando se reciba un evento"
 
-#: src/prefs.c:965
-msgid "Show logins in window"
-msgstr "Mostar cuando los amigos se conectan/desconectan en la ventana"
-
-#: src/prefs.c:966
-msgid "Show aliases in tabs/titles"
-msgstr "Mostrar alias en las pestaas/ttulos"
-
-#: src/prefs.c:967
+#: src/prefs.c:572
 msgid "Hide window on send"
 msgstr "Esconder la ventana al enviar"
 
-#: src/prefs.c:969 src/prefs.c:1119
-msgid "Window Sizes"
-msgstr "Tamao de las ventanas"
-
-#: src/prefs.c:977 src/prefs.c:1127
-msgid "New window width:"
-msgstr "Ancho de la nueva ventana:"
-
-#: src/prefs.c:978 src/prefs.c:1128
-msgid "New window height:"
-msgstr "Alto de la nueva ventana:"
-
-#: src/prefs.c:979 src/prefs.c:1129
-msgid "Entry widget height:"
-msgstr "Alto del campo de texto:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "Tab Placement"
-msgstr "Ubicacin de las pestaas"
-
-#: src/prefs.c:1010 src/prefs.c:1160
-msgid "Left"
-msgstr "Izquierda"
-
-#: src/prefs.c:1012 src/prefs.c:1162
-msgid "Right"
-msgstr "Derecha"
-
-#: src/prefs.c:1016
-msgid "Buddy Icons"
-msgstr "Iconos de Amigos"
-
-#: src/prefs.c:1028
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "Ocultar Iconos de Amigos"
 
-#: src/prefs.c:1034
+#: src/prefs.c:582
 #, fuzzy
 msgid "Disable Buddy Icon Animation"
 msgstr "Deshabilitar Animaciones"
 
-#: src/prefs.c:1060
-msgid "Chat Options"
-msgstr "Opciones del Chat"
-
-#: src/prefs.c:1072
-msgid "Group Chat Window"
-msgstr "Ventana del Chat en Grupo"
-
-#: src/prefs.c:1107
-msgid "Show all chats in one tabbed window"
-msgstr "Mostar todos los Chats en una ventana con pestaas"
-
-#: src/prefs.c:1109
-msgid "Show conversations in the same tabbed window"
-msgstr "Mostar todas las conversaciones en una ventana con pestaas"
-
-#: src/prefs.c:1117
-msgid "Show people joining/leaving in window"
-msgstr "Mostrar la gente que se conecta/desconecta en la ventana"
-
-#: src/prefs.c:1165
-msgid "Tab Completion"
-msgstr "Tabulador"
-
-#: src/prefs.c:1177
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Mostar cuando los amigos se conectan/desconectan en la ventana"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "Notificar a los amigos cuando les este escribiendo"
+
+#: src/prefs.c:642
 msgid "Tab-Complete Nicks"
 msgstr "Tabulador completa los Apodos"
 
-#: src/prefs.c:1183
+#: src/prefs.c:643
 msgid "Old-Style Tab Completion"
 msgstr "Tabulador al estilo antiguo"
 
-#: src/prefs.c:1285 src/prefs.c:2917
-msgid "Font Options"
-msgstr "Opciones de Fuente"
-
-#: src/prefs.c:1311
-msgid "Italic Text"
-msgstr "Texto Inclinado"
-
-#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
-msgid "Select"
-msgstr "Seleccionar"
-
-#: src/prefs.c:1393
-msgid "Font Face for Text"
-msgstr "Tipo de Fuente para el Texto"
-
-#: src/prefs.c:1408
-msgid "Font Size for Text"
-msgstr "Tamao de Fuente para el Texto"
-
-#: src/prefs.c:1505
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Configuracin del Sonido"
-
-#: src/prefs.c:1540
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "Mostrar la gente que se conecta/desconecta en la ventana"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Mostar todos los Chats en una ventana con pestaas"
+
+#: src/prefs.c:679
+msgid "Show aliases in tabs/titles"
+msgstr "Mostrar alias en las pestaas/ttulos"
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "Mostar todos los Chats en una ventana con pestaas"
+
+#: src/prefs.c:704
 #, fuzzy
-msgid "Test"
-msgstr "Probar"
-
-#: src/prefs.c:1550
-msgid "Choose..."
-msgstr "Seleccionar..."
-
-#: src/prefs.c:1607
-msgid "Sound Options"
-msgstr "Opciones de Sonido"
-
-#: src/prefs.c:1635
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Mostar todas los chats en una unica ventana con pestaas"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Servidor Proxy"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Host"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Puerto"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Usuario"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Contrasea"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "Crear una nueva ventana por omisin"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Guardar todas las conversaciones"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "Quitar HTML de los registros"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "Registrar cundo se concetan/desconcetan los amigos"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Registrar cundo los amigos estn activos/inactivos"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Registrar cundo los amigos se ausentan o regresan"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Registrar sus propias conexiones/ausencias/inactividades"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "Un archivo de registro para la conexin de cada Amigo"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "Sin sonido al conectarse"
 
-#: src/prefs.c:1641 src/prefs.c:1910
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Sonidos mientras se est ausente"
 
-#: src/prefs.c:1651
-#, fuzzy
-msgid "Sound method"
-msgstr "Metodo para reproducin de Sonido"
-
-#: src/prefs.c:1725
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3124,107 +3236,127 @@
 "Comando para sonido\n"
 "(%s para nombre de archivo"
 
-#: src/prefs.c:1737
-#, fuzzy
-msgid "Sound played when:"
-msgstr "Reproducir Sonidos en:"
-
-#: src/prefs.c:1881 src/prefs.c:2939
-msgid "Away Messages"
-msgstr "Mensajes de Ausencia"
-
-#: src/prefs.c:1918
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "El envo de un mensaje quita el estado de ausencia"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "Encolar nuevos mensajes durante las ausencias"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "Ignorar nuevas conversaciones mientras es ausente"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "No enviar respuesta automtica"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "Slo enviar respuesta automtica en Inactivo"
 
-#: src/prefs.c:1934
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Tiempo entre el envo de respuestas automticas (en segundos):"
-
-#: src/prefs.c:1949
-msgid "Auto Away after"
-msgstr "Ausente tras"
-
-#: src/prefs.c:1963
-msgid "minutes using"
-msgstr "minutos usando"
-
-#: src/prefs.c:1976
-msgid "Messages"
-msgstr "Mensajes"
-
-#: src/prefs.c:2033
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Configuracin del Sonido"
+
+#: src/prefs.c:1338
+#, fuzzy
+msgid "Test"
+msgstr "Probar"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Seleccionar..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Editar"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Editar"
 
-#: src/prefs.c:2037
-msgid "Make Away"
-msgstr "Ponerme Ausente"
-
-#: src/prefs.c:2314
-msgid "Privacy Options"
-msgstr "Opciones de Privacidad"
-
-#: src/prefs.c:2330
-msgid "Set privacy for:"
-msgstr "Privacidad para"
-
-#: src/prefs.c:2349
-msgid "Allow all users to contact me"
-msgstr "Permitir que todos los usuarios me contacten"
-
-#: src/prefs.c:2350
-msgid "Allow only the users below"
-msgstr "Permitir slo a los siguientes usuarios"
-
-#: src/prefs.c:2352
-msgid "Allow List"
-msgstr "Lista de Usuarios Permitidos"
-
-#: src/prefs.c:2383
-msgid "Deny all users"
-msgstr "Negar a todos"
-
-#: src/prefs.c:2384
-msgid "Block the users below"
-msgstr "Bloquear los siguientes usuarios"
-
-#: src/prefs.c:2386
-msgid "Block List"
-msgstr "Lista de Bloqueados"
-
-#: src/prefs.c:2481
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "Instancia:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Fuente"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Mensaje"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "Ventana de Mensajes"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Ventana del Chat en Grupo"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Navegador"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Sonidos"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Eventos"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Ttulo del mensaje de ausencia: "
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "Mensajes de Ausencia"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
-#: src/prefs.c:2564
+#: src/prefs.c:1841
+#, fuzzy
+msgid "Apply"
+msgstr "Aplique"
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim ventana de respuestas del programa"
 
-#: src/prefs.c:2873
-msgid "General"
-msgstr "General"
-
-#: src/prefs.c:2878
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/prefs.c:2902
-msgid "Conversations"
-msgstr "Conversaciones"
-
-#: src/prefs.c:2928
-msgid "Sounds"
-msgstr "Sonidos"
-
-#: src/prefs.c:2950
-msgid "Privacy"
-msgstr "Privacidad"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3240,61 +3372,75 @@
 msgid "Protocol Error"
 msgstr "Error de Protocolo"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Acciones del Protocolo"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Desconectado"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Aceptar?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - Preguntar"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Correo Nuevo"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "Abrir Correo"
 
-#: src/prpl.c:564
-#, c-format
-msgid "%s%s%s%s has made %s their buddy%s%s%s"
+#: src/prpl.c:578
+#, 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:572
+#: src/prpl.c:586
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"Do you wish to add them to your buddy list?"
+"Do you wish to add him or her to your buddy list?"
 msgstr ""
 "\n"
 "\n"
 "Desea aadirlos a su lista de amigos?"
 
-#: src/prpl.c:615
+#: src/prpl.c:629
 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:652
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - Registro"
 
-#: src/prpl.c:667
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "Informacin de Registro"
 
-#: src/prpl.c:684
+#: src/prpl.c:698
 msgid "Register"
 msgstr "Registrar"
 
@@ -3302,54 +3448,275 @@
 msgid "Please enter your password"
 msgstr "Por favor, indique su contrasea"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d mensajes)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 mensaje)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "Advertido"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "S"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1054
+#: src/server.c:1101
 msgid "More Info"
 msgstr "Ms Informacin"
 
-#~ msgid "Available"
-#~ msgstr "Disponible"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Disponible slo para los amigos"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Ausente slo para los amigos"
-
-#~ msgid "Invisible"
-#~ msgstr "Invisible"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Invisible slo para los amigos"
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "Icono de Amigo"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "Amigo con Aviso:"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "Sonido cuando se recibe un mensaje"
+
+#: src/sound.c:66
+#, fuzzy
+msgid "Message received begins conversation"
+msgstr "Sonido cuando se recibe un mensaje que comienza una conversacin"
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "Mensajes"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Away from the computer"
+#~ msgstr "Ausente"
+
+#~ msgid "Idle"
+#~ msgstr "Ausente"
+
+#~ msgid "Be right back"
+#~ msgstr "Vuelvo enseguida"
+
+#~ msgid "On the phone"
+#~ msgstr "Al telfono"
+
+#~ msgid "Out to lunch"
+#~ msgstr "Sal a comer"
+
+#~ 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"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Miscelnea"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Mostrar el Tiempo de Inactividad de los Amigos"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Uso de Gaim"
+
+#~ msgid "X Use"
+#~ msgstr "Uso de X"
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "Manejador de URLs de GNOME"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Manual"
+#~ msgstr "Manual"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Opciones del Proxy"
 
 #~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim on irc.openprojects.net"
+#~ "Not all protocols can use these proxy options. Please see the README file "
+#~ "for details."
 #~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: canal #gaim en irc.openprojects.net"
+#~ "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"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Opciones de teclado"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 muestra/oculta la hora"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Aspecto y Opciones generales"
+
+#~ msgid "IM Options"
+#~ msgstr "Opciones de Mensajes"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Mostar los botonoes como:"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Dibujos y Texto"
+
+#~ msgid "Pictures"
+#~ msgstr "Dibujos"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Mostar todas las conversaciones en una ventana con pestaas"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Tamao de las ventanas"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Ubicacin de las pestaas"
+
+#~ msgid "Left"
+#~ msgstr "Izquierda"
+
+#~ 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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Texto Inclinado"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Tipo de Fuente para el Texto"
+
+#~ 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:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "Tiempo entre el envo de respuestas automticas (en segundos):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Ausente tras"
+
+#~ msgid "minutes using"
+#~ msgstr "minutos usando"
+
+#~ msgid "Make Away"
+#~ msgstr "Ponerme Ausente"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Opciones de Privacidad"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Conversations"
+#~ msgstr "Conversaciones"
 
 #~ msgid "Play"
 #~ msgstr "Reproducir"
@@ -3362,18 +3729,9 @@
 #~ "(%s para el nombre de archivo; si est vaco, se usar el reproductor "
 #~ "interno)"
 
-#~ msgid "Events"
-#~ msgstr "Eventos"
-
 #~ msgid "Sound when buddy logs out"
 #~ msgstr "Sonido cuando se desconecte un amigo"
 
-#~ msgid "Sound when received message begins conversation"
-#~ msgstr "Sonido cuando se recibe un mensaje que comienza una conversacin"
-
-#~ msgid "Sound when message is received"
-#~ msgstr "Sonido cuando se recibe un mensaje"
-
 #~ msgid "Sound when message is sent"
 #~ msgstr "Sonido cuando se enva un mensaje"
 
@@ -3431,24 +3789,9 @@
 #~ msgid "Logging in %s\n"
 #~ msgstr "Connectando %s\n"
 
-#~ msgid "Plugin Error"
-#~ msgstr "Error de aadido"
-
 #~ msgid "Tabbed Window Options"
 #~ msgstr "Opcioned de las ventanas con pestaas"
 
-#~ msgid "Gaim Chat"
-#~ msgstr "Gaim Conversaciones"
-
-#~ msgid "Refresh"
-#~ msgstr "Refrescar"
-
-#~ msgid "List of available chats"
-#~ msgstr "Lista de conversaciones disponibles"
-
-#~ msgid "List of subscribed chats"
-#~ msgstr "Lista de conversaciones subscritas"
-
 #~ msgid "Underlined Text"
 #~ msgstr "Texto Subrayado"
 
@@ -3551,9 +3894,6 @@
 #~ msgid "Error Resolving Mail Server.\n"
 #~ msgstr "Error Resolviendo el Servidor de correo.\n"
 
-#~ msgid "Buddy To Pounce:"
-#~ msgstr "Amigo con Aviso:"
-
 #~ msgid "Message to send:"
 #~ msgstr "Mensaje a mandar:"
 
@@ -3599,9 +3939,6 @@
 #~ msgid "Internal HTML Widget (Quite likely a bad idea!)"
 #~ msgstr "Programa de HTML Interno (Probablemente una idea mala!)"
 
-#~ msgid "Applet"
-#~ msgstr "Aplique"
-
 #~ msgid "Permit/Deny"
 #~ msgstr "Permitir/Denegar"
 
@@ -3614,9 +3951,6 @@
 #~ msgid "Remove buddy from permit/deny"
 #~ msgstr "Quitar amigo de autorizar/negar"
 
-#~ msgid "Idle"
-#~ msgstr "Inactivo"
-
 #~ msgid "Raise chat windows when people speak"
 #~ msgstr "Alzar ventana de conversacin cuando alguien hable"
 
--- a/po/fi.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/fi.po	Thu Aug 08 18:11:17 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.59\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -22,11 +22,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim Ryhmkeskustelu"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Sulje"
 
@@ -38,17 +38,16 @@
 msgid "Refresh"
 msgstr "Pivit"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "Lis"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "Poista"
 
@@ -72,7 +71,6 @@
 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:"
@@ -89,7 +87,7 @@
 msgid "Change"
 msgstr "Vaihda"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Tavoitettavissa"
 
@@ -97,8 +95,8 @@
 msgid "Available for friends only"
 msgstr "Tavoitettavissa vain ystville"
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Poissa"
 
@@ -114,7 +112,7 @@
 msgid "Invisible for friends only"
 msgstr "Nkymtn vain ystville"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "Tavoittamattomissa"
 
@@ -146,7 +144,7 @@
 msgid "Unknown Error Code."
 msgstr "Tuntematon virhekoodi."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
@@ -272,8 +270,7 @@
 msgid "Sex"
 msgstr "Sukupuoli"
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Kunta"
 
@@ -347,12 +344,9 @@
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: src/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
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
 
@@ -373,7 +367,7 @@
 msgstr "Lhet viesti palvelimen kautta"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Hae tiedot"
@@ -410,8 +404,7 @@
 msgid ""
 "%s has requested a DCC chat.  Would you like to establish the direct "
 "connection?"
-msgstr ""
-"%s on pyytnyt DCC-keskustelua. Haluatko muodostaa suoran yhteyden?"
+msgstr "%s on pyytnyt DCC-keskustelua. Haluatko muodostaa suoran yhteyden?"
 
 #: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
@@ -440,7 +433,7 @@
 msgid "Channel:"
 msgstr "Kanava:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Salasana:"
 
@@ -448,214 +441,224 @@
 msgid "DCC Chat"
 msgstr "DCC-keskustelu"
 
-#: src/protocols/jabber/jabber.c:942
+#: 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:943 src/protocols/jabber/jabber.c:948
+#: 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:947
+#: 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:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr "l hiritse"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr "Virhe %s: %s"
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, 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:1632
+#: src/protocols/jabber/jabber.c:1655
 msgid "No such user"
 msgstr "Palvelinta ei ole olemassa"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: 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/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Tuttavat"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "Tuntematon sisnkirjautumisvirhe"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 msgid "Password successfully changed."
 msgstr "Salasanan vaihto onnistui."
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "Yhteys kadotettu"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen eponnistui"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "Yhdistettyn"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "Pyydetn todennusmuotoa"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr "Yhdistetn"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: 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:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Huone:"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr "Kdensija:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 msgid "Chats"
 msgstr "Ryhmkeskustelut"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 msgid "View Error Msg"
 msgstr "Nyt virheviesti"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr "Poista tuttavalistalta"
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "Nyt ilmoitus"
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "Alue"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr "Seutu"
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "Postinumero"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Maa"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "Shkposti"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "Organisaatioyksikk"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Arvonimi"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr "Asema"
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "Syntympiv"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -663,23 +666,23 @@
 "Kaikki allaolevat kentt ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidt sopivana."
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr "Kyttjn henkilllisyys"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Muokkaa Jabberin vCardia"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "Palvelimelle rekisterityminen onnistui!"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "Tunnistamaton rekisterintivirhe"
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "Aseta kyttjtiedot"
 
@@ -833,8 +836,8 @@
 msgstr "Tuntematon virhekoodi"
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -842,97 +845,97 @@
 msgid "A message may not have been received."
 msgstr "Viesti ei ehk ole saatu vastaan"
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim ei kyennyt lhettmn viesti"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, 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:1074
+#: src/protocols/msn/msn.c:1076
 #, 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:1175
+#: src/protocols/msn/msn.c:1177
 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:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 msgid "Error reading from server"
 msgstr "Virhe luettaessa palvelimelta"
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr "Pyydetn salasanan lhettmist"
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 msgid "Unable to send password"
 msgstr "Ei kyetty lhettmn salasanaa"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 msgid "Password sent"
 msgstr "Salasana lhetetty"
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 msgid "Unable to write to server"
 msgstr "Palvelimelle ei kyetty kirjoittamaan"
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 msgid "Synching with server"
 msgstr "Synkronoidaan palvelimen kanssa"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Busy"
 msgstr "Varattu"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr "Nollaa tuttavanimi"
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr "Tuttavanimi liian pitk."
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 msgid "Set Friendly Name"
 msgstr "Aseta tuttavanimi"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 msgid "Set Friendly Name:"
 msgstr "Aseta tuttavanimi: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr "Nollaa kaikki tuttavanimet"
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Mihin ryhmn liitytn:"
@@ -1010,17 +1013,14 @@
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, evste lhetetty"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Kyttjtilisi palvelu on parhaillaan keskeytetty."
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1030,7 +1030,6 @@
 "ja yrit uudestaan. Jos jatkat yrittmist, joudut odottamaan viel "
 "pidempn."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Asiakasohjelmasi versio on liian vanha. Pivit "
@@ -1043,7 +1042,7 @@
 msgid "Internal Error"
 msgstr "Sisinen virhe"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviesti %s:n kanssa muodostettu"
@@ -1105,8 +1104,7 @@
 #, 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."
+msgstr "Et saanut %d viesti %s:lta koska taajuusraja ylittyi."
 
 #: src/protocols/oscar/oscar.c:1615
 #, c-format
@@ -1138,9 +1136,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Et saanut %d viesti %s:lta tuntemattomista syist."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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"
 
@@ -1177,68 +1175,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "%s:n kyttjtiedot eivt ole saatavilla: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "ni"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "Pikaviestikuva"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Ryhmkeskustelu"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Lhet tiedosto"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Pelit"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "Osakkeet"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "Lhet tuttavalista"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy-ohjelmistovirhe"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "AP-kyttj"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen vlitys"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ICQ tuntematon"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
@@ -1298,15 +1296,15 @@
 "Viimeist viesti ei lhetetty koska olet ylittnyt taajuusrajan. Odota 10 "
 "sekuntia ja yrit uudelleen."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1315,19 +1313,19 @@
 "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:3195
+#: src/protocols/oscar/oscar.c:3210
 msgid "Gaim - Warning"
 msgstr "Gaim - Varoitus"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vaihto:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Ei kyetty avaamaan suoraa pikaviestint"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1338,33 +1336,33 @@
 "antaa vastapuolen nhd IP-osoitteesi ja voi olla turvallisuusriski. "
 "Haluatko jatkaa?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
-"<B>UIN:</B> %s<BR><B>Tila:</B> %s<BR><HR><BR><I>Vastapuolen ohjelma ei "
-"tue tilaviestien lhettmist.</I><BR>"
-
-#: src/protocols/oscar/oscar.c:3575
+"<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
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
-"<B>UIN:</B> %s<BR><B>Tila:</B> %s<BR><HR><BR><I>Kyttjll ei ole tilaviestia."
-"</I><BR>"
-
-#: src/protocols/oscar/oscar.c:3600
+"<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
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "Hae kyvyt"
 
@@ -1509,7 +1507,7 @@
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Salasanan vaihto"
 
@@ -1648,14 +1646,11 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (alkuperinen tekij) [ markster@marko.net ]"
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Web-sivusto"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Kirjaudu ulos"
 
@@ -1663,7 +1658,7 @@
 msgid "Please enter your logon"
 msgstr "Anna sisnkirjautumistietosi"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Sisnkirjautumisvirhe"
 
@@ -1679,11 +1674,11 @@
 msgid "Password: "
 msgstr "Salasana: "
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Lopeta"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "Kyttjtilit"
 
@@ -1696,19 +1691,19 @@
 msgstr "Tietoja"
 
 # src/menus.c:311
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "Valinnat"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "Liitnniset"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 msgid "Auto-login"
 msgstr "Automaattinen sisnkirjautuminen"
 
@@ -1762,74 +1757,73 @@
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Ryhm"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Tietoja"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "Lis tuttavailmoitin"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Nyt loki"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Nime uudelleen"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Poista alias"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "Tuttavailmoitin"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Napsauta muokataksesi]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Kirjautuneena sisn: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Varoitukset: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Kyvyt: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1840,125 +1834,129 @@
 "Nyttnimi: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "Jouten: "
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s kirjautui sisn."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Tietoja valitusta tuttavasta"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "Lhet pikaviesti"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Aloita/liity tuttavakeskusteluun"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Aktivoi poissaoloviesti"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Tiedosto"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Lis tuttava"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Liity ryhmkeskusteluun"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Hae kyttjtiedot"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Tuo tuttavalista"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Tykalut"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Protokollatoiminnot"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Yksityisyys"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Nyt jrjestelmn loki"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Lataa skripti"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Poista kaikki skriptit"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Listaa skriptit"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Ohje"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 msgid "Online Help"
 msgstr "Tukea linjoilla"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 msgid "Debug Window"
 msgstr "Testausikkuna"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "Gaim:ista"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Lis uusi tuttava"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Lis uusi ryhm"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Poista valittu tuttava/ryhm"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Muokkaa tuttavia"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Tuttavalista"
 
@@ -1970,13 +1968,13 @@
 msgid "Join Chat As:"
 msgstr "Liity ryhmkeskusteluun nimell:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -1984,17 +1982,17 @@
 msgid "Join"
 msgstr "Liity"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Tuttava"
 
 # src/sidebar.c:103
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Viesti"
 
@@ -2002,68 +2000,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Kutsu tuttava keskusteluhuoneeseen"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Vlit"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "l vlit"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s huoneessa"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltn %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Yhdistetyt ryhmkeskustelut"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "0 ihmist huoneessa"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Kuiskaa"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Lhet"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Est"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Varoita"
 
@@ -2097,188 +2094,188 @@
 msgid "Setting position to %d\n"
 msgstr "Asetetaan sijainniksi %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Lihavoi teksti"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Kursivoi teksti"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Kursivoi"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Alleviivaa teksti"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Yliviivaa teksti"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Yliviivaa"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Pienenn fonttikokoa"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Pieni"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Normaali fonttikoko"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Suurenna fonttikokoa"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Suuri"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Valitse fontti"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Fontti"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Tekstin vri"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Vri"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Taustavri"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Lis linkki"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Linkki"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Lis hymi"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Hymi"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "Lis pikaviestikuva"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr "Kuva"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Ota kyttn kirjaaminen lokiin"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
 # src/menus.c:280
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "ni"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - Keskustelut"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Lhet viesti nimell: "
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Tallenna kuvake"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Poista animaatio kytst"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Ota animaatio kyttn"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimell..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Varoita kyttj?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Haluatko todella varoittaa kyttj %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Varoita nimettmn?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "Nimettmt varoitukset ovat vhemmn ankaria."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Poistetaan '%s' tuttavalistalta.\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Poista %s?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2287,361 +2284,381 @@
 "Olet poistamassa '%s':n tuttavalistaltasi.\n"
 "Haluatko jatkaa?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Hyvksy"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - Pikaviestimen kyttj"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "Pikaviesti kenelle:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Kyttj:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 msgid "Account:"
 msgstr "Kyttjtili:"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Hae kyttjtiedot"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Lis ryhm"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Lis ryhm"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Lis tuttava"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Lis tuttava"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Kontakti"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Lis"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Poissa!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Yksityisyysasetukset tilille:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Salli kaikkien kyttjien ottaa minuun yhteytt"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Salli vain allaolevat kyttjt"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Sallittujen lista"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Kiell kaikki kyttjt"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Kiell allaolevia kyttji"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Kiellettyjen lista"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Syt ilmoitettava tuttava."
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Tuttavailmoitinvirhe"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Uusi tuttavailmoitin"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "Kenest ilmoitetaan"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "Kyttjtili"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "Milloin ilmoitetaan"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Ilmoita sisnkirjautuessa"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Ilmoita palatessa oltuaan poissa"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Ilmoita palatessa oltuaan jouten"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "Ilmoitin kun tuttava kirjoittaa sinulle"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Ilmoittimen toiminto"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "Avaa pikaviesti-ikkuna"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "Nyt ilmoitus"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "Lhet viesti"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Suorita komento ilmoitettaessa"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Soita ni ilmoitettaessa"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Tallenna tm ilmoitin aktivoinnin jlkeen"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Aseta hakemistotiedot"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "Hakemistotiedot"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Salli verkkohaut tietojesi lytmiseksi"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Etunimi"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Entinen nimi"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "Lni"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "Uudet salasanat eivt tsm"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Salasanan muuttamisvirhe"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Tyt kaikki kentt kokonaan"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Vanha salasana"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Uusi salasana"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Aseta kyttjtiedot"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Alla ovat hakusi tulokset: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Salli"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Kiell"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Salli lis"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Kiell lis"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Kirjaa keskustelu lokiin"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Etsi tuttavaa"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Etsi tuttava tietojen perusteella"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Etsi tuttava shkpostin perusteella"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - Lis URL"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Valitse tekstin vri"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Valitse taustavri"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Tuo:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Tuo tuttavalista"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "Et voi luoda poissaoloviesti tyhjll otsikolla"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhj poissaoloviesti"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - Uusi poissaoloviesti"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Kyt"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Tallenna ja kyt"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Anna tuttavalle alias"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Tallenna lokitiedosto"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Ei kyetty poistamaan tiedostoa %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Tyhjenn loki?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "Selv"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Ajankohta"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Tyhjenn"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Nime ryhm uudelleen"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Nime ryhm uudelleen"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Uusi nimi:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Nime tuttava uudelleen"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Nime tuttava uudelleen"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Valitse Perlskripti"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ei voitu avata asetustiedostoa %s."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Asetusvirhe"
 
@@ -2670,7 +2687,7 @@
 msgid "Browse"
 msgstr "Selaa"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -2710,7 +2727,18 @@
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2718,44 +2746,40 @@
 "Et voi kirjata tt kyttjtili sisn. Et ole ladannut protokollaa, jota "
 "se kytt, tai protokollassa ei ole sisnkirjautumisfunktiota."
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "Sisnkirjautumisvirhe"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Tilin muokkaus"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Valitse automaattiset"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Poista valinnat"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Muuta"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Kirjaa sisn/ulos"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Poista"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2764,21 +2788,21 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s ei kyennyt kirjautumaan sisn"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "Ilmoitus"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s on kirjautunut ulos"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
@@ -2786,553 +2810,361 @@
 msgid "Perl Scripts"
 msgstr "Perlskripti"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Liitnnislista"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Liitnniset"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Ladatut liitnniset"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Valitse kaikki"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Tiedostopolku:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Lataa"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Lataa liitnninen tiedostosta"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Muuta asetuksia"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Muuta asetuksia valitulle liitnniselle"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Lataa uudelleen"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Lataa valittu liitnninen uudelleen"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Poista"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Poista valittu liitnninen"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Sulje tm ikkuna"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Yleiset valinnat"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "Kaikki muutokset tapahtuvat vlittmsti ellei muuta ole mainittu."
-
-# src/prefs.c:111
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Sekalaiset"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Kyt reunattomia painikkeita"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "Nyt rullaava tuttavataulu"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "Nyt testausikkuna"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "Ilmoita tuttaville kun kirjoitat heille"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Raportoi joutenoloajat"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "Ei mitn"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Gaim:in kytt"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "X:n kytt"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Kirjaa kaikki keskustelut lokiin"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "Poista HTML lokitiedostoista"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "Kirjaa lokiin tuttavien kirjautumiset sisn/ulos"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "Kirjaa lokiin tuttavien siirtymiset jouten-/paikallaoleviksi"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "Kirjaa lokiin tuttavien poistumiset/palaamiset"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "Kirjaa lokiin omat sisnkirjautumiset/joutenolot/poissaolot"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "Oma lokitiedosto joka tuttavan sisnkirjautumisille"
+#, fuzzy
+msgid "Windows"
+msgstr "Pikaviesti-ikkuna"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "Selain"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "Avaa uusi ikkuna oletuksena"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "Gnomen URL-ksittelij"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr "Kyttohje (URL:ksi %s)"
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Vlityspalvelimen valinnat"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Kaikki protokollat eivt voi kytt nit vlityspalvelinvalintoja. Lue "
-"README-tiedostosta yksityiskohdat."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Vlityspalvelimen tyyppi"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Vlityspalvelin"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Ei vlityspalvelinta"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgid "Show Buddy Ticker"
+msgstr "Nyt rullaava tuttavataulu"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "Nyt testausikkuna"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "Lni"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Kyt reunattomia painikkeita"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Yliviivaa teksti"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Peruuta"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Kyttj on liian aktiivinen"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Valitse"
+
+#: src/prefs.c:345
+#, fuzzy
+msgid "Use custom size"
+msgstr "Kyttj on liian aktiivinen"
+
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Tekstin vri"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Taustavri"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Nyt graafiset hymit"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Nyt aikaleimat viesteiss"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "Nyt URL:t linkkein"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Korosta vrinkirjoitetut sanat"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "l vlit vreist"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "l vlit fonttien tyypist"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "l vlit fonttien koosta"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "Verkkoasema"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Portti"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "Kyttj"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "Salasana"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "Tuttavalistan valinnat"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "Tuttavalistaikkuna"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr "Vlilehtien sijoitus:"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "Ylhll"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "Alhaalla"
-
-#: src/prefs.c:586
+msgid "Ignore TiK Automated Messages"
+msgstr "l vlit automatisoiduista TiK-viesteist"
+
+#: src/prefs.c:459
+msgid "Enter sends message"
+msgstr "\"Enter\" lhett viestin"
+
+#: src/prefs.c:460
+msgid "Control-Enter sends message"
+msgstr "\"Control-Enter\" lhett viestin"
+
+#: src/prefs.c:469
+msgid "Escape closes window"
+msgstr "\"Escape\" sulkee ikkunan"
+
+#: src/prefs.c:470
+msgid "Control-W closes window"
+msgstr "\"Control-W\" sulkee ikkunan"
+
+#: src/prefs.c:480
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "\"Control-{B/I/U/S}\" lis HTML-lapun"
+
+#: src/prefs.c:481
+msgid "Control-(number) inserts smileys"
+msgstr "\"Control-(numero)\" lis hymin"
+
+#: src/prefs.c:500
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Piilota pikaviesti-/tiedot- ja ryhmkeskustelupainikkeet"
 
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "Nyt automaattisesti tuttavalista kirjauduttaessa sisn"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "Nyt tuttavalista lhell sovelmaa"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Tallenna ikkunan koko/sijainti"
-
-#: src/prefs.c:596
+#: src/prefs.c:501
 msgid "Show pictures on buttons"
 msgstr "Nyt kuvat painikkeissa"
 
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr "Nosta tuttavalista sisn- ja uloskirjautumisten kohdalla"
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "Ryhmien nytt"
-
-#: src/prefs.c:614
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Nyt automaattisesti tuttavalista kirjauduttaessa sisn"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "Nyt tuttavalista lhell sovelmaa"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Tallenna ikkunan koko/sijainti"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Nosta ikkuna tapahtumahetkin"
+
+#: src/prefs.c:526
 msgid "Hide groups with no online buddies"
 msgstr "Piilota ryhmt joissa ei ole tuttavia linjoilla"
 
-#: src/prefs.c:620
+#: src/prefs.c:527
 msgid "Show numbers in groups"
 msgstr "Nyt mrt ryhmiss"
 
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "Tuttavien nytt"
-
-#: src/prefs.c:634
+#: src/prefs.c:536
 msgid "Show buddy type icons"
 msgstr "Nyt tuttavatyyppien kuvakkeet"
 
-#: src/prefs.c:635
+#: src/prefs.c:537
 msgid "Show warning levels"
 msgstr "Nyt varoitustasot"
 
-#: src/prefs.c:641
+#: src/prefs.c:538
 msgid "Show idle times"
 msgstr "Nyt joutenoloajat"
 
-#: src/prefs.c:642
+#: src/prefs.c:539
 msgid "Grey idle buddies"
 msgstr "Nyt jouten olevat tuttavat harmaina"
 
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "Keskusteluvalinnat"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Nppimistvalinnat"
-
-#: src/prefs.c:683
-msgid "Enter sends message"
-msgstr "\"Enter\" lhett viestin"
-
-#: src/prefs.c:684
-msgid "Control-Enter sends message"
-msgstr "\"Control-Enter\" lhett viestin"
-
-#: src/prefs.c:685
-msgid "Escape closes window"
-msgstr "\"Escape\" sulkee ikkunan"
-
-#: src/prefs.c:686
-msgid "Control-W closes window"
-msgstr "\"Control-W\" sulkee ikkunan"
-
-#: src/prefs.c:692
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "\"Control-{B/I/U/S}\" lis HTML-lapun"
-
-#: src/prefs.c:693
-msgid "Control-(number) inserts smileys"
-msgstr "\"Control-(numero)\" lis hymin"
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "Uuden ikkunan leveys:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "Uuden ikkunan korkeus:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Kirjoitusalueen korkeus:"
+
+#: src/prefs.c:571 src/prefs.c:633
+msgid "Raise windows on events"
+msgstr "Nosta ikkuna tapahtumahetkin"
+
+#: src/prefs.c:572
+msgid "Hide window on send"
+msgstr "Piilota ikkuna lhetettess"
+
+#: src/prefs.c:581
+msgid "Hide Buddy Icons"
+msgstr "Piilota tuttavakuvakkeet"
+
+#: src/prefs.c:582
+msgid "Disable Buddy Icon Animation"
+msgstr "Poista tuttavakuvakkeen animaatio kytst"
+
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Nyt sisnkirjautumiset ikkunassa"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "Ilmoita tuttaville kun kirjoitat heille"
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "\"Tab\"-tydenn lempinimet"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "Vanhanmallinen \"Tab\"-tydennys"
+
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "Nyt ihmisten saapuminen/poistuminen ikkunassa"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Nyt kaikki ryhmkeskustelut yhdess jaetussa ikkunassa"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "Nyt aliakset vlilehdiss/otsikoissa/vierittimess"
 
 #: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 asettaa aikaleiman plle/pois"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "Nytt- ja yleiset valinnat"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "Nyt graafiset hymit"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "Nyt aikaleimat viesteiss"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "Nyt URL:t linkkein"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Korosta vrinkirjoitetut sanat"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "Viestien lhettminen poistaa poissaolotilan"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "Laita uudet viestit jonoon poissaollessa"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "l vlit vreist"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "l vlit fonttien tyypist"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "l vlit fonttien koosta"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "l vlit automatisoiduista TiK-viesteist"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "l vlit uusista keskusteluista poissaollessa"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "Pikaviestivalinnat"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "Pikaviesti-ikkuna"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "Nyt painikkeissa: "
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "Kuvat ja teksti"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "Kuvat"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "Teksti"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "Nyt kaikki keskustelut yhdess jaetussa ikkunassa"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "Nyt ryhmkeskustelut samassa jaetussa ikkunassa"
-
-#: src/prefs.c:967 src/prefs.c:1119
-msgid "Raise windows on events"
-msgstr "Nosta ikkuna tapahtumahetkin"
-
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "Nyt sisnkirjautumiset ikkunassa"
-
-#: src/prefs.c:969
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "Nyt aliakset vlilehdiss/otsikoissa/vierittimess"
-
-#: src/prefs.c:970
-msgid "Hide window on send"
-msgstr "Piilota ikkuna lhetettess"
-
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "Ikkunakoot"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "Uuden ikkunan leveys:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "Uuden ikkunan korkeus:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Kirjoitusalueen korkeus:"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Vlilehtien sijoitus"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "Vasemmalla"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "Oikealla"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "Tuttavakuvakkeet"
-
-#: src/prefs.c:1031
-msgid "Hide Buddy Icons"
-msgstr "Piilota tuttavakuvakkeet"
-
-#: src/prefs.c:1037
-msgid "Disable Buddy Icon Animation"
-msgstr "Poista tuttavakuvakkeen animaatio kytst"
-
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "Ryhmkeskusteluvalinnat"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "Ryhmkeskustelu-ikkuna"
-
-#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Nyt kaikki ryhmkeskustelut yhdess jaetussa ikkunassa"
 
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "Nyt keskustelut samassa jaetussa ikkunassa"
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "Nyt ihmisten saapuminen/poistuminen ikkunassa"
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "\"Tab\"-tydennys"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "\"Tab\"-tydenn lempinimet"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "Vanhanmallinen \"Tab\"-tydennys"
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "Fonttivalinnat"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "Kursivoitu teksti"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "Valitse"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "Tekstin fontin tyyppi"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "Tekstin fonttikoko"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - niasetukset"
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "Kokeilu"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "Valitse..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "nivalinnat"
-
-#: src/prefs.c:1649
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Nyt ryhmkeskustelut samassa jaetussa ikkunassa"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Vlityspalvelin"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Verkkoasema"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Portti"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Kyttj"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Salasana"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "Avaa uusi ikkuna oletuksena"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Kirjaa kaikki keskustelut lokiin"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "Poista HTML lokitiedostoista"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "Kirjaa lokiin tuttavien kirjautumiset sisn/ulos"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Kirjaa lokiin tuttavien siirtymiset jouten-/paikallaoleviksi"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Kirjaa lokiin tuttavien poistumiset/palaamiset"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Kirjaa lokiin omat sisnkirjautumiset/joutenolot/poissaolot"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "Oma lokitiedosto joka tuttavan sisnkirjautumisille"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "Ei ni kun kirjaudut sisn"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "net poissaollessasi"
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "nimenetelm"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3341,106 +3173,125 @@
 "nikomento\n"
 "(%s tiedostonimeksi)"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "ni soitetaan kun:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "Poissaoloviestit"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "Viestien lhettminen poistaa poissaolotilan"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "Laita uudet viestit jonoon poissaollessa"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "l vlit uusista keskusteluista poissaollessa"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "l lhet automaattista vastausta"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "Lhet automaattinen vastaus vain jouten ollessa"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Aika automaattisten vastausten lhettmisten vleill (sekunneissa):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "Merkitse poissaolevaksi"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "minuutin jlkeen viestill"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "Viestit"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - niasetukset"
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr "Kokeilu"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Valitse..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Muokkaa"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "Luo poissaolo"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Yksityisyysvalinnat"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Yksityisyysasetukset tilille:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "Salli kaikkien kyttjien ottaa minuun yhteytt"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "Salli vain allaolevat kyttjt"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "Sallittujen lista"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "Kiell kaikki kyttjt"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "Kiell allaolevia kyttji"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "Kiellettyjen lista"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "Ilmentym:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Fontti"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Viesti lhetetty"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "Pikaviesti-ikkuna"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Ryhmkeskustelu-ikkuna"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Vlityspalvelin"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Selain"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "net"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "net"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Poissaolon otsikko: "
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "Poissaoloviestit"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Asetukset"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim-virheidenetsinnn tulostusikkuna"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Yleist"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Vlityspalvelin"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "Keskustelut"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "net"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Yksityisyys"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3457,37 +3308,50 @@
 msgid "Protocol Error"
 msgstr "Protokollavirhe"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Protokollatoiminnot"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Hyvksy?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - Kehote"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Uusi shkposti"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "Avaa shkposti"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 msgid ""
 "\n"
 "\n"
@@ -3497,7 +3361,7 @@
 "\n"
 "Haluatko list hnet tuttavalistallesi?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3505,15 +3369,15 @@
 "Sinulla ei ole tll hetkell kytettviss yhtn protokollaa joka kykenisi "
 "rekisterimn uusia kyttjtilej."
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - Rekisterinti"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "Rekisterintitiedot"
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "Rekisteri"
 
@@ -3521,28 +3385,28 @@
 msgid "Please enter your password"
 msgstr "Anna salasanasi"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d viesti)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "Varoitettu"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Kyll"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "Ei"
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr "Lis tietoja"
 
@@ -3586,3 +3450,194 @@
 msgid "Someone says your name in chat"
 msgstr "Joku sanoo nimesi ryhmkeskustelussa"
 
+#~ msgid "General Options"
+#~ msgstr "Yleiset valinnat"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr "Kaikki muutokset tapahtuvat vlittmsti ellei muuta ole mainittu."
+
+# src/prefs.c:111
+#~ msgid "Miscellaneous"
+#~ msgstr "Sekalaiset"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Raportoi joutenoloajat"
+
+#~ msgid "None"
+#~ msgstr "Ei mitn"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Gaim:in kytt"
+
+#~ msgid "X Use"
+#~ msgstr "X:n kytt"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "Gnomen URL-ksittelij"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ 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."
+#~ msgstr ""
+#~ "Kaikki protokollat eivt voi kytt nit vlityspalvelinvalintoja. Lue "
+#~ "README-tiedostosta yksityiskohdat."
+
+#~ msgid "Proxy Type"
+#~ msgstr "Vlityspalvelimen tyyppi"
+
+#~ msgid "No Proxy"
+#~ msgstr "Ei vlityspalvelinta"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Nppimistvalinnat"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 asettaa aikaleiman plle/pois"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Nytt- ja yleiset valinnat"
+
+#~ msgid "IM Options"
+#~ msgstr "Pikaviestivalinnat"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Nyt painikkeissa: "
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Kuvat ja teksti"
+
+#~ msgid "Pictures"
+#~ msgstr "Kuvat"
+
+#~ msgid "Text"
+#~ msgstr "Teksti"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Nyt kaikki keskustelut yhdess jaetussa ikkunassa"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Ikkunakoot"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Vlilehtien sijoitus"
+
+#~ msgid "Left"
+#~ msgstr "Vasemmalla"
+
+#~ msgid "Right"
+#~ msgstr "Oikealla"
+
+#~ msgid "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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Kursivoitu teksti"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Tekstin fontin tyyppi"
+
+#~ 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:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr ""
+#~ "Aika automaattisten vastausten lhettmisten vleill (sekunneissa):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Merkitse poissaolevaksi"
+
+#~ msgid "minutes using"
+#~ msgstr "minuutin jlkeen viestill"
+
+#~ msgid "Messages"
+#~ msgstr "Viestit"
+
+#~ msgid "Make Away"
+#~ msgstr "Luo poissaolo"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Yksityisyysvalinnat"
+
+#~ msgid "General"
+#~ msgstr "Yleist"
+
+#~ msgid "Conversations"
+#~ msgstr "Keskustelut"
--- a/po/fr.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/fr.po	Thu Aug 08 18:11:17 2002 +0000
@@ -8,9 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\n"
 "PO-Revision-Date: 2002-07-10 13:17GMT\n"
 "Last-Translator: sebfrance <sebfrance@ifrance.com>\n"
+"Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,11 +26,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Fermer"
 
@@ -42,17 +43,16 @@
 msgid "Refresh"
 msgstr "Rafraichir"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "Ajouter"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "Enlever"
 
@@ -76,7 +76,6 @@
 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:"
@@ -95,7 +94,7 @@
 msgid "Change"
 msgstr "Changer"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Disponible"
 
@@ -103,8 +102,8 @@
 msgid "Available for friends only"
 msgstr "Disponible pour les amis seulement"
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Absent"
 
@@ -120,7 +119,7 @@
 msgid "Invisible for friends only"
 msgstr "Invisible pour les amis seulement"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "Non disponible"
 
@@ -154,7 +153,7 @@
 msgid "Unknown Error Code."
 msgstr "Code d'Erreur Inconnu"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -281,8 +280,7 @@
 msgid "Sex"
 msgstr "Sexe"
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Ville"
 
@@ -361,12 +359,9 @@
 msgid "Directory Search"
 msgstr "Recherche dans l'annuaire"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: src/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
 msgid "Change Password"
 msgstr "Changer de Mot de Passe"
 
@@ -387,7 +382,7 @@
 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:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Obtenir des informations"
@@ -455,7 +450,7 @@
 msgid "Channel:"
 msgstr "Canal:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Mot de Passe:"
 
@@ -463,225 +458,237 @@
 msgid "DCC Chat"
 msgstr "Chat (Connection Directe)"
 
-#: src/protocols/jabber/jabber.c:942
+#: 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:943 src/protocols/jabber/jabber.c:948
+#: 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:947
+#: src/protocols/jabber/jabber.c:955
 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"
-
-#: src/protocols/jabber/jabber.c:1092
+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
 #, fuzzy
 msgid "Unknown"
 msgstr "Inconnu ICQ"
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "En Ligne"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr "Absent depuis longtemps"
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr "Ne Pas Dranger"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr "Erreur %s: %s"
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Code d'Erreur Inconnu"
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, 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:1632
+#: src/protocols/jabber/jabber.c:1655
 #, fuzzy
 msgid "No such user"
 msgstr "Pas de tel serveur"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: 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/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Contacts"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr "Authentication"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "Erreur de Connection Inconnue"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Changement de mot de passe effectu"
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim - Changement de mot de passe"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "Connection Perdu"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "Connect."
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "Requete de Mthode d'authentication"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr "Connection"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 #, fuzzy
 msgid "Invalid Jabber I.D."
 msgstr "Nom invalide"
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Salle:"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Serveur"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 #, fuzzy
 msgid "Handle:"
 msgstr "Gestionaire:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Voir les Logs"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Obtenir le Message d'absence"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr "Supprimer depuis Roster"
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "faire apparaitre la Notification"
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "Nom Complet"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "Nom de Famille"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "Nom Donn"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Rue"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "Rue (suite)"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "Localit"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr "Rgion"
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "Code Postal"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Pays"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "Tlphone"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "Nom de la companie"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "Dpartement"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Titre"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr "Rle"
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Description"
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -689,23 +696,23 @@
 "Tout les champs sont optionnels. Entrez uniquement les informations que vous "
 "desirez"
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr "Identit de l'utilisateur"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Editez la carte de visite Jabber"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "Enregistrement auprs du serveur russi"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "Erreur d'enregistrement inconnue"
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "Editer les Informations sur l'utilisateur"
 
@@ -874,8 +881,8 @@
 msgstr "Code d'Erreur Inconnu"
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -883,107 +890,107 @@
 msgid "A message may not have been received."
 msgstr "Un message ne peut pas avoir t reu."
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim n'a pas russi a envoyer le message"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, 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:1074
+#: src/protocols/msn/msn.c:1076
 #, 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:1175
+#: src/protocols/msn/msn.c:1177
 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:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Erreur  la lecture du socket"
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr "Demande pour envoyer le mot de passe"
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Incapable de lire le socket"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "Mot de Passe: "
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Incapable de se connecter au server"
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "S'enregistrer sur le serveur"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr "Occup"
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr "Revient dans quelques minutes"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "Contact"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr "Au tlphone"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr "Parti(e) manger"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "Cacher l'Icone"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr "Remettez  l'tat initial le nom"
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr "Le nom est trop long."
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Deuxime Prnom"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Pseudonyme: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr "Remettez  l'tat initial tout les noms"
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 msgid "Invalid name"
 msgstr "Nom invalide"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Joindre quel groupe:"
@@ -1061,17 +1068,14 @@
 msgid "Connection established, cookie sent"
 msgstr "Connection tablie, cookie envoy"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Pseudonyme ou Mot de Passe incorrect."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Votre accompte est actuellement suspendu"
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1081,7 +1085,6 @@
 "Ressayez. Si vous continuez d'essayer, il vous faudra attendre encore plus "
 "longtemps."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
@@ -1096,7 +1099,7 @@
 msgid "Internal Error"
 msgstr "Erreur Interne"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Connection directe avec %s tablie"
@@ -1108,7 +1111,8 @@
 "the following reason:\n"
 "%s"
 msgstr ""
-"L'utilisateur %lu a refus votre requete de s'ajouter  votre liste de contact pour la raison suivante:\n"
+"L'utilisateur %lu a refus votre requete de s'ajouter  votre liste de "
+"contact pour la raison suivante:\n"
 "%s"
 
 #: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
@@ -1123,7 +1127,9 @@
 #: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
-msgstr "L'utilisateur %lu a accord votre requete de le rajouter  votre liste de contact."
+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"
@@ -1190,9 +1196,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Vous avez rat %d messages de %s pour des raisons inconnues."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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"
 
@@ -1229,68 +1235,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "Les Informations sur l'utilisateur %s ne sont pas disponibles: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "Icone du contact"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "Voix"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "Transfer d'image"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Recevoir un Fichier"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Envoyer un Fichier"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Jeux"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "Bourse"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "Envoyer Liste de contacts"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "Bug d'EveryBuddy"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "Utilisateur AP"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "RTF ICQ"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "Nihiliste"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "relai de serveur ICQ"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "Inconnu ICQ"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "Encryption Trillian"
 
@@ -1350,37 +1356,38 @@
 "Le dernier message n'a pas t envoy car vous avez depass le quota limite "
 "Veuillez attendre 10 secondes et ressayez"
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, 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 ""
 "Le nombre maximum d'amis permis dans votre liste d'amis est %d, et vous avez "
-"%d. Jusqu' ce que vous soyez en dessous de la limite, certains amis ne s'afficheront pas online"
-
-#: src/protocols/oscar/oscar.c:3195
+"%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:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Echange:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Impossible d'ouvrir une connection directe"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1391,32 +1398,34 @@
 "permettre de voir votre ip, et rsulter en un risque de scurit. Voulez "
 "vous continuer?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
-msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Le client distant ne supporte pas l'envoi de message."
-
-#: src/protocols/oscar/oscar.c:3575
+msgstr ""
+"<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
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>L'utilisateur n'a pas de message de status."
-"</I><BR>"
-
-#: src/protocols/oscar/oscar.c:3600
+"<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
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Obtenir le Message d'absence"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "Connection directe"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "Obtenir les Possibilits"
 
@@ -1566,7 +1575,7 @@
 msgid "Password Change Successful"
 msgstr "Changement de mot de passe effectu"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Changement de mot de passe"
 
@@ -1704,14 +1713,11 @@
 "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"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Dconnection"
 
@@ -1719,7 +1725,7 @@
 msgid "Please enter your logon"
 msgstr "Entrez votre login"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Erreur de connection"
 
@@ -1735,11 +1741,11 @@
 msgid "Password: "
 msgstr "Mot de Passe: "
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "Accomptes"
 
@@ -1751,19 +1757,19 @@
 msgid "About"
 msgstr " Propos"
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "Options"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "Prfrences"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "Connection automatique"
@@ -1817,74 +1823,73 @@
 msgid "Set All Away"
 msgstr "Mettre le message d'absence sur tous les comptes"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Groupe"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Info"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "Ajouter une Alerte"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Voir les Logs"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Retirer l'alias"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "Alerte"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "Nouvelle Alerte"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Enlever une Alerte"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Cliquer pour diter]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Connect: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Attention: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Possibilits: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1895,127 +1900,131 @@
 "Pseudonyme: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "Inactif: "
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s s'est connect."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s s'est dconnect."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Information sur le contact slectionn"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "Envoyer un message"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Ouvrir/joindre un Chat"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Activer le message d'absence"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Fichier"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Ajouter un Contact"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Joindre le Chat"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "Nouveau message"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Obtenir les Informations Utilisateur"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Importer une Liste de Contacts"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Outils"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Actions du Protocol"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Filtre"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Voir les Logs du systme"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Charger un script"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Dcharger tous les scripts"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Lister les scripts"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Aide"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr "En Ligne"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr "Afficher la fenetre de debug"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr " propos de Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Liste de Contacts"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Ajouter un Nouveau Contact"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Ajouter un Nouveau Groupe"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Supprimer le Contact/Groupe slectionn"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Editer sa liste de contacts"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Liste de Contacts"
 
@@ -2027,13 +2036,13 @@
 msgid "Join Chat As:"
 msgstr "Joindre le Chat en tant que:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -2041,16 +2050,16 @@
 msgid "Join"
 msgstr "Joindre"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Contact"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Message"
 
@@ -2058,68 +2067,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Inviter le contact dans un salon de Chat"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Ne plus Ignorer"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "Ignorer"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s dans le salon"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s est entr dans le salon."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est dsormais connu sous le nom de %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a quitt le salon (%s)."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s a quitt le salon."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - groupe de discussion"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Sujet: "
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "Personne dans ce Salon"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Murmurer"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Donner un Avertissement"
 
@@ -2153,187 +2161,187 @@
 msgid "Setting position to %d\n"
 msgstr "Positionn  %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Texte en Gras"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Gras"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Texte en Italique"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Italique"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Texte Soulign"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Soulign"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Texte Barr"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Barr"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Police plus Petite"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Petit"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Police Normale"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Police plus Grande"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Grand"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Sectionner une police"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Police"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Couleur de texte"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Couleur"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Couleur de fond"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Insrer un Lien"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Lien"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Insrer un smiley"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "Inserer une d'image"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr "Image"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Activer l'enregistrement(Log)"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Enregistrement"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Sauver la conversations"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Son"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversations"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Envoyer le message en tant que: "
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Sauvegarder l'icone"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Dsactiver l'Animation"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Activer l'animation"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Cacher l'Icone"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Sauvegarder l'Icone sous..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Donner un Avertissement?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Voulez-vous rellement donner un avertissement  %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Donner un avertissement anonyme?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "Les avertissements anonymes sont moins durs."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Suppression de '%s' de la Liste de contacts\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Enlever %s?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "Enlever un Contact"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2342,363 +2350,383 @@
 "Vous tes sur le point d'enlever '%s'\n"
 "de votre liste de contacts, Voulez vous continer?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Accepter"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - Message  Utilisateur"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 #, fuzzy
 msgid "IM who:"
 msgstr "Envoyer un message  qui:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Utilisateur:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr "Comptes"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Obtenir les informations de l'utilisateur"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Ajouter un Groupe"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Ajouter un Groupe"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ajouter un Contact"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Ajouter un Contact"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Contact"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Ajouter "
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Absent!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Mettre en place un filtre pour:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Permettre  tous les utiliseurs de me contacter"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Permettre aux utiliseurs ci dessous"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "List de Permission"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Interdire  tous"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Bloquer les utilisateurs ci dessous"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Bloquer la liste"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Entrez un Contact pour la cration d'une alerte"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Erreur d'Alerte"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nouvelle Alerte"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "Alerter qui"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "Comptes"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "Alerter Quand"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Alerter  la connection"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Alerter lorsque le contact revient"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Alerter lorsque le contact redeviens actif"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "Alerter quand le contact vous crit"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Action de l'Alerte"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "Ouvrir la Fentre de message"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "faire apparaitre la Notification"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "Envoyer le message"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Executer une commande lors d'une alerte"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Jouer un son lors d'une alerte"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Sauvegarder cette alerte pour un usage ultrieur"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Donner vos informations personnelles"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "Information de l'annuaire"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Autoriser les recherches sur le web  trouver vos informations"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Prnom"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Deuxime prnom"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Nom"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Nom de jeune-fille"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "Etat"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "Les nouveaux password diffrent"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: 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:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Remplissez tous les champs"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Mot de Passe courant"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Nouveau Mot de Passe"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Nouveau Mot de passe (confirmation)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - regler les informations de l'utilisateur"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Voici les rsultats de votre recherche: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Autoriser"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Refuser"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ajouter Authorisation"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ajouter Refus"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Enregistrer la Conversation"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Rechercher un Contact"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - trouver un Contact d'aprs ses Infos."
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Trouver un Contact d'aprs son Email"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - Ajouter une adresse internet"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Selectionner la Couleur de Fond"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importer dans:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importer la liste de Contact"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "Vous ne pouvez crer un message d'absence avec un titre vide"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "Vous ne pouvez crer un message d'absence vide"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - Nouveau message d'absence"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Nouveau Message d'absence"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Titre du Message d'absence: "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Sauvegarder et Utiliser"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Souriez!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "surnommer un Contact"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - surnommer un Contact"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Sauver les fichiers de log"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Impossible de suprimer le fichier %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Effacer les logs?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "Ok"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Date"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Conversation"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Renommer groupe"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Renommer un groupe"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Nouveau Nom:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Renommer un Contact"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Renommer un Contact"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Selectionnez un script perl"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ne peux ouvrir le fichier de configuration %s."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Erreur de Prfrences"
 
@@ -2728,7 +2756,7 @@
 msgid "Browse"
 msgstr "Navigue"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Remise  zro"
 
@@ -2769,7 +2797,18 @@
 msgid "Enter Password"
 msgstr "Entrer le Mot de Passe"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2777,44 +2816,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:949
-msgid "Login Error"
-msgstr "Erreur de Connection"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Etes vous sur de vouloir effacer %s?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Liste des Comptes"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Selectionner tous"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Sectionner les connections automatiques"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Sectionner aucun"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Modifier"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Connection/Dconnection"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Effacer"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2823,21 +2858,21 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s n'a pas pu se connecter"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "Notification"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s a t dconnect"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr "Erreur de Connection"
 
@@ -2845,556 +2880,362 @@
 msgid "Perl Scripts"
 msgstr "Scripts Perl"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Liste des Plugins"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Plugins Chargs"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Selectionner tous"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Chemin du Fichier:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Charger"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Charger un plugin  partir du fichier"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Configurer"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Configure les options du plugin slectionn"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Recharger"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Recharger le plugin slectionn"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Dcharger"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Dcharger le Plugin slectionn"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Fermer cette fentre"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Options Gnrales"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr ""
-"Toutes les options sont prises en compte immdiatement sauf prcision du cas "
-"contraire."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Autres"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Utiliser des boutons sans bordures"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "Afficher la barre de Contact (Ticker)"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "Afficher la fenetre de debug"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "Notifier les contacts que vous tes en train de leur crire"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Afficher les dures d'inactivit"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "Aucune"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Utilisation de Gaim"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "Utilisation de X"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Enregistrer toutes les conversations"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "Enlever l'HTML des journaux"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "Enregistrer les connections/dconnection des contacts"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "Enregistrer lorsque les contacts deviennent actif/inactif"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "Enregistrer lorsque les contacts sont absent/de retour"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "Enregistrer vos propres connections, inactivits, absences"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "Journal individuel pour chaque contact"
+#, fuzzy
+msgid "Windows"
+msgstr "Fentre de message"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "Navigateur"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "Afficher une nouvelle fentre par dfaut"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "Programme de gestion d'adresses Gnome"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr "Manuel (%s pour URL)"
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Options du proxy"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Les protocoles ne peuvent pas tous utiliser les options de proxy. Veuillez "
-"lire le fichier READMEpour plus d'informations."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Type de Proxy"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Serveur de Proxy"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "pas de Proxy"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgid "Show Buddy Ticker"
+msgstr "Afficher la barre de Contact (Ticker)"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "Afficher la fenetre de debug"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "Etat"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Utiliser des boutons sans bordures"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Texte Barr"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Annuler"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "L'utilisateur est dj actif"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Sectionner"
+
+#: src/prefs.c:345
+#, fuzzy
+msgid "Use custom size"
+msgstr "L'utilisateur est dj actif"
+
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Couleur de texte"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Couleur de fond"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Afficher graphiquement les smileys"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Afficher l'heure sur les messages"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "Envoyer les URLs comme des liens"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Surligner les mots mal orthographis"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "Ignorer les couleurs"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "Ignorer les polices"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "Ignorer la taille des Polices"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "Hte"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Port"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "Utilisateur"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "Mot de Passe"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "Options de la Liste de Contacts"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "Fentre de la Liste de Contacts"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr "Placement des onglets"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "Haut"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "Bas"
-
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Cacher Message/Infos/Bouttons du Chat"
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "Afficher la liste des Contact automatiquement"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "Positionner la Liste des Contact prs de l'applet"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Mmoriser la Taille/Position des fentres"
-
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "Afficher les images sur les boutons"
-
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr "Liste des copains qui se connectent ou se dconnectent"
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "Affichage des groupes"
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "Cacher les groupes ne contenant aucun contact connect"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "Afficher le nombre de contacts dans les groupes"
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "Liste de Contacts"
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "afficher les icones des contacts"
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "Afficher le niveau d'Avertissement"
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "Afficher les temps d'inactivit"
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr "Griser les contacts inactifs"
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "Options de Conversation"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Options du Clavier"
-
-#: src/prefs.c:683
+msgid "Ignore TiK Automated Messages"
+msgstr "Ignorer les messages automatiques TiK"
+
+#: src/prefs.c:459
 msgid "Enter sends message"
 msgstr "La touche Entre envoie les messages"
 
-#: src/prefs.c:684
+#: src/prefs.c:460
 msgid "Control-Enter sends message"
 msgstr "Ctrl-Entre envoie les messages"
 
-#: src/prefs.c:685
+#: src/prefs.c:469
 msgid "Escape closes window"
 msgstr "Echap ferme la fentre"
 
-#: src/prefs.c:686
+#: src/prefs.c:470
 #, fuzzy
 msgid "Control-W closes window"
 msgstr "Ctrl-W ferme la fentre"
 
-#: src/prefs.c:692
+#: src/prefs.c:480
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S} insert des balises HTML"
 
-#: src/prefs.c:693
+#: src/prefs.c:481
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl-(nombre) insert un smiley"
 
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 affiche/cache l'affichage de l'heure"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "Options gnrales et d'affichage"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "Afficher graphiquement les smileys"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "Afficher l'heure sur les messages"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "Envoyer les URLs comme des liens"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Surligner les mots mal orthographis"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "L'envoi de message change le statut d'absence"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "Mise en attente des messages quand absent"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "Ignorer les couleurs"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "Ignorer les polices"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "Ignorer la taille des Polices"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignorer les messages automatiques TiK"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "Ignorer les nouvelles conversations lors des absences"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "Options de Message"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "Fentre de message"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "Afficher les boutons sous la forme:"
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "Images et textes"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "Images"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "Texte"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "Afficher toutes les conversations dans une fentre avec des onglets"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "Afficher les Chats dans la mme fentre avec onglets"
-
-#: src/prefs.c:967 src/prefs.c:1119
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr "Cacher Message/Infos/Bouttons du Chat"
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "Afficher les images sur les boutons"
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Afficher la liste des Contact automatiquement"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "Positionner la Liste des Contact prs de l'applet"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Mmoriser la Taille/Position des fentres"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Montrer les fentres recevant un message"
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "Cacher les groupes ne contenant aucun contact connect"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "Afficher le nombre de contacts dans les groupes"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "afficher les icones des contacts"
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "Afficher le niveau d'Avertissement"
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "Afficher les temps d'inactivit"
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr "Griser les contacts inactifs"
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "Largeur de la nouvelle fentre"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "Hauteur de la nouvelle fentre"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Hauteur de la zone de texte ( envoyer)"
+
+#: src/prefs.c:571 src/prefs.c:633
 msgid "Raise windows on events"
 msgstr "Montrer les fentres recevant un message"
 
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "Afficher les connections dans la fentre"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "Montre les alias dans les onglets/titres"
-
-#: src/prefs.c:970
+#: src/prefs.c:572
 msgid "Hide window on send"
 msgstr "Cacher la fentre lors de l'envoi"
 
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "Tailles des Fentres"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "Largeur de la nouvelle fentre"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "Hauteur de la nouvelle fentre"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Hauteur de la zone de texte ( envoyer)"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Placement des onglets"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "Gauche"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "Droite"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "Icones du contact"
-
-#: src/prefs.c:1031
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "Cacher l'Icone du Contact"
 
-#: src/prefs.c:1037
+#: src/prefs.c:582
 msgid "Disable Buddy Icon Animation"
 msgstr "Dsactiver l'animation de l'icone du Contact"
 
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "Options du Chat"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "Fentre de discution en groupe"
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr "Afficher tous les chats dans une fentre avec onglets"
-
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "Afficher les conversations dans une mme fentre avec onglets"
-
-#: src/prefs.c:1120
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Afficher les connections dans la fentre"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "Notifier les contacts que vous tes en train de leur crire"
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "Compltion des Pseudos"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "Compltion de mots (ancien style)"
+
+#: src/prefs.c:652
 msgid "Show people joining/leaving in window"
 msgstr "Afficher les arrive/dpart dans la fentre"
 
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "Compltion de mots"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "Compltion des Pseudos"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "Compltion de mots (ancien style)"
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "Options de police"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "Texte en Italique"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "Sectionner"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "Police pour le Texte"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "Taille de la police pour le Texte"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Configuration Sonore"
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "Tester"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "Choisir..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Options sonores"
-
-#: src/prefs.c:1649
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Afficher tous les chats dans une fentre avec onglets"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "Montre les alias dans les onglets/titres"
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "Afficher tous les chats dans une fentre avec onglets"
+
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Afficher les Chats dans la mme fentre avec onglets"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Serveur de Proxy"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Hte"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Port"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Utilisateur"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Mot de Passe"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "Afficher une nouvelle fentre par dfaut"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Enregistrer toutes les conversations"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "Enlever l'HTML des journaux"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "Enregistrer les connections/dconnection des contacts"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Enregistrer lorsque les contacts deviennent actif/inactif"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Enregistrer lorsque les contacts sont absent/de retour"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Enregistrer vos propres connections, inactivits, absences"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "Journal individuel pour chaque contact"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "Aucun son lors de votre connection"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Jouer les sons mme lorsque vous tes absent"
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "Methode Utilise"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3403,106 +3244,125 @@
 "Commande  utiliser\n"
 "(%s pour le nom de fichier)"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "Son jou lorsque:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "Messages d'absence"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "L'envoi de message change le statut d'absence"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "Mise en attente des messages quand absent"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "Ignorer les nouvelles conversations lors des absences"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "Ne pas envoyer de rponse automatique"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "envoyer la rponse automatique uniquement lors de l'inactivit"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Delai avant d'envoyer les rponses automatiques (en secondes)"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "Passer automatiquement en mode absent aprs"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "minutes en utilisant"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "Messages"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Configuration Sonore"
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr "Tester"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Choisir..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Editer"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Editer"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "Passer en mode 'absent'"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Options de filtrage"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Mettre en place un filtre pour:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "Permettre  tous les utiliseurs de me contacter"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "Permettre aux utiliseurs ci dessous"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "List de Permission"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "Interdire  tous"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "Bloquer les utilisateurs ci dessous"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "Bloquer la liste"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "Instance:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Police"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Message envoy"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "Fentre de message"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Fentre de discution en groupe"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Navigateur"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Sons"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Sons"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Titre du Message d'absence: "
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "Messages d'absence"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Prfrences"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "fentre de debug Gaim"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Gneral"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "Conversations"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Sons"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Filtre"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3519,38 +3379,51 @@
 msgid "Protocol Error"
 msgstr "Erreur de Protocole"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Actions du Protocol"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Dconnecter"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Accepter?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 #, fuzzy
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nouveau Courrier"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "Ouvrir le courrier"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 #, fuzzy
 msgid ""
 "\n"
@@ -3561,7 +3434,7 @@
 "\n"
 "Voulez vous l'ajouter  votre liste de contacts?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3569,15 +3442,15 @@
 "Vous n'avez pas de protocole disponible vous permettant de crer de nouveaux "
 "comptes"
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - Enregistrement d'un nouvel utilisateur"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "Information d'enregistrement"
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "S'enregistrer"
 
@@ -3585,28 +3458,28 @@
 msgid "Please enter your password"
 msgstr "Entrez votre mot de passe"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d messages)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "Avertit"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Oui"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "Non"
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr "Plus d'informations"
 
@@ -3654,6 +3527,198 @@
 msgid "Someone says your name in chat"
 msgstr "Quelqu'un a dit votre pseudo dans le chat"
 
+#~ 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 "
+#~ "cas contraire."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Autres"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Afficher les dures d'inactivit"
+
+#~ msgid "None"
+#~ msgstr "Aucune"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Utilisation de Gaim"
+
+#~ msgid "X Use"
+#~ msgstr "Utilisation de X"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "Programme de gestion d'adresses Gnome"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Options du Clavier"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 affiche/cache l'affichage de l'heure"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Options gnrales et d'affichage"
+
+#~ msgid "IM Options"
+#~ msgstr "Options de Message"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Afficher les boutons sous la forme:"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Images et textes"
+
+#~ msgid "Pictures"
+#~ msgstr "Images"
+
+#~ msgid "Text"
+#~ msgstr "Texte"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Afficher toutes les conversations dans une fentre avec des onglets"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Tailles des Fentres"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Placement des onglets"
+
+#~ msgid "Left"
+#~ msgstr "Gauche"
+
+#~ 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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Texte en Italique"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Police pour le Texte"
+
+#~ 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:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "Delai avant d'envoyer les rponses automatiques (en secondes)"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Passer automatiquement en mode absent aprs"
+
+#~ msgid "minutes using"
+#~ msgstr "minutes en utilisant"
+
+#~ msgid "Messages"
+#~ msgstr "Messages"
+
+#~ msgid "Make Away"
+#~ msgstr "Passer en mode 'absent'"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Options de filtrage"
+
+#~ msgid "General"
+#~ msgstr "Gneral"
+
+#~ msgid "Conversations"
+#~ msgstr "Conversations"
+
 #~ msgid "Enable sounds"
 #~ msgstr "Activer le son"
 
--- a/po/hu.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/hu.po	Thu Aug 08 18:11:17 2002 +0000
@@ -2,11 +2,10 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"Project-Id-Version: Gaim 0.60\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -24,11 +23,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim - Csevegs"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Bezr"
 
@@ -41,17 +40,16 @@
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "Hozzad"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "Elvtolt"
 
@@ -75,7 +73,6 @@
 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 +91,7 @@
 msgid "Change"
 msgstr "Csatorna:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Elrhet"
 
@@ -102,8 +99,8 @@
 msgid "Available for friends only"
 msgstr "Elrhet csak bartoknak"
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Tvol"
 
@@ -119,7 +116,7 @@
 msgid "Invisible for friends only"
 msgstr "Lthatatlan csak bartoknak"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "Nem elrhet"
 
@@ -151,7 +148,7 @@
 msgid "Unknown Error Code."
 msgstr "Ismeretlen hiba kd"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "llapot: %s"
@@ -276,8 +273,7 @@
 msgid "Sex"
 msgstr "Frfi/n"
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Vros"
 
@@ -351,12 +347,9 @@
 msgid "Directory Search"
 msgstr "Knyvtr keresse"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: 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
 msgid "Change Password"
 msgstr "Jelsz megvltoztatsa"
 
@@ -377,7 +370,7 @@
 msgstr "zenet kldse a kiszolgln keresztl"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Informcigyjts"
@@ -444,7 +437,7 @@
 msgid "Channel:"
 msgstr "Csatorna:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Jelsz:"
 
@@ -452,221 +445,231 @@
 msgid "DCC Chat"
 msgstr "DCC csevegs"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: 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:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "Elrhet"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr "Tvol a gptl"
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr "Ne zavarj"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Ismeretlen hiba kd"
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, 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:1632
+#: src/protocols/jabber/jabber.c:1655
 msgid "No such user"
 msgstr "Nincs ilyen felhasznl"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: 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/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Partnerek"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr "Azonosts"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "Ismeretlen bejelentkezsi hiba"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Jelsz sikeresen megvltoztatva"
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim - Jelsz megvltoztatsa"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "Kapcsolat megszakadt"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "Nem sikerl kapcsoldni"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "Kapcsoldva"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "Azonostsi mdszer lekrdezse"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr "Kapcsolatfelvtel"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: 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:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Szoba:"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Kiszolgl:"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr "Kezel:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "Csevegs"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Napl"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Tvol zenet lekrdezse"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "Elugr figyelmeztets"
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "Teljes nv"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "Csaldnv"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "Keresztnv"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "Becenv"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Utca"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "Tovbbi cm"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "Helysg"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr "Rgi"
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "Irnytszm"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Orszg"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "Telefonszm"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "Szervezet neve"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "Szervezeti egysg"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Titulus"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "Szletett"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Lers"
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -674,23 +677,23 @@
 "A kvetkez krdsek kzl csak azokra adj vlaszt, melyek nem rintenek "
 "knyelmetlenl."
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr "Azonost"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCard szerkesztse"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "Kiszolgl regisztrci sikerlt!"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "Ismeretlen regisztrcis hiba"
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "Felhasznli adatok"
 
@@ -859,8 +862,8 @@
 msgstr "Ismeretlen hiba kd"
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -868,106 +871,106 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim nem tudta az zenetet elkldeni"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "%s felhasznl szeretne tged a partnerei kzz felvenni."
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "%s felhasznl szeretne tged a partnerei kzz felvenni."
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 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:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Hiba a foglalat olvassakor."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Foglalatot nem lehet olvasni"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "Jelsz: "
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Nem sikerl a kiszolglhoz kapcsoldni"
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "Regisztrci a kiszolglval"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "Partner"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "Ikon elrejtse"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Vezetknv"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Kperny neve: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 msgid "Invalid name"
 msgstr "rvnytelen nv"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Melyik csoporthoz kapcsoldsz"
@@ -1045,17 +1048,14 @@
 msgid "Connection established, cookie sent"
 msgstr "Kapcsolat ltrejtt, cookie elkldve"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Hibs becenv vagy jelsz."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Fik jelenleg felfggesztve."
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1064,7 +1064,6 @@
 "Gyakran jelentkezel ki/be. Vrj 10 percig s prbld jra. Ha tovbb "
 "folytatod,mg tbbet kell majd vrnod."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Az gyfl program verzja rgi. Krlek frisstsd"
@@ -1077,7 +1076,7 @@
 msgid "Internal Error"
 msgstr "Bels hiba"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Kzvetlen IM kapcsolat %s-(val/vel) ltrejtt"
@@ -1129,11 +1128,19 @@
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Nem kaptl meg %d zenetet %s-tl mert tl hosszak voltak."
 
+# #: src/protocols/oscar/oscar.c:1605
+# #, c-format
+# msgid "You missed %d message from %s because the rate limit has been exceeded."
+# msgstr "Nhny %d zenet nem rkezett meg mivel a korltot meghaladta."
 #: src/protocols/oscar/oscar.c:1605
-#, c-format
+#, fuzzy, 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."
-
+msgstr "Nem kaptl meg %d zenetet %s-tl,mert meghaladta a korltot."
+
+# #: src/protocols/oscar/oscar.c:1605
+# #, c-format
+# msgid "You missed %d message from %s because the rate limit has been exceeded."
+# msgstr "Nhny %d zenet nem rkezett meg mivel a korltot meghaladta."
 #: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
@@ -1170,9 +1177,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Nem kaptl meg %d zenetet %s-tl ismeretlen okokbl."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c: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/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"
 
@@ -1209,68 +1216,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "Felhasznl informci %s nem elrhet: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "Buddy Ikon"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "Hang"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "IM kp"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Csevegs"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Fjl letltse"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Fjl kldse"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Jtkok"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "Kszlet"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "Partner lista kldse"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy hiba"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "AP felhasznl"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "ICQ kiszolgl kzvett"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ICQ ismeretlen"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "Trillian titkosts"
 
@@ -1330,15 +1337,15 @@
 "Az utols zenet nem lett elkldve mert a korltot meghaladtad. Krlek vrj "
 "10 msodpercet s prbld jra."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1347,19 +1354,19 @@
 "A megengedett partnerek szma maximum %d, jelenleg %d.  Amg a korltot el "
 "nem red, nhny partnered nem fog megjelenni elrhetknt."
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 msgid "Gaim - Warning"
 msgstr "Gaim - figyelmeztets"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vlts:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Nem sikerlt megnyitni a kzvetlen IM-et"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1369,7 +1376,7 @@
 "Kzvetlen IM kapcsolatot vlasztottl %s-(val/vel). Ezzel lthatv vlik az "
 "IP cmed. Folytatni akarod?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1378,7 +1385,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:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1387,15 +1394,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:3600
+#: src/protocols/oscar/oscar.c:3615
 msgid "Get Status Msg"
 msgstr "Sttsz zenet lekrdezse"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "Kzvetlen IM"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "Lehetsgek lekrdezse"
 
@@ -1539,7 +1546,7 @@
 msgid "Password Change Successful"
 msgstr "Jelsz vltoztats sikeres"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Jelsz megvltoztatsa"
 
@@ -1676,14 +1683,11 @@
 "Eric Warmenhoven                [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (eredeti szerz)   [ markster@marko.net ]"
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Web cm"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Kijelentkezs"
 
@@ -1691,7 +1695,7 @@
 msgid "Please enter your logon"
 msgstr "Add meg a belpsi neved"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Bejelentkezsi hiba"
 
@@ -1707,11 +1711,11 @@
 msgid "Password: "
 msgstr "Jelsz: "
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Kilp"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "Fikok"
 
@@ -1723,19 +1727,19 @@
 msgid "About"
 msgstr "Nvjegy"
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "Belltsok"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "Pluginek"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "Preferencik"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "Automatikus bejelentkezs"
@@ -1789,74 +1793,73 @@
 msgid "Set All Away"
 msgstr "Tvol mindenhonnan"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Csoport"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Informci"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "lnv"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "j figyelmeztets"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Napl"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "tnevez"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "lnv trlse"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "j"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Figyelmeztets trlse"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "Szerkesztshez kattints"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Bejelentkezve: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Figyelmeztetsek: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Lehetsgek: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1867,125 +1870,129 @@
 "Kperny neve: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "Inaktv: "
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s bejelentkezett."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s kijelentkezett."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Partner adatai"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "Azonnali zenet kldse"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "j csevegs/kapcsolds csevegshez"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Tvollt zenetnek aktivlsa"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Fjl"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Partner felvtele"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Csatlakozs egy csevegshez"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "j azonnali zenet"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Felhasznl adatai"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Partner lista importlsa"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Eszkzk"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Protokol esemnyek"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Biztonsg"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Napl megtekintse"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Script betltse"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "sszes script eltvoltsa"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Scriptek listja"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Sg"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 msgid "Online Help"
 msgstr "Sg"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 msgid "Debug Window"
 msgstr "Nyomkvet ablak"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "Gaim nvjegy"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Partner lista"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "j partner felvtele"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "j csoport felvtele"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Kivlasztott partner/csoport trlse"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Partnerek szerkesztse"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Partner lista"
 
@@ -1997,13 +2004,13 @@
 msgid "Join Chat As:"
 msgstr "Csatlakozs mint:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Mgsem"
 
@@ -2011,16 +2018,16 @@
 msgid "Join"
 msgstr "Csatlakozs"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Invitl"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Partner"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "zenet"
 
@@ -2028,68 +2035,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Partner inivitlsa a szobba"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Vissza"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "tlp"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s a szobban"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s belpett a szobba."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ezentl %s nven szerepel"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s elhagyta a szobt (%s)."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s elhagyta a szobt."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Csoportos csevegs"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Tma:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "0 tartzkodnak a szobban"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Pletyka"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Kld"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Tilt"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Figyelmeztet"
 
@@ -2123,187 +2129,187 @@
 msgid "Setting position to %d\n"
 msgstr "Pozci belltsa %d-(ra/re)\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Kvr szveg"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Kvr"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Dlt szveg"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Dlt"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Alhzott szveg"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Alhzott"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "thzott szveg"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "thzott"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Betmret cskkentse"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Kicsi"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Norml mret"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Norml"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Betmret nvelse"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Nagy"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Bettpus vlaszts"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Bettpus"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Szveg szne"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Szn"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Httr szn"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Hivatkozs beszrsa"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Hivatkozs"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Mosolyg arc beszrsa"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Mosolyg"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "IM kp beszrsa"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr "Kp"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Naplzs bekapcsolsa"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Naplzs"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Trsalgs mentse"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Ments"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Hang"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - Trsalgsok"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "zenet kldse mint: "
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Ikon mentse"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Animci kikapcsolsa"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Animci bekapcsolsa"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Ikon elrejtse"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Ikon mentse mint"
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Felhasznl figyelmeztetse?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Tnyleg akarod %s-t figyelmeztetni?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Figyelmeztets nv nlkl?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "A nvtelen figyelmeztetsek nem olyan kellemetlenek."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "'%s' elvtoltsa a listrl.\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Eltvoltsam %s-t?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "Partner trlse"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2312,361 +2318,381 @@
 "Elkvnod tvoltani '%s'-t a partnereid kzl.\n"
 "Folytatni akarod?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Elfogad"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "Rendben"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - IM felhasznl"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "IM kicsoda:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Felhasznl:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 msgid "Account:"
 msgstr "Fik:"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim -  Felhasznl adatai"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Csoport felvtele"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Csoport felvtele"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Partner felvtele"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Partner felvtele"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Kapcsolattart"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Hozzad a kvetkezhz"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Tvol!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Biztonsgi belltsa a kvetkez?re"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Mindenki kapcsolatba lphet velem"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Csak a kvetkez felhasznlk engedlyezse"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Engedlyezettek"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Minden felhasznl elutastsa"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "A kvetkez felhasznlk tiltsa"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Tilt lista"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Add meg a figyelmeztetst"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Figyelmeztetsi hiba"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - j figyelmeztets"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "Kit figyelmeztetsz"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "Fik"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "Mikor"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Bejelentkezskor"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Ha a tvollt megsznik"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Ha az inaktv llapot megsznik"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "Ha a partner szveget r nekem"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Figyelmeztetskor"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "IM ablak megnyitsa"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "Elugr figyelmeztets"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "zenet kldse"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Parancs vgrehajtsa"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Hang lejtszsa"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Figyelmeztets mentse aktivls utn"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Knyvtr adatainak belltsa"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "Knyvtr adatai"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Web keresk megtallhatjk az adataimat"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Keresztnv"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Kzps nv"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Vezetknv"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Lenykori nv"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "llam"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "j jelszavak nem egyeznek"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Jelsz vltoztatsi hiba"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Minden mezt ki kell tlteni"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Eredeti jelsz"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "j jelsz"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "j jelsz (mgegyszer)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Felhasznli adatok belltsa"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "A keress eredmnyei a kvetkezk: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Engedlyez"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Elutast"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Engedly felvtele"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Elutasts felvtele"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Trsalgs naplzsa"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Partner keresse"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Partner keresse adatok alapjn"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Partner keresse email cm alapjn"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - URL felvtele"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Szveg sznnek kivlasztsa"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Httr szn kivlasztsa"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importls a kvetkezbe:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Partner lista importlsa"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "Cm nlkl zenetet nem hozhatsz ltre"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "res zenetet nem hozhatsz ltre"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - j tvollt zenet"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "j tvollt zenet"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Tvollt fejlce: "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Alkalmaz"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Ment s alkalmaz"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Mosolyog!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Partner lneve"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Partner lneve"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Napl mentse"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Nem sikerl a %s fjl eltvoltsa - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Tnyleg trlni akarod a naplt?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "Rendben"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Dtum"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Trsalgs"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Trlse"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Csoport tnevezse"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Csoport tnevezse"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "j nv:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Partner tnevezse"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Partner tnevezse"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Perl sciprt kivlasztsa"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nem lehet a konfigurcis fjlt %s megnyitni."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Preferencik hiba"
 
@@ -2696,7 +2722,7 @@
 msgid "Browse"
 msgstr "Tallz"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Trl"
 
@@ -2736,7 +2762,18 @@
 msgid "Enter Password"
 msgstr "Jelsz megadsa"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2744,44 +2781,40 @@
 "Nem jelentkezhetsz be ezzel a fikkal. Nincs vagy nem a megfelel protokol "
 "van betltdve ami ezt a funckit vgrehajtan."
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "Bejelentkezsi hiba"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Biztos hogy trlni akarod %s?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Fik szerkesztse"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Mindent kivlaszt"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Automatikus kivlaszts"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Nincs kivlaszts"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Mdost"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Be/Ki jelentkezs"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Trls"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2790,21 +2823,21 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nem tudott bejelentkezni"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "Figyelmeztets"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s kilpett"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr "Hiba a kapcsolatban"
 
@@ -2812,553 +2845,360 @@
 msgid "Perl Scripts"
 msgstr "Perl scriptek"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Plugin lista"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Pluginek"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Pluginek betltse"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Mindent kivlaszt"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Elrsi t:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Betlts"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Plugin betltse fjlbl"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Konfigurci"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "A kivlasztott plugin opcii"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "jra betlt"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "A kivlasztott plugin jboli betltse"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Eltvolts"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "A kivlasztott plugin eltvoltsa"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Ablak bezrsa"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "ltalnos belltsok"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "Minden opci azonnal rvnybe lp mg msok figyelmeztetnek."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Specilis"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Szegly nlkli gombok hasznlata"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "Partner ra mutatsa"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "Nyomkvet ablak mutatsa"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "Partnerek figyelmeztetse gpelskor"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Inaktv id? jelentse"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "Nincs"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Gaim szerint"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "X szerint"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Trsalgsok naplzsa"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "HTML elemek nem kerljenek a naplzsra"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "Partnerek be/kilpsnek naplzsa"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "Partnerek (in)aktivitsnak naplzsa"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "Partnerek jelen/tvolltnek naplzsa"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "Belps/tvollt/inaktivits naplzsa"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "Minden belp partner kln naplfjlba"
+#, fuzzy
+msgid "Windows"
+msgstr "IM ablak"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "Bngsz?"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
+msgid "Show Buddy Ticker"
+msgstr "Partner ra mutatsa"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "Nyomkvet ablak mutatsa"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "llam"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Szegly nlkli gombok hasznlata"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "thzott szveg"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Mgsem"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Mosolyg arc beszrsa"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Kivlaszt"
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "j ablak el?ugrik (alaprtelmezsben)"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME URL kezel?"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Proxy belltsok"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Nem mindegyik protokol tudja ezeket a proxy belltsokat hasznlni. Olvasd "
-"el a README fjlt a rszletekrt."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Proxy tpusa"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Proxy kiszolgl"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Nincs Proxy"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Szveg szne"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Httr szn"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Mosoly megjelentse kpknt"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Id?pont megjelentse zeneteknl"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "URL-ek mutatsa hivatkozsknt"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Helytelen szavak kiemelse"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "Szinek figyelmenkvl hagysa"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "Bettpus figyelmenkvl hagysa"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "Betmretek figyelmenkivl hagysa"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "Gpnv"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Port"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "Felhasznl"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "Jelsz"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "Partnet lista belltsai"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "Partner lista"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr "Fl elhelyezse"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "Fell"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "Alul"
-
-#: src/prefs.c:586
+msgid "Ignore TiK Automated Messages"
+msgstr "TiK zenetek figyelmenkvl hagysa"
+
+#: src/prefs.c:459
+msgid "Enter sends message"
+msgstr "Enter zenetet kld"
+
+#: src/prefs.c:460
+msgid "Control-Enter sends message"
+msgstr "Control-Enter zenet kld"
+
+#: src/prefs.c:469
+msgid "Escape closes window"
+msgstr "Escape ablakot bezrja"
+
+#: src/prefs.c:470
+msgid "Control-W closes window"
+msgstr "Control-W ablak bezrsa"
+
+#: src/prefs.c:480
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "Control-{B/I/U/S} HTML cmkket szr be"
+
+#: src/prefs.c:481
+msgid "Control-(number) inserts smileys"
+msgstr "Control-(szm) mosoly beszrsa"
+
+#: src/prefs.c:500
 msgid "Hide IM/Info/Chat buttons"
 msgstr "IM/Informci/Csevegs gombok elrejtse"
 
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "Partner lista automatikus megjelentse bejelentkezskor"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "Partner lista megjelentse az applet mellett"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Ablak mretek/pozck mentse"
-
-#: src/prefs.c:596
+#: src/prefs.c:501
 msgid "Show pictures on buttons"
 msgstr "Kpek mutatsa gombokon"
 
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr "Partner lista megjelentse be/kijelentkezskor"
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "Csoportok megjelentsei"
-
-#: src/prefs.c:614
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Partner lista automatikus megjelentse bejelentkezskor"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "Partner lista megjelentse az applet mellett"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Ablak mretek/pozck mentse"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
+
+#: src/prefs.c:526
 msgid "Hide groups with no online buddies"
 msgstr "Elrhet partnerek nlkli csoportok elrejtse"
 
-#: src/prefs.c:620
+#: src/prefs.c:527
 msgid "Show numbers in groups"
 msgstr "Szmok megjelentse a csoportokban"
 
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "Partnerek megjelentsei"
-
-#: src/prefs.c:634
+#: src/prefs.c:536
 msgid "Show buddy type icons"
 msgstr "Partner tpusnak megfelel? ikonok hasznlata"
 
-#: src/prefs.c:635
+#: src/prefs.c:537
 msgid "Show warning levels"
 msgstr "Figyelmeztetsi szint megjelentse"
 
-#: src/prefs.c:641
+#: src/prefs.c:538
 msgid "Show idle times"
 msgstr "Inaktv id? megjelentse"
 
-#: src/prefs.c:642
+#: src/prefs.c:539
 msgid "Grey idle buddies"
 msgstr "Inaktv partnerek szrkn"
 
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "Trsalgsi belltsok"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Billenytzet belltsai"
-
-#: src/prefs.c:683
-msgid "Enter sends message"
-msgstr "Enter zenetet kld"
-
-#: src/prefs.c:684
-msgid "Control-Enter sends message"
-msgstr "Control-Enter zenet kld"
-
-#: src/prefs.c:685
-msgid "Escape closes window"
-msgstr "Escape ablakot bezrja"
-
-#: src/prefs.c:686
-msgid "Control-W closes window"
-msgstr "Control-W ablak bezrsa"
-
-#: src/prefs.c:692
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} HTML cmkket szr be"
-
-#: src/prefs.c:693
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(szm) mosoly beszrsa"
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "j ablak szlessge:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "j ablak magassga:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Input doboz magassga:"
+
+#: src/prefs.c:571 src/prefs.c:633
+msgid "Raise windows on events"
+msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
+
+#: src/prefs.c:572
+msgid "Hide window on send"
+msgstr "Ablak elrejtse kldskor"
+
+#: src/prefs.c:581
+msgid "Hide Buddy Icons"
+msgstr "Ikon elrejtse"
+
+#: src/prefs.c:582
+msgid "Disable Buddy Icon Animation"
+msgstr "Ikon animci tiltsa"
+
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Bejelentkezsek megjelentse ablakban"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "Partnerek figyelmeztetse gpelskor"
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "Becenv kiegsztse TAB-al"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "Rgi stlus kiegszts TAB-al"
+
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "Csatlakoz=kilp pertnerek mutatsa ablakban"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Minden egy ablakban trtn megjelentse"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "lnevek megjelentse a cmben/fleken"
 
 #: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2-vel id?pont formtum vltsa"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "ltalnos s megjelentsi belltsok"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "Mosoly megjelentse kpknt"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "Id?pont megjelentse zeneteknl"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "URL-ek mutatsa hivatkozsknt"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Helytelen szavak kiemelse"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "zenet kldse megsznteti a tvollt llapott"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "j zenetk vrakozsi sorba kerljenek ha tvol van"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "Szinek figyelmenkvl hagysa"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "Bettpus figyelmenkvl hagysa"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "Betmretek figyelmenkivl hagysa"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "TiK zenetek figyelmenkvl hagysa"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "j trsalgs figyelmenkvl hagysa ha tvol van"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "IM belltsok"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "IM ablak"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "Gombok megjelentse: "
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "Kpek s szveg"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "Kpek"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "Szveg"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "Minden trsalgs megjelentse egy ablakban"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "Csevegsek megjelentse ugyabban az ablakban"
-
-#: src/prefs.c:967 src/prefs.c:1119
-msgid "Raise windows on events"
-msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
-
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "Bejelentkezsek megjelentse ablakban"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "lnevek megjelentse a cmben/fleken"
-
-#: src/prefs.c:970
-msgid "Hide window on send"
-msgstr "Ablak elrejtse kldskor"
-
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "Ablak mretek"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "j ablak szlessge:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "j ablak magassga:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Input doboz magassga:"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Fl elhelyezkedse"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "Bal oldalon"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "Jobb oldalon"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "Ikonok"
-
-#: src/prefs.c:1031
-msgid "Hide Buddy Icons"
-msgstr "Ikon elrejtse"
-
-#: src/prefs.c:1037
-msgid "Disable Buddy Icon Animation"
-msgstr "Ikon animci tiltsa"
-
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "Csevegs belltsai"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "Csoportos cseveg ablak"
-
-#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Minden egy ablakban trtn megjelentse"
 
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "Trsalgsok megjelents ugyanabban az ablakban"
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "Csatlakoz=kilp pertnerek mutatsa ablakban"
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "Kiegszts"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "Becenv kiegsztse TAB-al"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "Rgi stlus kiegszts TAB-al"
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "Bettpusok belltsa"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "Dlt szveg"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "Kivlaszt"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "Szveg bettpusa"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "Szveg betmrete"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Hangok belltsa"
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "Prba"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "Kivlaszt..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Hangok belltsa"
-
-#: src/prefs.c:1649
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Csevegsek megjelentse ugyabban az ablakban"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Proxy kiszolgl"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Gpnv"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Port"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Felhasznl"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Jelsz"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "j ablak el?ugrik (alaprtelmezsben)"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Trsalgsok naplzsa"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "HTML elemek nem kerljenek a naplzsra"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "Partnerek be/kilpsnek naplzsa"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Partnerek (in)aktivitsnak naplzsa"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Partnerek jelen/tvolltnek naplzsa"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Belps/tvollt/inaktivits naplzsa"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "Minden belp partner kln naplfjlba"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "Nincs hang bejelentkezskor"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Hang lejtszsa mialatt tvol van"
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "Lejtszs mdja"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3367,106 +3207,125 @@
 "Parancs\n"
 "(%s fjl nv megadshoz)"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "Hang lejtszsa akkor, ha:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "Tvollt zenetek"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "zenet kldse megsznteti a tvollt llapott"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "j zenetk vrakozsi sorba kerljenek ha tvol van"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "j trsalgs figyelmenkvl hagysa ha tvol van"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "Nem kld automatikus vlaszokat"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "Automatikus vlaszok kldse csak inaktv llapotban"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Id automatikus vlaszok kldse kztt (msodpercben):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "Automatikus tvollt"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "perc utn a kvetkez?vel"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "zenetek"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Hangok belltsa"
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr "Prba"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Kivlaszt..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Szerkeszt"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Szerkeszt"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "Nincs a gpnl"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Biztonsgi belltsok"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Biztonsgi belltsa a kvetkez?re"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "Mindenki kapcsolatba lphet velem"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "Csak a kvetkez felhasznlk engedlyezse"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "Engedlyezettek"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "Minden felhasznl elutastsa"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "A kvetkez felhasznlk tiltsa"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "Tilt lista"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "Pldny:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Bettpus"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "zenetek"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "IM ablak"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Csoportos cseveg ablak"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Bngsz?"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Hangok"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Hangok"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Tvollt fejlce: "
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "Tvollt zenetek"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencik"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim nyomkvet ablak"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "ltalnos"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "Trsalgsok"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Hangok"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Biztonsg"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3481,37 +3340,50 @@
 msgid "Protocol Error"
 msgstr "Protokol hiba"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Protokol esemnyek"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Kilps"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Elfogadja?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - "
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - j levl"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "Level megnyitsa"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 msgid ""
 "\n"
 "\n"
@@ -3521,21 +3393,21 @@
 "\n"
 "Fel kvnod venni ezt a partnert a listdra?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 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:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - Regisztrci"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "Regisztrcis adatok"
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "Regisztrci"
 
@@ -3543,28 +3415,28 @@
 msgid "Please enter your password"
 msgstr "Krjk adja meg jelszavt"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d zenetek)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 zenet)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "Figyelmeztetve"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Igen"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "Nem"
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr "Tovbbi informci"
 
@@ -3612,6 +3484,187 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "General Options"
+#~ msgstr "ltalnos belltsok"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr "Minden opci azonnal rvnybe lp mg msok figyelmeztetnek."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Specilis"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Inaktv id? jelentse"
+
+#~ msgid "None"
+#~ msgstr "Nincs"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Gaim szerint"
+
+#~ msgid "X Use"
+#~ msgstr "X szerint"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URL kezel?"
+
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Billenytzet belltsai"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2-vel id?pont formtum vltsa"
+
+#~ msgid "Display and General Options"
+#~ msgstr "ltalnos s megjelentsi belltsok"
+
+#~ msgid "IM Options"
+#~ msgstr "IM belltsok"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Gombok megjelentse: "
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Kpek s szveg"
+
+#~ msgid "Pictures"
+#~ msgstr "Kpek"
+
+#~ msgid "Text"
+#~ msgstr "Szveg"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Minden trsalgs megjelentse egy ablakban"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Ablak mretek"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Fl elhelyezkedse"
+
+#~ msgid "Left"
+#~ msgstr "Bal oldalon"
+
+#~ msgid "Right"
+#~ msgstr "Jobb oldalon"
+
+#~ msgid "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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Dlt szveg"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Szveg bettpusa"
+
+#~ 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:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "Id automatikus vlaszok kldse kztt (msodpercben):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Automatikus tvollt"
+
+#~ msgid "minutes using"
+#~ msgstr "perc utn a kvetkez?vel"
+
+#~ msgid "Messages"
+#~ msgstr "zenetek"
+
+#~ msgid "Make Away"
+#~ msgstr "Nincs a gpnl"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Biztonsgi belltsok"
+
+#~ msgid "General"
+#~ msgstr "ltalnos"
+
+#~ msgid "Conversations"
+#~ msgstr "Trsalgsok"
+
 #~ msgid "Enable sounds"
 #~ msgstr "Hangok engedlyezse"
 
--- a/po/it.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/it.po	Thu Aug 08 18:11:17 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.53\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -23,11 +23,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Chiudi"
 
@@ -40,17 +40,16 @@
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "Aggiungi"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "Elimina"
 
@@ -74,7 +73,6 @@
 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 +91,7 @@
 msgid "Change"
 msgstr "Canale:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Presente"
 
@@ -101,8 +99,8 @@
 msgid "Available for friends only"
 msgstr "Presente solo per gli amici"
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Assente"
 
@@ -118,7 +116,7 @@
 msgid "Invisible for friends only"
 msgstr "Invisibile solo per gli amici"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "Occupato"
 
@@ -152,7 +150,7 @@
 msgid "Unknown Error Code."
 msgstr "Codice di errore sconosciuto."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
@@ -278,8 +276,7 @@
 msgid "Sex"
 msgstr "Sesso :9"
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Citt"
 
@@ -358,12 +355,9 @@
 msgid "Directory Search"
 msgstr "Cerca directory"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: src/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
 msgid "Change Password"
 msgstr "Cambia password"
 
@@ -384,7 +378,7 @@
 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:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Prendi informazioni"
@@ -450,7 +444,7 @@
 msgid "Channel:"
 msgstr "Canale:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Password:"
 
@@ -459,48 +453,48 @@
 msgid "DCC Chat"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: 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:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 #, fuzzy
 msgid "Unknown"
 msgstr "ICQ sconosciuto"
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "Presente"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr "Assente ovunque"
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Codice di errore sconosciuto."
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -508,179 +502,189 @@
 "\n"
 "Vuoi aggiungerli alla tua lista dei contatti?"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 #, fuzzy
 msgid "No such user"
 msgstr "Il server non esiste"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: 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/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Contatti"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr "Autentificazione"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "Errore di login sconosciuto"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Password cambiata!"
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim - Cambio password"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 #, fuzzy
 msgid "Connection lost"
 msgstr "Connessione chiusa."
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "Impossibile connettersi"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "Connesso"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "Richiesta metodo autentificazione in corso"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 #, fuzzy
 msgid "Invalid Jabber I.D."
 msgstr "Nome non valido"
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Stanza:"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr "Gestisci:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Vedi i log"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Prendi messaggio di Assente"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "Notifica Popup"
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "Nome al secolo"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "Cognome"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "Nome assegnato"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Indirizzo"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "Indirizzo per esteso"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "Localit"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr "Regione"
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "Codice Postale"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Paese"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "Telefono"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "Nome dell'organizzazione"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "Divisione"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Titolo"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr "Posizione"
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "Compleanno"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -688,23 +692,23 @@
 "Tutti i dati qui sotto sono opzionali. Inserisci solo le informazioni che "
 "ritieni opportune"
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr "Identit"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Edita la vCard Jabber"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "Sei stato registrato sul server!"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "Errore di registrazione sconosciuto"
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "Imposta informazioni utente"
 
@@ -873,8 +877,8 @@
 msgstr "Codice di errore sconosciuto."
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -882,106 +886,106 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim non riesce a spedire il messaggio"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 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:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Errore di lettura dal socket."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Non riesco a leggere il socket"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "Password: "
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Non riesco a collegarmi al server"
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "Registro dal server"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "Contatto"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "Nascondi icona"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Cognome"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Account: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 msgid "Invalid name"
 msgstr "Nome non valido"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Con quale gruppo vuoi ciattare:"
@@ -1059,17 +1063,14 @@
 msgid "Connection established, cookie sent"
 msgstr "Connessione effettuata: spedito il cookie"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Soprannome o password sbagliati."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Il tuo account al momento  sospeso"
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1078,7 +1079,6 @@
 "Ti sei connesso e disconnesso troppo frequentemente. Aspetta dieci minuti e "
 "dopo riprova. Se continui, dovrai aspettare anche pi a lungo."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
@@ -1093,7 +1093,7 @@
 msgid "Internal Error"
 msgstr "Errore interno"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Aperto il canale diretto con %s"
@@ -1189,9 +1189,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Non  Winzozz, per hai perso %d messaggi da %s e non so il perch."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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"
 
@@ -1228,68 +1228,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "Le informazioni dell'utente %s non sono disponibili: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "Icona della persona"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "Voce"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "Immagine di IM"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Prendi file"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Invia file"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Giochi"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "Scorte"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "Invia lista contatti"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "Baco di EveryBuddy"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "Utente AP"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "Nichilista"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "Trasmissione al server ICQ"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ICQ sconosciuto"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "Criptaggio trilliano (?)"
 
@@ -1349,35 +1349,35 @@
 "L'ultimo messaggio non  stato inviato perch ne hai spediti con troppa "
 "frequenza. Aspetta 10 secondi e riprova."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 #, fuzzy
 msgid "Gaim - Warning"
 msgstr "Gaim - Avvisa l'utente?"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Scambia:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Impossibile aprire un canale diretto di IM"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1388,30 +1388,30 @@
 "permetterai di vedere il tuo indirizzo IP, rischiando per la sicurezza del "
 "tuo sistema. Vuoi continuare?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Prendi messaggio di Assente"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "IM diretto"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "Prendi le potenzialit"
 
@@ -1559,7 +1559,7 @@
 msgid "Password Change Successful"
 msgstr "Cambio password effettuato"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Cambio password"
 
@@ -1699,14 +1699,11 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Sito Web"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Abbandona"
 
@@ -1714,7 +1711,7 @@
 msgid "Please enter your logon"
 msgstr "Inserisci il tuo account"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Errore di iscrizione"
 
@@ -1730,11 +1727,11 @@
 msgid "Password: "
 msgstr "Password: "
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Esci"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "Accounts"
 
@@ -1746,19 +1743,19 @@
 msgid "About"
 msgstr "Informazioni"
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "Auto Login"
@@ -1812,74 +1809,73 @@
 msgid "Set All Away"
 msgstr "Tutti come Assente"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Gruppo"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Informazioni"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "Aggiungi salto a Contatto"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Vedi i log"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Rinomina"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Cancella Alias"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "Salto a Contatto"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "Nuovo salto a Contatto"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Rimuovi salto a Contatto"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Clicca per modificare]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Entrato in: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Avvisi: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Potenzialit: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1890,127 +1886,131 @@
 "Account: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "A riposo: "
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s entrato."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s uscito."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Informazioni Contatto selezionato."
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "Invia un messaggio"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Inizia/unisciti a chat con Contatto"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Attiva messaggio di Assente"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "File"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Aggiungi Contatto"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Unisciti a una chat"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "Nuovo messaggio"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Vedi info utente"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Importa lista contatti"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Strumenti"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Azioni protocollo"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Privacy"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Vedi log di sistema"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Esegui script"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Anunulla tutti gli script"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Elenco script"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr "Presente"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr "Mostra finestra debug"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "Informazioni su Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Lista contatti"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Aggiungi nuovo contatto"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Aggiungio nuovo gruppo"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Elimina Contatto/Gruppo selezionato"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Modifica Contatti"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista Contatti"
 
@@ -2022,13 +2022,13 @@
 msgid "Join Chat As:"
 msgstr "Unisciti a chat come:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -2036,16 +2036,16 @@
 msgid "Join"
 msgstr "Inserisciti"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Invita"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Contatto"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Messaggio"
 
@@ -2053,68 +2053,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invita Contatto nella stanza di chat"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Rimuovi Ignora"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "Ignora"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s nella stanza"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s  entrato nella stanza."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s  ora visto come %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha lasciato la stanza (%s)."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha lasciato la stanza."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Chat in gruppo"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Argomento:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "Nessuno in stanza"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Msg privato"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Invia"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Blocca"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Avviso"
 
@@ -2149,189 +2148,189 @@
 msgid "Setting position to %d\n"
 msgstr "Imposta posizione a %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Testo Grassetto"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Grassetto"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Testo Corsivo"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Corsivo"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Testo Sottolineato"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Testo barrato"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Barrato"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Riduci font"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Piccolo"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Font normale"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normale"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Ingrandisci font"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Seleziona font"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Font"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Colore testo"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Colore"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Colore sfondo"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Inserisci link"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Inserisci faccina"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Faccine"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Immagine di IM"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 #, fuzzy
 msgid "Image"
 msgstr "Immagine di IM"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Abilita i log"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Log"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Salva la conversazione"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Salva"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Suoni"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversazioni"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Manda messaggio come: "
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Salva icona"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Disabilita animazione"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Abilita animazione"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Nascondi icona"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Salva icona come..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Avvisa l'utente?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Vuoi davvero avvisare %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Avvisa come anonimo?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "Gli avvisi anonimi sono meno aggressivi."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Rimozione di '%s' da lista contatti.\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Rimuovi %s?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "Rimuovi Contatto"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2340,362 +2339,382 @@
 "Stai per rimuovere '%s' dalla\n"
 "lista dei contatti. Vuoi continuare?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Accetta"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - Utente IM"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "IM chi:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Utente:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr "Account"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Vedi info utente"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Aggiungi Gruppo"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Aggiungi Gruppo"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Aggiungi Contatto"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Aggiungi Contatto"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Contatto"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Aggiungi a"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Assente!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Imposta privacy per:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Permetti a tutti di contattarmi"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Permetti solo agli utenti sotto"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Permetti alla lista"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Nega a tutti"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Blocca gli utenti qui sotto"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Lista dei bloccati"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Inserisci un contatto al salto."
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Errore di salto a contatto"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuovo Salto a Contatto"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "Salto a chi"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "Account"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "Salto dove"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Salto appena entrato"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Salto appena tornato da Assente"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Salto appena tornato da Riposo"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "Salta quando Contatto ti scrive"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Azioni di salto"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "Apri finestra di IM"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "Notifica Popup"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "Invia messaggio"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Esegui il comando al salto"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Suona al salto"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Salva questo salto dopo attivazione"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Imposta Dir Info"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "Info Directory"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Metti le tue info a disposizione nel Web"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Nome"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Secondo nome"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Cognome"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Nome da nubile"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "Stato civile"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "Le nuove password non coincidono"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Errore di cambio Password"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Riempi completamente i campi"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Password attuale"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Nuova password"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Nuova password (di nuovo)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Imposta info utente"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Sotto i risultati della ricerca: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Autorizza"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Nega"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Aggiugni Autorizzazione"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Aggiungi Diniego"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Registro Conversazione"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Cerca Contatto"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Cerca Contatto da Info"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Cerca Contatto da E-mail"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - Aggiungi URL"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Seleziona colore testo"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Seleziona colore sfondo"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importa in:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importa lista dei contatti"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "Non puoi creare un messaggio di Assente con titolo vuoto"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "Non puoi creare un messaggio di Assente vuoto"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuovo messaggio di Assente"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Nuovo messaggio di Assente"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Titolo di Assente: "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Utilizzo"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Salva & Usa"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Sorridi!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Alias Contatto"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias Contatto"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Salva file di log"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Impossibile rimuovere il file %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Cancello davvero il log?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "Va bene!"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Conversazione"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Rinomina Gruppo"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Nuovo nome:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Rinomina Contatto"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Rinomina Contatto"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Seleziona script Perl"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "File di configurazione %s non aperto."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Errore di Preferenze"
 
@@ -2725,7 +2744,7 @@
 msgid "Browse"
 msgstr "Esamina"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -2766,7 +2785,18 @@
 msgid "Enter Password"
 msgstr "Inserisci password"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2774,44 +2804,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:949
-msgid "Login Error"
-msgstr "Errore di login"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sei sicuro che vuoi eliminare %s?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editore Account"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Seleziona tutti"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Seleziona gli Auto"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Annulla selezione"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Modifica"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Entra/Esci"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2820,21 +2846,21 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s non riesce a entrare"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "Notifica"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s non riesce a entrare"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 #, fuzzy
 msgid "Connection Error"
 msgstr "Connessione chiusa."
@@ -2843,560 +2869,363 @@
 msgid "Perl Scripts"
 msgstr "Script Perl"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista Plugins"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 #, fuzzy
 msgid "Loaded Plugins"
 msgstr "Plugins"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Seleziona tutti"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Locazione file:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Carica"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Carica plugin da file"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Configura"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Configura impostazioni plugin selezionato"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Ricarica"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Ricarica plugin selezionato"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Scarica"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Scarica plugin selezionato"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Chiudi finestra"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Opzioni generali"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr ""
-"Tutte le opzioni hanno effetto immediato se non altrimenti specificato."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Miscellanea"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Bottoni senza bordo"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "Mostra segnalini Contatti"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "Mostra finestra debug"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "Notifica a contatti che stai scrivendo"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Rapporto tempi Riposo"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "Nessuno"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Uso di Gaim"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "Uso di X"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Log di tutte le conversazioni"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "Elimina HTML da log"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "Log quando i contatti entrano/escono"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "Log quando contatti dis/attivano Riposo"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "Log quando contatti dis/attivano Assente"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "Log tuoi stati di Ingresso/Riposo/Assente"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "File di log individuale per ogni contatto"
+#, fuzzy
+msgid "Windows"
+msgstr "Finestra di IM"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "Browser"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
+msgid "Show Buddy Ticker"
+msgstr "Mostra segnalini Contatti"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "Mostra finestra debug"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "Stato civile"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Bottoni senza bordo"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Testo barrato"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Annulla"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Inserisci faccina"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Seleziona"
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "Crea nuova finestra di default"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "Gestore URL di GNOME"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Opzioni Proxy"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Non tutti i protocolli usano queste opzioni proxy. Leggi il file README per "
-"i dettagli."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Tipo di Proxy"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Server Proxy"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Nessun Proxy"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Colore testo"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Colore sfondo"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Mostra faccine grafiche"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Mostra tempo nei messaggi"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "Mostra URL come link"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Evidenzia parole errate"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "Ignora i colori"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "Ignora il seme dei font"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "Ignora la dimensione dei font"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "Host"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Porta"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "Utente"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "Password"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "Opzioni lista contatti"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "Finestra lista contatti"
-
-#: src/prefs.c:569
-#, fuzzy
-msgid "Tab Placement:"
-msgstr "Posizione linguetta"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "In alto"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "In basso"
-
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Nascondi bottoni IM/Info/Chat"
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "Mostra lista contatti all'entrata"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "Mostra lista contatti vicino applet"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Salva posiz./dimens. finestra"
-
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "Mostra figure su bottoni"
-
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "Visualizzazioni Gruppo"
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "Nascondi gruppi senza contatti collegati"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "Mostra numeri nei gruppi"
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "Visualizzazioni Contatto"
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "Mostra tipo icone di contatto"
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "Mostra livelli di avviso"
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "Mostra tempi di Riposo"
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr "Ingrigisci contatti in Riposo"
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "Opzioni conversazione"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Opzioni tastiera"
-
-#: src/prefs.c:683
+msgid "Ignore TiK Automated Messages"
+msgstr "Ignora messaggi automatizzati TiK"
+
+#: src/prefs.c:459
 msgid "Enter sends message"
 msgstr "Tasto 'Invio' manda messaggio"
 
-#: src/prefs.c:684
+#: src/prefs.c:460
 msgid "Control-Enter sends message"
 msgstr "Ctrl-Invio manda messaggio"
 
-#: src/prefs.c:685
+#: src/prefs.c:469
 msgid "Escape closes window"
 msgstr "Esc chiude la finestra"
 
-#: src/prefs.c:686
+#: src/prefs.c:470
 #, fuzzy
 msgid "Control-W closes window"
 msgstr "Esc chiude la finestra"
 
-#: src/prefs.c:692
+#: src/prefs.c:480
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S} inserisce tag HTML"
 
-#: src/prefs.c:693
+#: src/prefs.c:481
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl-(numero) inserisce faccina"
 
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 cambia stato visualizzatore tempo"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "Opzioni Visualizzazione e Generali"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "Mostra faccine grafiche"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "Mostra tempo nei messaggi"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "Mostra URL come link"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Evidenzia parole errate"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "Spedire un messaggio rimuove stato Assente"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "Accoda nuovi messaggi se sei Assente"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "Ignora i colori"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "Ignora il seme dei font"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "Ignora la dimensione dei font"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignora messaggi automatizzati TiK"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "Ignora nuove conversazioni se Assente"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "Opzioni IM"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "Finestra di IM"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "Mostra i bottoni come: "
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "Testo e Figure"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "Figure"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "Testo"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "Tutte le conversazioni in una finestra a schede"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "Tutte le chat in una finestra a schede"
-
-#: src/prefs.c:967 src/prefs.c:1119
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr "Nascondi bottoni IM/Info/Chat"
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "Mostra figure su bottoni"
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Mostra lista contatti all'entrata"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "Mostra lista contatti vicino applet"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Salva posiz./dimens. finestra"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Evidenzia finestra ad un evento"
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "Nascondi gruppi senza contatti collegati"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "Mostra numeri nei gruppi"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "Mostra tipo icone di contatto"
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "Mostra livelli di avviso"
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "Mostra tempi di Riposo"
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr "Ingrigisci contatti in Riposo"
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "Nuova larghezza finestra:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "Nuova altezza finestra:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Altezza campo di testo:"
+
+#: src/prefs.c:571 src/prefs.c:633
 msgid "Raise windows on events"
 msgstr "Evidenzia finestra ad un evento"
 
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "Mostra account nella finestra"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "Alias nelle linguette/titoli schede"
-
-#: src/prefs.c:970
+#: src/prefs.c:572
 msgid "Hide window on send"
 msgstr "Nascondi finestra dopo l'invio"
 
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "Dimensione finestra"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "Nuova larghezza finestra:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "Nuova altezza finestra:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Altezza campo di testo:"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Posizione linguetta"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "A sinistra"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "A destra"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "Icone Contatti"
-
-#: src/prefs.c:1031
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "Nascondi Icone Contatti"
 
-#: src/prefs.c:1037
+#: src/prefs.c:582
 #, fuzzy
 msgid "Disable Buddy Icon Animation"
 msgstr "Disabilita animazione"
 
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "Opzioni di Chat"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "Finestra chat gruppo"
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr "Tutte le chat in una finestra a schede"
-
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "Tutte le conversazioni in una finestra a schede"
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "Mostra chi entra/esce dalla finestra"
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "Completamento col TAB"
-
-#: src/prefs.c:1180
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Mostra account nella finestra"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "Notifica a contatti che stai scrivendo"
+
+#: src/prefs.c:642
 msgid "Tab-Complete Nicks"
 msgstr "Il tasto TAB completa il nome"
 
-#: src/prefs.c:1186
+#: src/prefs.c:643
 msgid "Old-Style Tab Completion"
 msgstr "Completamento di TAB all'antica"
 
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "Opzioni font"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "Testo corsivo"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "Seleziona"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "Seme dei font per il testo"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "Dimensione font del testo"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Configurazione Suoni"
-
-#: src/prefs.c:1543
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "Mostra chi entra/esce dalla finestra"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Tutte le chat in una finestra a schede"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "Alias nelle linguette/titoli schede"
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "Tutte le chat in una finestra a schede"
+
+#: src/prefs.c:704
 #, fuzzy
-msgid "Test"
-msgstr "Testo"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "Scegli..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Opzioni suoni"
-
-#: src/prefs.c:1649
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Tutte le chat in una finestra a schede"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Server Proxy"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Host"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Porta"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Utente"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Password"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "Crea nuova finestra di default"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Log di tutte le conversazioni"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "Elimina HTML da log"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "Log quando i contatti entrano/escono"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Log quando contatti dis/attivano Riposo"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Log quando contatti dis/attivano Assente"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Log tuoi stati di Ingresso/Riposo/Assente"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "File di log individuale per ogni contatto"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "Nessun suono quando entri"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Suona quando Assente"
 
-#: src/prefs.c:1665
-#, fuzzy
-msgid "Sound method"
-msgstr "Opzioni suoni"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, fuzzy, c-format
 msgid ""
 "Sound command\n"
@@ -3405,107 +3234,126 @@
 "Comando per suonare i file dei suoni\n"
 "(%s per il nome del file, interno se vuoto)"
 
-#: src/prefs.c:1751
-#, fuzzy
-msgid "Sound played when:"
-msgstr "Programma che suona:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "Messaggio di Assente"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "Spedire un messaggio rimuove stato Assente"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "Accoda nuovi messaggi se sei Assente"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "Ignora nuove conversazioni se Assente"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "Non rispondere in automatico"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "Auto-rispondi solo quando a Riposo"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Tempo fra l'invio delle risposte automatiche (in secondi):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "Assente automatico dopo"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "minuti usando"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "Messaggi"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Configurazione Suoni"
+
+#: src/prefs.c:1338
+#, fuzzy
+msgid "Test"
+msgstr "Testo"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Scegli..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Modifica"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Modifica"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "Metti Assente"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Opzioni di Privacy"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Imposta privacy per:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "Permetti a tutti di contattarmi"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "Permetti solo agli utenti sotto"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "Permetti alla lista"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "Nega a tutti"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "Blocca gli utenti qui sotto"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "Lista dei bloccati"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "Istanza:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Font"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Messaggi"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "Finestra di IM"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Finestra chat gruppo"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Browser"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Suoni"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Eventi"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Titolo di Assente: "
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "Messaggio di Assente"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferenze"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Finestra di output del debug di Gaim"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Generale"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "Conversazioni"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Suoni"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Privacy"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3522,37 +3370,50 @@
 msgid "Protocol Error"
 msgstr "Errore di Protocollo"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Azioni protocollo"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Disconnetti"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Accetti?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nuova mail"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "Apri la mail"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 #, fuzzy
 msgid ""
 "\n"
@@ -3563,7 +3424,7 @@
 "\n"
 "Vuoi aggiungerli alla tua lista dei contatti?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3571,15 +3432,15 @@
 "Attualmente c' nessun protocollo che ti permetta di registrarti con nuovi "
 "account."
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrazione"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "Informazioni sulla registrazione"
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "Registra"
 
@@ -3587,28 +3448,28 @@
 msgid "Please enter your password"
 msgstr "Inserisci la password"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d messaggi)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 messaggio)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "Avvisato"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Si"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr "Informazioni in pi"
 
@@ -3657,6 +3518,188 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ 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."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Miscellanea"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Rapporto tempi Riposo"
+
+#~ msgid "None"
+#~ msgstr "Nessuno"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Uso di Gaim"
+
+#~ msgid "X Use"
+#~ msgstr "Uso di X"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "Gestore URL di GNOME"
+
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "Buddy List Options"
+#~ msgstr "Opzioni lista contatti"
+
+#~ msgid "Buddy List Window"
+#~ msgstr "Finestra lista contatti"
+
+#, fuzzy
+#~ msgid "Tab Placement:"
+#~ msgstr "Posizione linguetta"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Opzioni tastiera"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 cambia stato visualizzatore tempo"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Opzioni Visualizzazione e Generali"
+
+#~ msgid "IM Options"
+#~ msgstr "Opzioni IM"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Mostra i bottoni come: "
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Testo e Figure"
+
+#~ msgid "Pictures"
+#~ msgstr "Figure"
+
+#~ msgid "Text"
+#~ msgstr "Testo"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Tutte le conversazioni in una finestra a schede"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Dimensione finestra"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Posizione linguetta"
+
+#~ msgid "Left"
+#~ msgstr "A sinistra"
+
+#~ msgid "Right"
+#~ msgstr "A destra"
+
+#~ msgid "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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Testo corsivo"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Seme dei font per il testo"
+
+#~ 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:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "Tempo fra l'invio delle risposte automatiche (in secondi):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Assente automatico dopo"
+
+#~ msgid "minutes using"
+#~ msgstr "minuti usando"
+
+#~ msgid "Messages"
+#~ msgstr "Messaggi"
+
+#~ msgid "Make Away"
+#~ msgstr "Metti Assente"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Opzioni di Privacy"
+
+#~ msgid "General"
+#~ msgstr "Generale"
+
+#~ msgid "Conversations"
+#~ msgstr "Conversazioni"
+
 #~ msgid "Enable sounds"
 #~ msgstr "Abilita suoni"
 
@@ -3666,9 +3709,6 @@
 #~ msgid "Manual"
 #~ msgstr "Manuale"
 
-#~ msgid "Events"
-#~ msgstr "Eventi"
-
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "Suona quando un contatto entra"
 
--- a/po/ja.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/ja.po	Thu Aug 08 18:11:17 2002 +0000
@@ -2,11 +2,10 @@
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Ryosuke Kutsuna <ryosuke@cool.email.ne.jp>, 2002
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim version 0.56\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -24,11 +23,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim - å"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Ĥ"
 
@@ -41,17 +40,16 @@
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "ä"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr ""
 
@@ -75,7 +73,6 @@
 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 +91,7 @@
 msgid "Change"
 msgstr "³:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Ļ"
 
@@ -102,8 +99,8 @@
 msgid "Available for friends only"
 msgstr "ͧã˲Ļ"
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Υ"
 
@@ -119,7 +116,7 @@
 msgid "Invisible for friends only"
 msgstr "ͧã鱣"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr ""
 
@@ -151,7 +148,7 @@
 msgid "Unknown Error Code."
 msgstr "ǽʥ"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -276,8 +273,7 @@
 msgid "Sex"
 msgstr ""
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Į"
 
@@ -351,12 +347,9 @@
 msgid "Directory Search"
 msgstr "ǥ쥯ȥ긡"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: 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
 msgid "Change Password"
 msgstr "ѥѹ"
 
@@ -377,7 +370,7 @@
 msgstr "зͳǥå"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr ""
@@ -443,7 +436,7 @@
 msgid "Channel:"
 msgstr "³:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "ѥ:"
 
@@ -451,47 +444,47 @@
 msgid "DCC Chat"
 msgstr "DCCå"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
 msgid "Password Change Error!"
 msgstr "Gaim - ѥѹ"
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr ""
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "饤"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr "ƨ"
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr "⤹"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "ǽʥ"
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -499,199 +492,209 @@
 "\n"
 "֥ꥹȤɲäޤ?"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 msgid "No such user"
 msgstr "Τ褦ʥ桼Ϥޤ"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
+#: src/protocols/jabber/jabber.c:2681
 msgid "Jabber Error"
 msgstr "Jabber 顼"
 
-#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "֤"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr "ǧ"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "ʥ󥨥顼"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "ѥѹǤޤ"
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim - ѥѹ"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "³ڤޤ"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "³Ǥޤ"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "³ޤ"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "ǧ׵"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr "³"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 #, fuzzy
 msgid "Invalid Jabber I.D."
 msgstr "̵̾"
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr "ϥɥ:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "å"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "򸫤"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Υʥå"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "ݥåץå"
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "̾"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "²̾"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "Ϳ줿̾"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "˥å͡"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "¾"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "͹ֹ"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "ֹ"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "ȿ̾"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "°"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "̾"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr ""
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 "ΥƥϤ٤ƥץǤŬ˴Ϥޤ"
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr "桼ID"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCardˤäƳȯ줿"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "ФϿޤ"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "Ͽ顼"
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "桼Ͽ"
 
@@ -860,8 +863,8 @@
 msgstr "ǽʥ"
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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顼"
 
@@ -869,106 +872,106 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaimϥåޤ"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "ǤƤޤ 㤦³Ƥޤ"
 
-#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "åȤɤ߹ߤ˼"
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "åȤɤޤ"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "ѥ"
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Ф³Ǥޤ"
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "ФϿ"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "쥢"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "̾"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "꡼͡: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "롼פؤλ:"
@@ -1046,17 +1049,14 @@
 msgid "Connection established, cookie sent"
 msgstr "³Ǥޤcookie"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "ְä˥å͡फѥɤǤ"
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "ʤΥȤϸǤ"
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1065,7 +1065,6 @@
 "ˤ³ƤʬΥƤޤ10ʬԤäơƤӻߤƤ"
 "³СĹԤɬפǤ礦"
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "饤ȤΥС󤬸Ťޤ åץǡȤޤ礦"
@@ -1078,7 +1077,7 @@
 msgid "Internal Error"
 msgstr "顼"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s ȤľIMΩޤ"
@@ -1115,53 +1114,53 @@
 #: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
-msgstr "%sΥå%d̵Ǥ뤿˼Ԥޤ"
+msgstr "%2$sΥå%1$d̵Ǥ뤿˼Ԥޤ"
 
 #: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
-msgstr "%sΥå%d̵Ǥ뤿˼Ԥޤ"
+msgstr "%2$sΥå%1$d̵Ǥ뤿˼Ԥޤ"
 
 #: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
-msgstr "%s%dåϤǤ뤿˼Ԥޤ"
+msgstr "%2$s%1$dåϤǤ뤿˼Ԥޤ"
 
 #: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
-msgstr "%s%dåϤǤ뤿˼Ԥޤ"
+msgstr "%2$s%1$dåϤǤ뤿˼Ԥޤ"
 
 #: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
-msgstr "³ĶᤷΤ%s%dåƨޤ"
+msgstr "³ĶᤷΤ%2$s%1$dåƨޤ"
 
 #: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
-msgstr "³ĶᤷΤ%s%dåƨޤ"
+msgstr "³ĶᤷΤ%2$s%1$dåƨޤ"
 
 #: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
-msgstr "ͭΤǡ%s%dåƨޤ"
+msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
 #: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
-msgstr "ͭΤǡ%s%dåƨޤ"
+msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
 #: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
-msgstr "ͭΤǡ%s%dåƨޤ"
+msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
 #: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
-msgstr "ͭΤǡ%s%dåƨޤ"
+msgstr "ͭΤǡ%2$s%1$dåƨޤ"
 
 #: src/protocols/oscar/oscar.c:1634
 #, c-format
@@ -1171,11 +1170,11 @@
 #: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
-msgstr "Ǥ%s%dåƨޤ"
-
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+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 - 顼"
 
@@ -1212,68 +1211,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "%sΥ桼󤬸ޤ: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "֥"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "IM ᡼"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "å"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "ե"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "ե"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "ȥå"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "֥ꥹ"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr " Х"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "AP桼"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "˥ҥꥹ"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "ICQзͳ"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ʬʤICQ"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "TrillianŹ沽"
 
@@ -1332,35 +1331,35 @@
 "³ãƤ뤿åޤǤ10äޤäƺƤ"
 ""
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 #, fuzzy
 msgid "Gaim - Warning"
 msgstr "Gaim - 桼ٹ𤷤ޤ?"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "ľIM򳫤ޤ"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1370,30 +1369,30 @@
 "%sȤľIM򤷤ޤ ʤIPɥ쥹˸褦ˤޤ"
 "ƥŪޤ³ޤ?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Υʥå"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "ľIM"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "ǽ"
 
@@ -1537,7 +1536,7 @@
 msgid "Password Change Successful"
 msgstr "ѥѹ"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - ѥѹ"
 
@@ -1673,14 +1672,11 @@
 "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"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "󥪥"
 
@@ -1688,7 +1684,7 @@
 msgid "Please enter your logon"
 msgstr "󤷤Ƥ"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "󥪥󥨥顼"
 
@@ -1704,11 +1700,11 @@
 msgid "Password: "
 msgstr "ѥ"
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Ĥ"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr ""
 
@@ -1720,19 +1716,19 @@
 msgid "About"
 msgstr "About"
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "ץ"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "ץ饰"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr ""
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "ư"
@@ -1786,74 +1782,73 @@
 msgid "Set All Away"
 msgstr "Υʤ"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "롼"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr ""
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "ꥢ"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "ַä"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "򸫤"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "̾"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "ꥢ"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "֤Ϥ"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "֤Ϥ"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Ϥ֤κ"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Խ򥯥å]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "󤷤ޤ: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "ٹ: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "ǽ: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1864,127 +1859,131 @@
 "꡼̾: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "ɥ: "
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s ϥ󤷤Ƥޤ"
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s ϥȤޤ"
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "򤷤֤ξ"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "ʰץå"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "֥åȤγ/"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "ͭΥʥå"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "ե"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "֤ä"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "åȤ˲ä"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "ʰץå"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "桼"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "֥ꥹȤΥݡ"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "ġ"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "ץȥ"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Ŀ;"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "ƥ򸫤"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "ץȤɤ߹"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "ƤΥץȤβ"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "ץȥꥹ"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "إ"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr "饤"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr "ǥХåɥɽ"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "GaimˤĤ"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "֥ꥹ"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "֤ä"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "롼"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "򤷤/롼פκ"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "֤Խ"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - ֥ꥹ"
 
@@ -1996,13 +1995,13 @@
 msgid "Join Chat As:"
 msgstr "̾ꤷƥåȤ˲"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr ""
 
@@ -2010,16 +2009,16 @@
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr ""
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "å"
 
@@ -2027,68 +2026,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - ֤Υåȥ롼Ǿ"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "̵"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "̵"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d%sˤޤ"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%sޤ"
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s%sȤΤƤޤ"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s(%s)ޤ"
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%sޤ"
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - 롼ץå"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "ȥԥå:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "ï⤤ޤ"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "䤯"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "ٹ"
 
@@ -2122,549 +2120,569 @@
 msgid "Setting position to %d\n"
 msgstr "֤%dˤޤ\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "ܡɥƥ"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "ܡ"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "åƥ"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "å"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "ƥ"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "ƥ"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr ""
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "̤Υեȥ"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr ""
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "礭"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "եȤ"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "ե"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "ʸ"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "طʿ"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "󥯤"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "ޥ꡼"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "ޥ꡼"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "IM"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "ͭ"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "ä¸"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "¸"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "̾դƥå:"
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - ¸"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "˥᡼̵"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "˥᡼ͭ"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "쥢"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "̾դƥ¸"
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - 桼ٹ𤷤ޤ?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "%sٹ𤷤ΤǤ?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "ƿ̾Ƿٹ𤷤ޤ?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "ƿ̾ηٹϤۤɹӤޤ"
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "֥ꥹȤ'%s'\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - %s"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "֤"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
 msgstr "֥ꥹȤ'%s'뤳ȤˤĤ³ޤ?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "λ"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "λ"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - IM桼"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "IM ï:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "桼:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr ""
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 桼"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "롼ɲ"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - 롼ɲ"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - ɲ"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "ɲ"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "󥿥"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "ɲ"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Υ!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Ŀ;:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "ܿ"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "ʲΥ桼Τߵ"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "ĥꥹ"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "ïʤ"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "ʲΥ桼Τߵ"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "ݥꥹ"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Ϥߤ֤򤤤Ƥ"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Ϥߥ顼"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ֤Ϥ"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "ïϤ"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr ""
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "ĤĤߤ"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "󥪥λ"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Υʤä"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "ٻߤä"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "ʤ֤Ϥ"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Ϥ"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "IMɥ򳫤"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "ݥåץå"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "å"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Ϥॳޥɤμ¹"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Ϥ಻"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Ϥߤ¸"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - ǥ쥯ȥ"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "ǥ쥯ȥ"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Web餢ʤξդ뤳ȤĤ"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr ""
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "ߥɥ͡"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "̾"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr ""
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr ""
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "ѥɤϥޥåޤ"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ѥѹ顼"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "ƤϤƤ"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "ꥸʥѥ"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "ѥ"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "ѥ()"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 桼Ͽ"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "ʤθ̤: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr ""
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ĥɲ"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ĥɲ"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "֤θ"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 󤫤֤õ"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - E-mail֤õ"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - URLɲ"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "ʸ"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "طʿ"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "ݡȤ: "
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - ֥ꥹȤΥݡ"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "̾ΥʥåϺޤ"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "Υåޤ"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - Υʥå"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Υʥå"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Υʥå ̾:"
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Ȥ"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "¸ƻȤ"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Ф!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "֤Υꥢ"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - ֤Υꥢ"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - ¸"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "ե %s - %s "
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "˥?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "õ"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - 롼פβ̾"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "롼פβ̾"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "̾"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - ֤β̾"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "֤β̾"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - PerlץȤ"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "ե%s򳫤ޤ"
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "ꥨ顼"
 
@@ -2694,7 +2712,7 @@
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "ꥻå"
 
@@ -2735,7 +2753,18 @@
 msgid "Enter Password"
 msgstr "ѥ"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2743,44 +2772,40 @@
 "ΥȤǤϥȤޤ ץȥɤ߹Ǥʤʤɤ߹"
 "ץȥ뤬ǤϵǽʤǤ"
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "󥨥顼"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "%sΤǤ?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Խ"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr ""
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Ƽư"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "򤷤ʤ"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Խ"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "󥪥/"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2789,21 +2814,21 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s ϥ󥪥Ǥޤ"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s ϥ󥪥դޤ"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr "³顼"
 
@@ -2811,555 +2836,361 @@
 msgid "Perl Scripts"
 msgstr "Perl ץ"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - ץ饰ꥹ"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - ץ饰"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "ץ饰ɤ߹"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr ""
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "եѥ"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "ɤ߹"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "ե뤫ץ饰ɤ߹"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr ""
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "򤷤ץ饰"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "ɤ߹"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "򤷤ץ饰κɤ߹"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "ɤ߹߲"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "򤷤ץ饰ɤ߹߲"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "ΥɥĤ"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Ūʥץ"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr ""
-"⤷¾ˡդʤäʤСץϤ٤Ƹ̤ľ˸路"
-""
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr ""
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "ʤܥȤ"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "֥åɽ"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "ǥХåɥɽ"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "åΤ"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Ժ߻֤"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "ʤ"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Gaim桼"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "X桼"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Ƥβä"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "HTMLǤ"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "֤󥪥/դȤ"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "֤ٻ/Ȥ"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "֤Υ/ʤȤ"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "ʤʬǥ󥪥/ٻ/ΥʤΤ"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "֤줾ǥ"
+#, fuzzy
+msgid "Windows"
+msgstr "IMɥ"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr ""
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
+msgid "Show Buddy Ticker"
+msgstr "֥åɽ"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "ǥХåɥɽ"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr ""
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "ʤܥȤ"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "ƥ"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr ""
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "ޥ꡼"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr ""
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "ǥեȤǿɥ򳫤"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME URLϥɥ顼"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "ץץ"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"ƤΥץȥǥץץϻȤʤ READMEեߤƤ"
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "ץ"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "ץ"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "ץѤʤ"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "ʸ"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "طʿ"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "եåޥ꡼ɽ"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "åΥॹפɽ"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "󥯤ȤURLɽ"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "ߥڥϥ饤Ȥ"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "̵"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "եȤ̵"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "եȥ̵"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "ۥ̾"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "ݡֹ"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "桼̾"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "ѥ"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "֥ꥹȥץ"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "֥ꥹȥɥ"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr "ִ"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "־"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "ֲ"
-
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr "IM//åȥܥ򱣤"
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "Ͽ줿ͧãꥹȤưɽ"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "ץåնͧãꥹȤɽ"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "ɥ֤¸"
-
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "ܥɽ"
-
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "롼פɽ"
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "ե饤ͧãϥ롼פ򱣤"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "롼׿ɽ"
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "֤ɽ"
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "֥ץɽ"
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "ٹ٥ɽ"
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "ٻ߻֤ɽ"
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr "ٻ֤ϥ졼"
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "åץ"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "ܡɥץ"
-
-#: src/prefs.c:683
+msgid "Ignore TiK Automated Messages"
+msgstr "TiKưå̵"
+
+#: src/prefs.c:459
 msgid "Enter sends message"
 msgstr "Enterפǥå"
 
-#: src/prefs.c:684
+#: src/prefs.c:460
 msgid "Control-Enter sends message"
 msgstr "Control-Enterפǥå"
 
-#: src/prefs.c:685
+#: src/prefs.c:469
 msgid "Escape closes window"
 msgstr "EscapeפǥɥĤ"
 
-#: src/prefs.c:686
+#: src/prefs.c:470
 #, fuzzy
 msgid "Control-W closes window"
 msgstr "EscapeפǥɥĤ"
 
-#: src/prefs.c:692
+#: src/prefs.c:480
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Control-{B/I/U/S}פHTML"
 
-#: src/prefs.c:693
+#: src/prefs.c:481
 msgid "Control-(number) inserts smileys"
 msgstr "Control-(number)פǥޥ꡼"
 
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 ǥॹɽ"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "ɽȰ̥ץ"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "եåޥ꡼ɽ"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "åΥॹפɽ"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "󥯤ȤURLɽ"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "ߥڥϥ饤Ȥ"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "Υʾ֤Υå"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "Υʤ鿷åϥ塼"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "̵"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "եȤ̵"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "եȥ̵"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "TiKưå̵"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "Υʻοä̵"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "IMץ"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "IMɥ"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "̾դƥܥɽ"
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "ȥƥ"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr ""
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "ƥ"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "ƤβäĤΥ֥ɥɽ"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "Ʊ֥ɥǥåȤɽ"
-
-#: src/prefs.c:967 src/prefs.c:1119
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr "IM//åȥܥ򱣤"
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "ܥɽ"
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Ͽ줿ͧãꥹȤưɽ"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "ץåնͧãꥹȤɽ"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "ɥ֤¸"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "٥ȯǥɥ򥢥ƥ֤ˤ"
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "ե饤ͧãϥ롼פ򱣤"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "롼׿ɽ"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "֥ץɽ"
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "ٹ٥ɽ"
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "ٻ߻֤ɽ"
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr "ٻ֤ϥ졼"
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "ɥ:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "ɥι⤵:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "ϥåȤι⤵:"
+
+#: src/prefs.c:571 src/prefs.c:633
 msgid "Raise windows on events"
 msgstr "٥ȯǥɥ򥢥ƥ֤ˤ"
 
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "ɥǥɽ"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "/̾򥨥ꥢɽ"
-
-#: src/prefs.c:970
+#: src/prefs.c:572
 msgid "Hide window on send"
 msgstr "ɥ򱣤"
 
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "ɥ"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "ɥ:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "ɥι⤵:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "ϥåȤι⤵:"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "ִ"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr ""
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr ""
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "֥"
-
-#: src/prefs.c:1031
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "֥򱣤"
 
-#: src/prefs.c:1037
+#: src/prefs.c:582
 msgid "Disable Buddy Icon Animation"
 msgstr "˥᡼̵֥"
 
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "åȥץ"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "롼ץåȥɥ"
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr "ƤΥåȤĤΥ֥ɥɽ"
-
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "ƤβäƱ֥ɥɽ"
-
-#: src/prefs.c:1120
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "ɥǥɽ"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "åΤ"
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "֤Υ˥å͡"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "ŤΥ"
+
+#: src/prefs.c:652
 msgid "Show people joining/leaving in window"
 msgstr "/Υʤ򥦥ɥɽ"
 
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "ִλ"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "֤Υ˥å͡"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "ŤΥ"
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "եȥץ"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "åƥ"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr ""
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "ƥȤΥե"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "ƥȤΥեȥ"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - "
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "ƥ"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "ץ"
-
-#: src/prefs.c:1649
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "ƤΥåȤĤΥ֥ɥɽ"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "/̾򥨥ꥢɽ"
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "ƤΥåȤĤΥ֥ɥɽ"
+
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Ʊ֥ɥǥåȤɽ"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "ץ"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "ۥ̾"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "ݡֹ"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "桼̾"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "ѥ"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "ǥեȤǿɥ򳫤"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Ƥβä"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "HTMLǤ"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "֤󥪥/դȤ"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "֤ٻ/Ȥ"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "֤Υ/ʤȤ"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "ʤʬǥ󥪥/ٻ/ΥʤΤ"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "֤줾ǥ"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "󤷤Ȥ˲Ĥ餵ʤ"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Υβ"
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "᥽å"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3368,106 +3199,125 @@
 "ޥ\n"
 "(ե̾%s)"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "Ĥ餹Ȥ:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "Υʥå"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "Υʾ֤Υå"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "Υʤ鿷åϥ塼"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "Υʻοä̵"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "ưʤ"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "ٻϼưΤ"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "ưֳ()"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "ưΥʸ"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "ʬ"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "å"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - "
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr "ƥ"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Խ"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Խ"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "ɤä"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Ŀ;󥪥ץ"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Ŀ;:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "ܿ"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "ʲΥ桼Τߵ"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "ĥꥹ"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "ïʤ"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "ʲΥ桼Τߵ"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "ݥꥹ"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "󥹥:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "ե"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "å"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "IMɥ"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "롼ץåȥɥ"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "ץ"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr ""
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr ""
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr ""
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Υʥå ̾:"
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "Υʥå"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim ǥХåɥ"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr ""
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "ץ"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr ""
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr ""
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Ŀ;"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3484,37 +3334,50 @@
 msgid "Protocol Error"
 msgstr "ץȥ륨顼"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "ץȥ"
+
+#: src/prpl.c:101
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%sϺ%sѤƤޤ %sϺե饤Ǥ"
 
-#: src/prpl.c:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr ""
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Ĥޤ?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - ץץ"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - ᡼"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "᡼򳫤"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 #, fuzzy
 msgid ""
 "\n"
@@ -3525,21 +3388,21 @@
 "\n"
 "֥ꥹȤɲäޤ?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "ϿɬפʥץȥǸ߻Ȥޤ"
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - Ͽ"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "Ͽ"
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "Ͽ"
 
@@ -3547,28 +3410,28 @@
 msgid "Please enter your password"
 msgstr "ѥɤϤƤ"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d å)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 å)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "ٹ"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Ϥ"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr ""
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr "äȾ"
 
@@ -3616,6 +3479,186 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "General Options"
+#~ msgstr "Ūʥץ"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr ""
+#~ "⤷¾ˡդʤäʤСץϤ٤Ƹ̤ľ˸路"
+#~ "ޤ"
+
+#~ msgid "Miscellaneous"
+#~ msgstr ""
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Ժ߻֤"
+
+#~ msgid "None"
+#~ msgstr "ʤ"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Gaim桼"
+
+#~ msgid "X Use"
+#~ msgstr "X桼"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URLϥɥ顼"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Proxy Options"
+#~ msgstr "ץץ"
+
+#~ msgid ""
+#~ "Not all protocols can use these proxy options. Please see the README file "
+#~ "for details."
+#~ msgstr ""
+#~ "ƤΥץȥǥץץϻȤʤ READMEեߤƤ"
+#~ ""
+
+#~ msgid "Proxy Type"
+#~ msgstr "ץ"
+
+#~ msgid "No Proxy"
+#~ msgstr "ץѤʤ"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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 "åץ"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "ܡɥץ"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 ǥॹɽ"
+
+#~ msgid "Display and General Options"
+#~ msgstr "ɽȰ̥ץ"
+
+#~ msgid "IM Options"
+#~ msgstr "IMץ"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "̾դƥܥɽ"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "ȥƥ"
+
+#~ msgid "Pictures"
+#~ msgstr ""
+
+#~ msgid "Text"
+#~ msgstr "ƥ"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "ƤβäĤΥ֥ɥɽ"
+
+#~ msgid "Window Sizes"
+#~ msgstr "ɥ"
+
+#~ msgid "Tab Placement"
+#~ msgstr "ִ"
+
+#~ msgid "Left"
+#~ msgstr ""
+
+#~ msgid "Right"
+#~ msgstr ""
+
+#~ msgid "Buddy Icons"
+#~ msgstr "֥"
+
+#~ msgid "Chat Options"
+#~ msgstr "åȥץ"
+
+#~ msgid "Show conversations in the same tabbed window"
+#~ msgstr "ƤβäƱ֥ɥɽ"
+
+#~ msgid "Tab Completion"
+#~ msgstr "ִλ"
+
+#~ msgid "Font Options"
+#~ msgstr "եȥץ"
+
+#~ msgid "Italic Text"
+#~ msgstr "åƥ"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "ƥȤΥե"
+
+#~ msgid "Font Size for Text"
+#~ msgstr "ƥȤΥեȥ"
+
+#~ msgid "Sound Options"
+#~ msgstr "ץ"
+
+#~ msgid "Sound method"
+#~ msgstr "᥽å"
+
+#~ msgid "Sound played when:"
+#~ msgstr "Ĥ餹Ȥ:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "ưֳ()"
+
+#~ msgid "Auto Away after"
+#~ msgstr "ưΥʸ"
+
+#~ msgid "minutes using"
+#~ msgstr "ʬ"
+
+#~ msgid "Messages"
+#~ msgstr "å"
+
+#~ msgid "Make Away"
+#~ msgstr "ɤä"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Ŀ;󥪥ץ"
+
+#~ msgid "General"
+#~ msgstr ""
+
+#~ msgid "Conversations"
+#~ msgstr ""
+
 #~ msgid "Enable sounds"
 #~ msgstr "ͭ"
 
--- a/po/ko.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/ko.po	Thu Aug 08 18:11:17 2002 +0000
@@ -2,11 +2,10 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.58\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -24,11 +23,11 @@
 msgid "Gaim Chat"
 msgstr " - ä"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "ݱ"
 
@@ -41,17 +40,16 @@
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "߰"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr ""
 
@@ -75,7 +73,6 @@
 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 +91,7 @@
 msgid "Change"
 msgstr "ä:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "޽   "
 
@@ -102,8 +99,8 @@
 msgid "Available for friends only"
 msgstr "ģ鿡Ը ޽   "
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "ڸ"
 
@@ -119,7 +116,7 @@
 msgid "Invisible for friends only"
 msgstr "ģ鿡Ը  ʵ "
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "޽   "
 
@@ -151,7 +148,7 @@
 msgid "Unknown Error Code."
 msgstr "    ڵ."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -276,8 +273,7 @@
 msgid "Sex"
 msgstr ""
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "/"
 
@@ -351,12 +347,9 @@
 msgid "Directory Search"
 msgstr "丮 ˻"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: 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
 msgid "Change Password"
 msgstr "йȣ "
 
@@ -377,7 +370,7 @@
 msgstr "  ޽ "
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr " "
@@ -443,7 +436,7 @@
 msgid "Channel:"
 msgstr "ä:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "н:"
 
@@ -451,221 +444,231 @@
 msgid "DCC Chat"
 msgstr "DCC ä"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
 msgid "Password Change Error!"
 msgstr " - йȣ "
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr "˷ "
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr "ڸ"
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr "ر"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "    ڵ."
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 msgid "No such user"
 msgstr "׷  "
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
+#: src/protocols/jabber/jabber.c:2681
 msgid "Jabber Error"
 msgstr " "
 
-#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "ģ"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr " Ȯ "
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "   α "
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "йȣ  Ǿϴ."
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr " - йȣ "
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "  ϴ"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "  ûϴ "
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 msgid "Invalid Jabber I.D."
 msgstr "߸  ̵"
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 #, fuzzy
 msgid "Server:"
 msgstr "Ͻ "
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr "ó:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "ä"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr " ȭ "
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "ڸ ޽ "
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "˾â  "
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "̸"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Ÿ ּ"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr " ּ"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "ġ"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "ȣ"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "ȭ"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr " ̸"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr " μ"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr ""
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -673,23 +676,23 @@
 "  ׸ ûԴϴ. Էص ϴٰ ϴ  Է"
 "ʽÿ."
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr " Ȯ"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr " -  vCard "
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "  ߽ϴ!"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "  Է"
 
@@ -857,8 +860,8 @@
 msgstr "    ڵ."
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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 "
 
@@ -866,106 +869,106 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "޽   ϴ"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "ٸ   ̵ αϿ  ϴ."
 
-#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Ͽ д ߿  ߻߽ϴ."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "   ϴ."
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "йȣ: "
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "   ϴ."
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr " "
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "ģ"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "̵: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr " ׷:"
@@ -1043,17 +1046,14 @@
 msgid "Connection established, cookie sent"
 msgstr "  Ű ½ϴ"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "̵ н尡 ƲȽϴ."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "    Դϴ."
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1062,7 +1062,6 @@
 "ʹ  ϰ  Ͽϴ. 10 ٸ  ٽ õϽʽÿ.  "
 "õѴٸ ٷ ϴ ð  ϴ."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
@@ -1077,7 +1076,7 @@
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s  "
@@ -1123,12 +1122,12 @@
 #: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
-msgstr "%s %s  ޽ ʹ Ŀ   ϴ."
+msgstr "%d %s  ޽ ʹ Ŀ   ϴ."
 
 #: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
-msgstr "%s %s  ޽ ʹ Ŀ   ϴ."
+msgstr "%d %s  ޽ ʹ Ŀ   ϴ."
 
 #: src/protocols/oscar/oscar.c:1605
 #, c-format
@@ -1173,9 +1172,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "    %d %s  ޽   ϴ."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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 " - "
 
@@ -1212,68 +1211,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "%s   ޾ƿ  ϴ: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "ģ "
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "׸ ޽"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "ä"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr " ޱ"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr " "
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "ģ  "
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy "
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "AP "
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "㹫"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "ICQ  "
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ICQ ˷ "
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "Ʈ ȣȭ"
 
@@ -1327,15 +1326,15 @@
 "ʹ  ޽   ʰϿ  ޽   "
 ". 10  ٽ õϽʽÿ."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1345,19 +1344,19 @@
 "ϴ. ѵ ں ģ     ģ ¶  "
 "  ֽϴ."
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 msgid "Gaim - Warning"
 msgstr " - "
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "ȯ:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr " ޽   "
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1368,7 +1367,7 @@
 "IP ּҸ   , ̴ Ȼ    ֽϴ. ׷  "
 "ұ?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1377,7 +1376,7 @@
 "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ϴ α׷ "
 " ޽    ʽϴ.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, fuzzy, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1386,15 +1385,15 @@
 "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ϴ α׷ "
 " ޽    ʽϴ.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 msgid "Get Status Msg"
 msgstr " ޽ "
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "   "
 
@@ -1539,7 +1538,7 @@
 msgid "Password Change Successful"
 msgstr "йȣ Ǿϴ."
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr " - йȣ "
 
@@ -1678,14 +1677,11 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer ( )   [ markster@marko.net ]"
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Ʈ"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr " "
 
@@ -1693,7 +1689,7 @@
 msgid "Please enter your logon"
 msgstr "  Էϼ"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr " "
 
@@ -1709,11 +1705,11 @@
 msgid "Password: "
 msgstr "йȣ: "
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr ""
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr ""
 
@@ -1725,19 +1721,19 @@
 msgid "About"
 msgstr "... Ͽ"
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "ɼ"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "÷"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "ȯ漳"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "ڵ α"
@@ -1791,74 +1787,73 @@
 msgid "Set All Away"
 msgstr " ڸ ޽ "
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "׷"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "޽"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr ""
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "ģ˸ ߰"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr " ȭ "
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "̸ ٲٱ"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "ģ˸"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr " ģ˸"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "ģ˸ "
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Ϸ Ŭϼ]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "ӵ: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr ": %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "밡: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1869,126 +1864,130 @@
 "̵: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 #, fuzzy
 msgid "Idle: "
 msgstr "ó:"
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s ߽ϴ."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s  ϴ."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr " ģ  "
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "޽ "
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "ä /"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "ڸ ޽ "
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr ""
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "ģ ߰"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "ä "
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr " ޽"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "  "
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "ģ "
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "  "
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "̹"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "ý α "
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "(ũƮ)"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "ũƮ "
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr " ũƮ "
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "ũƮ "
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 msgid "Online Help"
 msgstr "¶ "
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 msgid "Debug Window"
 msgstr " â"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "..."
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "ģ "
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr " ģ ߰"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr " ׷ ߰"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr " ģ ׷ "
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr ""
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr " - ģ"
 
@@ -2000,13 +1999,13 @@
 msgid "Join Chat As:"
 msgstr "ä  :"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr ""
 
@@ -2014,16 +2013,16 @@
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "ʴ"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "ģ"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "޽"
 
@@ -2031,68 +2030,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr " - ȭǷ ģ ʴ"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr " "
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr ""
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s() ȭǿ ֽϴ."
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ȭǿ ̽ϴ."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ȭ %s ٲټ̽ϴ."
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ȭǿ ̽ϴ. (%s)"
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s ȭǿ ̽ϴ."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr " - ׷ ä"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr ":"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "ȭǿ ƹ ϴ."
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "ӼӸ"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr ""
 
@@ -2126,187 +2124,187 @@
 msgid "Setting position to %d\n"
 msgstr "%d ġ űϴ\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "β ۾"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "β"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr " ۾"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr ""
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr " ģ ۾"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr " ģ ۾"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr " ũ ̱"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "۰"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr " ũ "
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr " ũ Ű"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "ũ"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "۲ "
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "۲"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr " "
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "  "
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "ũ "
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "ũ"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "ϸ  "
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "ϸ"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "޽ ׸ "
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr "׸"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr " ϱ"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "ȭ "
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Ҹ"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr " - ȭ"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "äý  :"
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr " -  "
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "ִϸ̼ "
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "ִϸ̼ "
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr " "
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr " ̸  "
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr " - ڿ  "
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr " %sԿ  ?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "͸  ?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "͸    ų  ֽϴ."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "'%s'  ģϿ մϴ.\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr " - %s Ͽ "
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "ģ "
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2315,361 +2313,381 @@
 " ģ Ͽ '%s'\n"
 "ұ?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr ""
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "Ȯ"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr " - ޽ "
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr " ģ"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr ":"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 msgid "Account:"
 msgstr ":"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr " -   "
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "׷ ߰"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr " - ׷ ߰"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr " - ģ ߰"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "ģ ߰"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "̵"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr ""
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr " - ڸ!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr " :"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr " ڰ   ֵ "
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr " Ͽ ִ ڸ   ֵ "
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr " "
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr " ڸ ź"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr " Ͽ ִ ڸ "
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr " "
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "ģ˸  ģ Էϼ."
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "ģ˸ "
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr " -  ģ˸"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "ģ˸ - ?"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr ""
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "ģ˸ - ?"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "ģ   ˸"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "ģ ڸ򿡼 ƿ  ˸"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "ģ ѾϿ ƿ  ˸"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "ģ  Ÿ ϸ ˸"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "ģ˸ - ൿ?"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "޽ â "
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "˾â  "
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "޽ "
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "ģ˸  "
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "ģ˸ Ҹ "
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr " ۵  ģ˸ "
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr " - 丮  "
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "丮 "
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr " Ͽ   ˻  ֵ "
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr ""
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "߰ ̸"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "̸"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "ȥ  ̸"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "/"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr " н尡 ġ ʽϴ"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr " - йȣ  "
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr " ׸  äʽÿ"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr " йȣ"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr " йȣ"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr " йȣ Ȯ"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr " -   "
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "˻   ϴ: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "ź"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr " -   ߰"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr " - ź  ߰"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr " - ȭ "
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "ģ ã"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr " -  ģ ã"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr " -  ּҷ ģ ã"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr " - URL ߰"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "  "
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr " :"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr " - ģ "
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "ڸ ޽     ˴ϴ"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "ڸ ޽    ˴ϴ"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr " -  ڸ ޽"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr " ڸ ޽"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "ڸ : "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "  "
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "ģ  "
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr " -  "
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr " - α "
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "%s    ϴ. - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr " α׸ ?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "Ȯ"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "¥"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "ȭ"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr " - ׷ ̸ "
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "׷ ̸ "
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr " ̸:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr " - ģ ̸ "
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "ģ ̸ "
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr " -  ũƮ "
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "  %s   ϴ."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "ȯ漳 "
 
@@ -2699,7 +2717,7 @@
 msgid "Browse"
 msgstr "Ž"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr ""
 
@@ -2739,7 +2757,18 @@
 msgid "Enter Password"
 msgstr "н"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2747,65 +2776,61 @@
 "  α׿  ϴ. ش  ġ ʾҰų ش "
 "ݿ α  ϴ."
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "α "
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr " %s ұ?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr " -  "
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr " "
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "ڵ "
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr " "
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "/"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s   ϴ"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "˸"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s  ϴ"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr " "
 
@@ -2813,554 +2838,361 @@
 msgid "Perl Scripts"
 msgstr " ũƮ"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr " - ÷ "
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 #, fuzzy
 msgid "Gaim - Plugins"
 msgstr " - ÷ "
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "÷"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr " "
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr " :"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "ҷ"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Ͽ ÷ ҷ"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr ""
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "õ ÷ "
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "ٽ б"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr " ÷ ٽ ϱ"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr ""
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "õ ÷ "
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "â ݱ"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Ϲ ɼ"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "ٸ    ɼ   ˴ϴ."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Ÿ "
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "׵θ ư "
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "ģ ã â "
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr " â "
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr " ģ Ÿ  ˸"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "  ð ֱ"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr " "
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "   ð ֱ"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "X   ð ֱ"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr " ȭ "
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "HTML ±״  "
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "ģ / "
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "ģ / "
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "ڽ ڸ/ƿ "
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "ڽ //ڸ "
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "ģ     α "
+#, fuzzy
+msgid "Windows"
+msgstr "޽ â"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr ""
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr ""
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "ݽ"
-
-#: src/prefs.c:294
-msgid "Mozilla"
+msgid "Show Buddy Ticker"
+msgstr "ģ ã â "
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr " â "
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "/"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "׵θ ư "
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr " ģ ۾"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr ""
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "ϸ  "
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr ""
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "⺻  â "
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "׳ URL ó"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr ""
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Ͻ ɼ"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Ͻø     ֽϴ. ڼ  ϸ README "
-" оʽÿ."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Ͻ "
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Ͻ "
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Ͻ  "
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS v4 Ͻ"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS v5 Ͻ"
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr " "
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "  "
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "̸Ƽ ׸ ֱ"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "޽ ð ǥ"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "URL  ũ ֱ"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Ʋ öڸ Ͽ ǥ"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr " "
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "۲ "
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr " ũ "
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP Ͻ"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "ȣƮ"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Ʈ"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr ""
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "н"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "ģ ɼ"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "ģâ"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr " ġ"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr ""
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "Ʒ"
-
-#: src/prefs.c:586
+msgid "Ignore TiK Automated Messages"
+msgstr "TiK ڵȭ ޽ "
+
+#: src/prefs.c:459
+msgid "Enter sends message"
+msgstr "Ű  ޽ "
+
+#: src/prefs.c:460
+msgid "Control-Enter sends message"
+msgstr "Ʈ-Ű  ޽ "
+
+#: src/prefs.c:469
+msgid "Escape closes window"
+msgstr "Esc Ű  â "
+
+#: src/prefs.c:470
+msgid "Control-W closes window"
+msgstr "Ʈ-W Ű  â "
+
+#: src/prefs.c:480
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "Ʈ-{B/I/U/S}  HTL ± "
+
+#: src/prefs.c:481
+msgid "Control-(number) inserts smileys"
+msgstr "Ʈ-() Ͽ ׸ "
+
+#: src/prefs.c:500
 msgid "Hide IM/Info/Chat buttons"
 msgstr "޽/ä//ڸ ư "
 
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "α׿   ģ ڵ "
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "ģ ø αٿ ǥ"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Ϻ â ġ ũ "
-
-#: src/prefs.c:596
+#: src/prefs.c:501
 msgid "Show pictures on buttons"
 msgstr "ư ׸ ֱ"
 
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr "ģ /  ģ â ø"
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "׷ ǥ"
-
-#: src/prefs.c:614
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "α׿   ģ ڵ "
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "ģ ø αٿ ǥ"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Ϻ â ġ ũ "
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "޽  ڵ â ø"
+
+#: src/prefs.c:526
 msgid "Hide groups with no online buddies"
 msgstr "ӵ ģ  ׷ "
 
-#: src/prefs.c:620
+#: src/prefs.c:527
 msgid "Show numbers in groups"
 msgstr "׷쿡 ο ǥ"
 
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "ģ ǥ"
-
-#: src/prefs.c:634
+#: src/prefs.c:536
 msgid "Show buddy type icons"
 msgstr "ģ  ׸ ֱ"
 
-#: src/prefs.c:635
+#: src/prefs.c:537
 msgid "Show warning levels"
 msgstr "  ǥ"
 
-#: src/prefs.c:641
+#: src/prefs.c:538
 msgid "Show idle times"
 msgstr "  ð ֱ"
 
-#: src/prefs.c:642
+#: src/prefs.c:539
 msgid "Grey idle buddies"
 msgstr "ڸ ģ ȸ ǥϱ"
 
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "ȭ ɼ"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Ű ɼ"
-
-#: src/prefs.c:683
-msgid "Enter sends message"
-msgstr "Ű  ޽ "
-
-#: src/prefs.c:684
-msgid "Control-Enter sends message"
-msgstr "Ʈ-Ű  ޽ "
-
-#: src/prefs.c:685
-msgid "Escape closes window"
-msgstr "Esc Ű  â "
-
-#: src/prefs.c:686
-msgid "Control-W closes window"
-msgstr "Ʈ-W Ű  â "
-
-#: src/prefs.c:692
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Ʈ-{B/I/U/S}  HTL ± "
-
-#: src/prefs.c:693
-msgid "Control-(number) inserts smileys"
-msgstr "Ʈ-() Ͽ ׸ "
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr " ȭâ  ũ"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr " ȭâ  ũ"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Ʈ  "
+
+#: src/prefs.c:571 src/prefs.c:633
+msgid "Raise windows on events"
+msgstr "޽  ڵ â ø"
+
+#: src/prefs.c:572
+msgid "Hide window on send"
+msgstr "޽   ڵ â ݱ"
+
+#: src/prefs.c:581
+msgid "Hide Buddy Icons"
+msgstr "ģ  "
+
+#: src/prefs.c:582
+msgid "Disable Buddy Icon Animation"
+msgstr "ִϸ̼ "
+
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "â  ֱ"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr " ģ Ÿ  ˸"
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr " Ű  ڵϼϱ"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "  ڵϼϱ"
+
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "ģ ϴ/° â "
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr " ä ϳ â  "
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr " Ǵ   ֱ"
 
 #: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "Ÿӽ  ϱ  F2 "
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "ȭǥ  Ϲ ɼ"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "̸Ƽ ׸ ֱ"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "޽ ð ǥ"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "URL  ũ ֱ"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Ʋ öڸ Ͽ ǥ"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "޽  ڸ ¿ "
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "ڸ߿   ޽ "
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr " "
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "۲ "
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr " ũ "
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "TiK ڵȭ ޽ "
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "ڸ ο ȭ "
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "޽ ɼ"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "޽ â"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "  ư Դϴ: "
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "ܰ "
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "ܸ"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "ڸ"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr " ȭ ϳ â  "
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "äõ ȭ  â  "
-
-#: src/prefs.c:967 src/prefs.c:1119
-msgid "Raise windows on events"
-msgstr "޽  ڵ â ø"
-
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "â  ֱ"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr " Ǵ   ֱ"
-
-#: src/prefs.c:970
-msgid "Hide window on send"
-msgstr "޽   ڵ â ݱ"
-
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "â ũ"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr " ȭâ  ũ"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr " ȭâ  ũ"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Ʈ  "
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr " ġ"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr ""
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr ""
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "ģ "
-
-#: src/prefs.c:1031
-msgid "Hide Buddy Icons"
-msgstr "ģ  "
-
-#: src/prefs.c:1037
-msgid "Disable Buddy Icon Animation"
-msgstr "ִϸ̼ "
-
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "ä ɼ"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "׷ ä â"
-
-#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr " ä ϳ â  "
 
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "ȭ äð  â  "
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "ģ ϴ/° â "
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "ڵϼ"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr " Ű  ڵϼϱ"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "  ڵϼϱ"
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "޲ ɼ"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr " ۾"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr ""
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "ؽƮ  ۲"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "ؽƮ   ũ"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr " - Ҹ "
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "׽Ʈ"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr ""
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Ҹ ɼ"
-
-#: src/prefs.c:1649
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "äõ ȭ  â  "
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Ͻ "
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "ȣƮ"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Ʈ"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr ""
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "н"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "⺻  â "
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr " ȭ "
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "HTML ±״  "
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "ģ / "
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "ģ / "
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "ڽ ڸ/ƿ "
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "ڽ //ڸ "
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "ģ     α "
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "ӽ Ҹ  "
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "ڸ Ҹ "
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "Ҹ  "
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3369,106 +3201,125 @@
 "Ҹ  ɾ\n"
 "(%s  ̸)"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "  Ҹ :"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "ڸ"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "޽  ڸ ¿ "
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "ڸ߿   ޽ "
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "ڸ ο ȭ "
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "ڵ 亯  "
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "Խÿ ڵ 亯 "
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr " ð   ڵ 亯( ):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr " "
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "     ڸ ޽ : "
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "޽"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr " - Ҹ "
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr "׽Ʈ"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr ""
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr ""
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr " ڸ"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "̹ ɼ"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr " :"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr " ڰ   ֵ "
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr " Ͽ ִ ڸ   ֵ "
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr " "
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr " ڸ ź"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr " Ͽ ִ ڸ "
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr " "
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "νϽ:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "۲"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "޽"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "޽ â"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "׷ ä â"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Ͻ"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr ""
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Ҹ"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Ҹ"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "ڸ : "
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "ڸ"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr " - ȯ漳"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "   â"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Ϲ"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Ͻ"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "ȭ"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Ҹ"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "̹"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3483,37 +3334,50 @@
 msgid "Protocol Error"
 msgstr " "
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "  "
+
+#: src/prpl.c:101
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s  %s ߽ϴ. %s  Դϴ."
 
-#: src/prpl.c:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr ""
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "޾Ƶϱ?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr " - "
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr " -  "
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr " "
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s %s ģ Ͽ ߰ ߽ϴ%s%s%s"
 
-#: src/prpl.c:578
+#: src/prpl.c:586
 msgid ""
 "\n"
 "\n"
@@ -3523,21 +3387,21 @@
 "\n"
 " ģ Ͽ ߰ұ?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "     ִ  ϴ."
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr " - "
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr ""
 
@@ -3545,28 +3409,28 @@
 msgid "Please enter your password"
 msgstr "йȣ Էϼ"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d ޽)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 ޽)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr ""
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Ȯ"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr ""
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr " "
 
@@ -3614,6 +3478,187 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "General Options"
+#~ msgstr "Ϲ ɼ"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr "ٸ    ɼ   ˴ϴ."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Ÿ "
+
+#~ msgid "Report Idle Times"
+#~ msgstr "  ð ֱ"
+
+#~ msgid "None"
+#~ msgstr " "
+
+#~ msgid "Gaim Use"
+#~ msgstr "   ð ֱ"
+
+#~ msgid "X Use"
+#~ msgstr "X   ð ֱ"
+
+#~ msgid "Opera"
+#~ msgstr ""
+
+#~ msgid "Netscape"
+#~ msgstr "ݽ"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "׳ URL ó"
+
+#~ msgid "Galeon"
+#~ msgstr ""
+
+#~ msgid "Proxy Options"
+#~ msgstr "Ͻ ɼ"
+
+#~ msgid ""
+#~ "Not all protocols can use these proxy options. Please see the README file "
+#~ "for details."
+#~ msgstr ""
+#~ "Ͻø     ֽϴ. ڼ  ϸ README "
+#~ " оʽÿ."
+
+#~ msgid "Proxy Type"
+#~ msgstr "Ͻ "
+
+#~ msgid "No Proxy"
+#~ msgstr "Ͻ  "
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS v4 Ͻ"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS v5 Ͻ"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP Ͻ"
+
+#~ 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 "ȭ ɼ"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Ű ɼ"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "Ÿӽ  ϱ  F2 "
+
+#~ msgid "Display and General Options"
+#~ msgstr "ȭǥ  Ϲ ɼ"
+
+#~ msgid "IM Options"
+#~ msgstr "޽ ɼ"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "  ư Դϴ: "
+
+#~ msgid "Pictures And Text"
+#~ msgstr "ܰ "
+
+#~ msgid "Pictures"
+#~ msgstr "ܸ"
+
+#~ msgid "Text"
+#~ msgstr "ڸ"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr " ȭ ϳ â  "
+
+#~ msgid "Window Sizes"
+#~ msgstr "â ũ"
+
+#~ msgid "Tab Placement"
+#~ msgstr " ġ"
+
+#~ msgid "Left"
+#~ msgstr ""
+
+#~ msgid "Right"
+#~ msgstr ""
+
+#~ msgid "Buddy Icons"
+#~ msgstr "ģ "
+
+#~ msgid "Chat Options"
+#~ msgstr "ä ɼ"
+
+#~ msgid "Show conversations in the same tabbed window"
+#~ msgstr "ȭ äð  â  "
+
+#~ msgid "Tab Completion"
+#~ msgstr "ڵϼ"
+
+#~ msgid "Font Options"
+#~ msgstr "޲ ɼ"
+
+#~ msgid "Italic Text"
+#~ msgstr " ۾"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "ؽƮ  ۲"
+
+#~ msgid "Font Size for Text"
+#~ msgstr "ؽƮ   ũ"
+
+#~ msgid "Sound Options"
+#~ msgstr "Ҹ ɼ"
+
+#~ msgid "Sound method"
+#~ msgstr "Ҹ  "
+
+#~ msgid "Sound played when:"
+#~ msgstr "  Ҹ :"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr " ð   ڵ 亯( ):"
+
+#~ msgid "Auto Away after"
+#~ msgstr " "
+
+#~ msgid "minutes using"
+#~ msgstr "     ڸ ޽ : "
+
+#~ msgid "Messages"
+#~ msgstr "޽"
+
+#~ msgid "Make Away"
+#~ msgstr " ڸ"
+
+#~ msgid "Privacy Options"
+#~ msgstr "̹ ɼ"
+
+#~ msgid "General"
+#~ msgstr "Ϲ"
+
+#~ msgid "Conversations"
+#~ msgstr "ȭ"
+
 #~ msgid "Enable sounds"
 #~ msgstr "Ҹ "
 
--- a/po/nl.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/nl.po	Thu Aug 08 18:11:17 2002 +0000
@@ -3,11 +3,10 @@
 # Floris Eshuis <f.eshuis@hccnet.nl>, 2001.
 # upgraded by Reinier Lamers <tux_rocker@planet.nl>, 2002
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-09 15:51+0100\n"
+"Project-Id-Version: Gaim 0.60\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -16,483 +15,1099 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Anjuta 0.1.7\n"
 
-#: src/about.c:94
-#, c-format
-msgid "About Gaim v%s"
-msgstr "Over Gaim v%s"
-
-#: src/about.c:127
-msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
-"\n"
-"URL: "
-msgstr ""
-"Gaim is een Client gebaseerd op het AOL's Intstant Messenger protocol. "
-"Het is in Gtk+ geschreven en is uitgegeven onder de GPL.\n"
-"\n"
-"URL: "
-
-#: src/about.c:137
-msgid ""
-"Rob Flynn (maintainer)               rob@marko.net\n"
-"Eric Warmenhoven (lead coder)  warmenhoven@yahoo.com\n"
-"\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Sean Egan\n"
-"Jim Duchek\n"
-"Mark Spencer (original author)   markster@marko.net"
-msgstr ""
-
-#: src/about.c:148 src/about.c:213 src/aim.c:295 src/buddy.c:2403
-#: src/buddy_chat.c:1301 src/buddy_chat.c:1400 src/buddy_chat.c:1430
-#: src/conversation.c:2295 src/dialogs.c:446 src/dialogs.c:3631
-#: src/multi.c:1002 src/plugins.c:277 src/prefs.c:2415 src/prpl.c:438
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Buddy Chat"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - Chat"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/about.c:168
-msgid "Web Site"
-msgstr "Website"
-
-#: src/about.c:223
-msgid ""
-"Relax, help is just around the corner. The first thing you'll need to do is "
-"get an AIM account; you can get one from http://aim.aol.com/. Just click the "
-"button that says \"New Users\" and you can create an account that way. Once "
-"you have your account, enter the username and password into the login window "
-"that comes up when you start Gaim, and click the Signon button. Once you're "
-"online, you can talk to one of the Gaim developers for more assistance; "
-"their contact information is in the AUTHORS file in the Gaim source, or at "
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "Chat Opties"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
+msgid "Add"
+msgstr "Toevoegen"
+
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
 msgstr ""
-"Rustig... Hulp is makkelijk te vinden. Het eerste wat u moet doen is een AIM "
-"account aanmaken. Dat kan op http://aim.aol.com/. Klik op de knop "
-"\"New Users\" en daarmee kunt u een nieuw account aanmaken. Heeft u dat "
-"eenmaal gedaan dan kunt u zich aanmelden door uw gekozen Gebruikersnaam en "
-"wachtwoord in te vullen in het login venster dat vershijnt als u gaim start. "
-"Klik op aanmelden en u kunt gesprekken voeren met andere AIM gebruikers maar "
-"ook met enkele van de Gaim ontwikkelaars. Zie het AUTHORS bestand of op " 
-
-#: src/aim.c:128 src/buddy.c:2396
-msgid "Signoff"
-msgstr "Afmelden"
-
-#: src/aim.c:140
-msgid "Please enter your logon"
-msgstr "Vul je loginnaam in"
-
-#: src/aim.c:140 src/multi.c:1231 src/server.c:53
-msgid "Signon Error"
-msgstr "Aanmeldingsfout"
-
-#: src/aim.c:238
-msgid "Gaim - Login"
-msgstr "Gaim - Aanmelden"
-
-#: src/aim.c:256
-msgid "Screen Name: "
-msgstr "Gebruikersnaam:"
-
-#: src/aim.c:272
-msgid "Password: "
-msgstr "Wachtwoord:"
-
-#: src/aim.c:293 src/buddy.c:2400
-msgid "Quit"
-msgstr "Afsluiten"
-
-#: src/aim.c:298 src/aim.c:745 src/buddy.c:2426
-msgid "Accounts"
-msgstr "Accounts"
-
-#: src/aim.c:300 src/multi.c:854
-msgid "Signon"
-msgstr "Aanmelden"
-
-#: src/aim.c:332
-msgid "Help!"
-msgstr "Help"
-
-#: src/aim.c:333 src/prefs.c:1525 src/prefs.c:1799
-msgid "Options"
-msgstr "Opties"
-
-#: src/aim.c:335 src/aim.c:748 src/buddy.c:2444 src/plugins.c:192
-msgid "Plugins"
-msgstr "Plugins"
-
-#: src/aim.c:742 src/buddy.c:2436
-msgid "Preferences"
-msgstr "Instellingen"
-
-#: src/protocols/gg/gg.c:68
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "Nee"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "Kanaal"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: src/protocols/gg/gg.c:69
+#: src/protocols/gg/gg.c:72
 msgid "Available for friends only"
 msgstr "Alleen beschikbaar voor vrienden"
 
-#: src/applet.c:291 src/buddy.c:478 src/buddy.c:2274 src/buddy.c:2410
-#: src/protocols/gg/gg.c:70
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Afwezig"
 
-#: src/protocols/gg/gg.c:71
+#: src/protocols/gg/gg.c:74
 msgid "Away for friends only"
 msgstr "Alleen afwezig voor vrienden"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:75
 #, fuzzy
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#: src/protocols/gg/gg.c:73
+#: src/protocols/gg/gg.c:76
 msgid "Invisible for friends only"
 msgstr "Alleen onzichtbaar voor vrienden"
 
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "Niet Beschikbaar"
 
-#: src/protocols/gg/gg.c:168
+#: src/protocols/gg/gg.c:182
 #, fuzzy
 msgid "Unable to resolve hostname."
 msgstr "Kan het bestand %s niet lezen."
 
-#: src/protocols/gg/gg.c:171
+#: src/protocols/gg/gg.c:185
 #, fuzzy
 msgid "Unable to connect to server."
 msgstr "Aanmelden niet mogelijk"
 
-#: src/protocols/gg/gg.c:174
+#: src/protocols/gg/gg.c:188
 msgid "Invalid response from server."
 msgstr "Onjuist antwoord van server"
 
-#: src/protocols/gg/gg.c:177
+#: src/protocols/gg/gg.c:191
 #, fuzzy
 msgid "Error while reading from socket."
 msgstr "Fout bij het lezen van socket"
 
-#: src/protocols/gg/gg.c:180
-msgid "Error while writting to socket."
+#: src/protocols/gg/gg.c:194
+#, fuzzy
+msgid "Error while writing to socket."
 msgstr "Fout bij het schrijven naar socket"
 
-#: src/protocols/gg/gg.c:183
+#: src/protocols/gg/gg.c:197
 #, fuzzy
-msgid "Authentification failed."
+msgid "Authentication failed."
 msgstr "Identificatie mislukt"
 
-#: src/protocols/gg/gg.c:186
+#: src/protocols/gg/gg.c:200
 msgid "Unknown Error Code."
 msgstr "Onbekende Foutcode"
 
-#: src/protocols/gg/gg.c:191 src/protocols/gg/gg.c:597
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:838
-#: src/protocols/gg/gg.c:875 src/protocols/gg/gg.c:919
-#, fuzzy
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu Fout"
-
-#: src/protocols/gg/gg.c:311
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:326
+#: src/protocols/gg/gg.c:317
 msgid "Nick:"
 msgstr "Bijnaam:"
 
-#: src/protocols/gg/gg.c:327
+#: src/protocols/gg/gg.c:318
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Gebruiker"
 
-#: src/protocols/gg/gg.c:462
+#: src/protocols/gg/gg.c:337
+#, fuzzy
+msgid "Could not connect"
+msgstr "Kan geen verbinding maken"
+
+#: src/protocols/gg/gg.c:344
+#, fuzzy
+msgid "Unable to read socket"
+msgstr "Kan het bestand %s niet lezen."
+
+#: src/protocols/gg/gg.c:455
 #, fuzzy
 msgid "Unable to connect."
 msgstr "Kan geen directe verbinding openen"
 
-#: src/protocols/gg/gg.c:473
-msgid "Handshake"
-msgstr "Handshake"
-
-#: src/protocols/gg/gg.c:475
+#: src/protocols/gg/gg.c:465
+msgid "Reading data"
+msgstr ""
+
+#: src/protocols/gg/gg.c:468
+msgid "Balancer handshake"
+msgstr ""
+
+#: src/protocols/gg/gg.c:471
 #, fuzzy
-msgid "Connecting to GG server"
-msgstr "Verbinding maken met GG server"
-
-#: src/protocols/gg/gg.c:478
-#, fuzzy
-msgid "Waiting for server key"
+msgid "Reading server key"
 msgstr "Wacht op antwoord..."
 
-#: src/protocols/gg/gg.c:480
+#: src/protocols/gg/gg.c:474
+msgid "Exchanging key hash"
+msgstr ""
+
+#: src/protocols/gg/gg.c:482
+msgid "Critical error in GG library\n"
+msgstr ""
+
+#: src/protocols/gg/gg.c:521
 #, fuzzy
-msgid "Sending key"
-msgstr "Verzend bestand"
-
-#: src/protocols/gg/gg.c:543
+msgid "Unable to ping server"
+msgstr "Aanmelden niet mogelijk"
+
+#: src/protocols/gg/gg.c:533
+#, fuzzy
+msgid "Send as message"
+msgstr "Verzend Bericht als"
+
+#: src/protocols/gg/gg.c:541
 msgid "Looking up GG server"
 msgstr "Bezig met vinden GG-server"
 
-#: src/protocols/gg/gg.c:546
+#: src/protocols/gg/gg.c:544
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Onjuiste Gadu-Gadu UIN opgegeven"
 
-#: src/protocols/gg/gg.c:573
+#: src/protocols/gg/gg.c:570
 #, fuzzy, c-format
 msgid "Connect to %s failed"
 msgstr "Verbinding naar %s afgebroken"
 
-#: src/protocols/gg/gg.c:596
-msgid "You are trying to send message to invalid Gadu-Gadu UIN!"
+#: src/protocols/gg/gg.c:594
+#, fuzzy
+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:696
+#: 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"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:662
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Zoekmachine"
 
-#: src/protocols/gg/gg.c:728
+#: src/protocols/gg/gg.c:687
 msgid "Active"
 msgstr "Actief"
 
-#: src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:688
 #, fuzzy
 msgid "yes"
 msgstr "Ja"
 
-#: src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:688
 #, fuzzy
 msgid "no"
 msgstr "Nee"
 
-#: src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:692
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:737
+#: src/protocols/gg/gg.c:696
 #, fuzzy
 msgid "First name"
 msgstr "Voornaam"
 
-#: src/protocols/gg/gg.c:742
+#: src/protocols/gg/gg.c:701
 #, fuzzy
 msgid "Second Name"
 msgstr "Gebruikersnaam: "
 
-#: src/protocols/gg/gg.c:746
+#: src/protocols/gg/gg.c:705
 msgid "Nick"
 msgstr "Bijnaam"
 
-#: src/protocols/gg/gg.c:753 src/protocols/gg/gg.c:756
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
 msgid "Birth year"
 msgstr "Geboortedatum"
 
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:764
-#: src/protocols/gg/gg.c:766
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:725
 msgid "Sex"
 msgstr "Geslacht"
 
-#. Line 5
-#: src/dialogs.c:1384 src/dialogs.c:2065 src/protocols/gg/gg.c:770
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Stad"
 
-#: src/protocols/gg/gg.c:838
-msgid "Couldn't send search request"
+#: src/protocols/gg/gg.c:761
+msgid "There is no Buddy List stored on server. Sorry!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:768
+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
+#, fuzzy
+msgid "Gadu-Gadu Information"
+msgstr "Gadu-Gadu Fout"
+
+#: src/protocols/gg/gg.c:821
+msgid "Couldn't transfer Buddy List to server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:827
+msgid "Buddy List sucessfully deleted from server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:833
+msgid "Couldn't delete Buddy List from server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:839
+#, fuzzy
+msgid "Password changed successfully"
+msgstr "Wachtwoord Veranderen Gelukt"
+
+#: src/protocols/gg/gg.c:845
+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:874 src/protocols/gg/gg.c:918
+#: 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)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1064
+#, c-format
+msgid "Deletion of Buddies List from Server failed (%s)"
+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:884 src/protocols/gg/gg.c:893
+#: 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
 #, fuzzy
 msgid "Directory Search"
 msgstr "Profiel"
 
-#: src/protocols/gg/gg.c:960
+#: 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
+msgid "Change Password"
+msgstr "Verander Wachtwoord"
+
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#, fuzzy
+msgid "Import Buddies List from Server"
+msgstr "Buddy Lijst importeren"
+
+#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
 #, fuzzy
-msgid "Send as message"
-msgstr "Verzend Bericht als"
-
-#: src/protocols/icq/gaim_icq.c:464 src/protocols/irc/irc.c:1444
-#: src/protocols/jabber/jabber.c:1644 src/protocols/oscar/oscar.c:2640
-#: src/protocols/toc/toc.c:1198
+msgid "Export Buddies List to Server"
+msgstr "Buddy Lijst importeren"
+
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+msgid "Delete Buddies List from 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/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Haal Info op"
 
-#: src/protocols/irc/irc.c:425 src/protocols/irc/irc.c:943
+#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#, fuzzy, c-format
+msgid "DCC Chat with %s closed"
+msgstr "Directe verbinding met %s afgesloten"
+
+#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s heeft het onderwerp veranderd naar: %s</B>"
 
-#: src/protocols/irc/irc.c:659
+#: src/protocols/irc/irc.c:825
 msgid "No such nick/channel"
 msgstr "Bijnaam of kanaal bestaat niet"
 
-#: src/protocols/irc/irc.c:659 src/protocols/irc/irc.c:662
-#: src/protocols/irc/irc.c:664 src/protocols/irc/irc.c:879
+#: 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"
 
-#: src/protocols/irc/irc.c:662
+#: src/protocols/irc/irc.c:828
 msgid "No such server"
 msgstr "Onjuiste server"
 
-#: src/protocols/irc/irc.c:664
+#: src/protocols/irc/irc.c:830
 msgid "No nickname given"
 msgstr "Geen bijnaam opgegeven"
 
-#: src/protocols/irc/irc.c:823
+#: src/protocols/irc/irc.c:976
+#, c-format
+msgid ""
+"%s has requested a DCC chat.  Would you like to establish the direct "
+"connection?"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 #, fuzzy
 msgid "Unable to write"
 msgstr "Kan niet naar bestand %s schrijven."
 
-#: src/protocols/irc/irc.c:877
+#: src/protocols/irc/irc.c:1071
 #, fuzzy, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "De verbinding met chat ruimte %s is verbroken"
 
-#: src/protocols/irc/irc.c:1276
+#: src/protocols/irc/irc.c:1076
+#, c-format
+msgid "Kicked by %s: %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1581
 #, c-format
 msgid "You have left %s"
 msgstr "U heeft %s verlaten"
 
-#: src/protocols/irc/irc.c:1277
+#: src/protocols/irc/irc.c:1582
 msgid "IRC Part"
 msgstr "IRC Part"
 
-#: src/protocols/irc/irc.c:1349
+#: src/protocols/irc/irc.c:1671
 #, fuzzy
 msgid "Channel:"
 msgstr "Kanaal"
 
-#: src/multi.c:506 src/protocols/irc/irc.c:1353
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Wachtwoord: "
 
-#: src/protocols/jabber/jabber.c:1352
+#: src/protocols/irc/irc.c:1856
+#, fuzzy
+msgid "DCC Chat"
+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 - Wachtwoord Veranderen"
+
+#: src/protocols/jabber/jabber.c:955
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1115
+msgid "Unknown"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
+msgid "Online"
+msgstr "Online"
+
+#: src/protocols/jabber/jabber.c:1145
+msgid "Extended Away"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1147
+msgid "Do Not Disturb"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1457
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1460
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Onbekende Foutcode"
+
+#: src/protocols/jabber/jabber.c:1630
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+"\n"
+"\n"
+"Wilt u ze toevoegen aan uw buddy lijst?"
+
+#: src/protocols/jabber/jabber.c:1655
+#, 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
+msgid "Buddies"
+msgstr "Buddy's"
+
+#: src/protocols/jabber/jabber.c:1805
+#, fuzzy
+msgid "Authenticating"
+msgstr "Identificatie mislukt"
+
+#: src/protocols/jabber/jabber.c:1842
+#, fuzzy
+msgid "Unknown login error"
+msgstr "Onbekende Foutcode"
+
+#: src/protocols/jabber/jabber.c:2033
+#, 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
+#, 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
+#, fuzzy
+msgid "Unable to connect"
+msgstr "Kan geen directe verbinding openen"
+
+#: src/protocols/jabber/jabber.c:2085
+#, fuzzy
+msgid "Connected"
+msgstr "Verbinding verbroken"
+
+#: src/protocols/jabber/jabber.c:2088
+#, fuzzy
+msgid "Requesting Authentication Method"
+msgstr "Identificatie mislukt"
+
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#, fuzzy
+msgid "Connecting"
+msgstr "Verbinding verbroken"
+
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
+msgid "Invalid Jabber I.D."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: src/protocols/jabber/jabber.c:1356
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:1361
+#: src/protocols/jabber/jabber.c:2657
 #, fuzzy
 msgid "Handle:"
 msgstr "Handle:"
 
-#: src/protocols/msn/msn.c:566
+#: src/protocols/jabber/jabber.c:2714
+#, fuzzy
+msgid "Chats"
+msgstr "Chat"
+
+#: src/protocols/jabber/jabber.c:3029
+#, fuzzy
+msgid "View Error Msg"
+msgstr "Toon Logboek"
+
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
+msgid "Get Away Msg"
+msgstr "Haal afwezigheidsbericht op"
+
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "Popup Melding"
+
+#: src/protocols/jabber/jabber.c:3281
+#, fuzzy
+msgid "Full Name"
+msgstr "Voornaam"
+
+#: src/protocols/jabber/jabber.c:3282
+#, fuzzy
+msgid "Family Name"
+msgstr "Voornaam"
+
+#: src/protocols/jabber/jabber.c:3283
+#, fuzzy
+msgid "Given Name"
+msgstr "Meisjesnaam"
+
+#: src/protocols/jabber/jabber.c:3284
+#, fuzzy
+msgid "Nickname"
+msgstr "Bijnaam"
+
+#: 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 ""
+
+#: src/protocols/jabber/jabber.c:3290
+msgid "Postal Code"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+msgid "Country"
+msgstr "Land"
+
+#: src/protocols/jabber/jabber.c:3292
+#, fuzzy
+msgid "Telephone"
+msgstr "Niets Selecteren"
+
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+msgid "Email"
+msgstr "E-mail"
+
+#: src/protocols/jabber/jabber.c:3294
+msgid "Organization Name"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3295
+msgid "Organization Unit"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3296
+msgid "Title"
+msgstr "Titel"
+
+#: src/protocols/jabber/jabber.c:3297
+#, fuzzy
+msgid "Role"
+msgstr "Verwijderen"
+
+#: src/protocols/jabber/jabber.c:3298
+#, fuzzy
+msgid "Birthday"
+msgstr "Geboortedatum"
+
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+msgid "Description"
+msgstr "Beschrijving"
+
+#: src/protocols/jabber/jabber.c:3324
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3325
+msgid "User Identity"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3737
+msgid "Gaim - Edit Jabber vCard"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3811
+msgid "Server Registration successful!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3838
+msgid "Unknown registration error"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#, fuzzy
+msgid "Set User Info"
+msgstr "Gebruikersinfo"
+
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "van Gaim"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+msgid "Invalid Username"
+msgstr ""
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "Meisjesnaam"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+msgid "Not on list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s heeft zich aangemeld"
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "Interne Fout"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "Interne verbindingsfout\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "Fatale verbindingsgout!\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr "Server:"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "Niet Beschikbaar"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "Interne verbindingsfout\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Fout: Kan geen verbinding maken.\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "Te veel matches."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Identificatie mislukt"
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "Geen geluid bij aanmelden"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "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:566
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:815
 #, fuzzy
 msgid "Gaim was unable to send a message"
 msgstr "Gaim kon een bericht niet verzenden"
 
-#: src/protocols/napster/napster.c:444 src/protocols/oscar/oscar.c:2338
-#: src/protocols/toc/toc.c:1086
+#: src/protocols/msn/msn.c:919
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1076
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1177
+#, 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
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Fout bij het lezen van socket"
+
+#: src/protocols/msn/msn.c:1570
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1620
+#, fuzzy
+msgid "Unable to send password"
+msgstr "Kan bericht niet verzenden: Te groot"
+
+#: src/protocols/msn/msn.c:1625
+#, fuzzy
+msgid "Password sent"
+msgstr "Wachtwoord:"
+
+#: src/protocols/msn/msn.c:1750
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Aanmelden niet mogelijk"
+
+#: src/protocols/msn/msn.c:1756
+#, fuzzy
+msgid "Synching with server"
+msgstr "Verbinding maken met GG server"
+
+#: 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
+#, fuzzy
+msgid "Busy"
+msgstr "Buddy"
+
+#: src/protocols/msn/msn.c:1925
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1926
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1927
+#, fuzzy
+msgid "Hidden"
+msgstr "Verstop Icon"
+
+#: src/protocols/msn/msn.c:2043
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2116
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "Gebruikersnaam: "
+
+#: src/protocols/msn/msn.c:2132
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "Gebruikersnaam:"
+
+#: src/protocols/msn/msn.c:2133
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
+#, fuzzy
+msgid "Invalid name"
+msgstr "Meisjesnaam"
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Welke groep binnengaan:"
 
-#: src/protocols/oscar/oscar.c:292
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Directe verbinding met %s afgesloten"
 
-#: src/protocols/oscar/oscar.c:328
+#: src/protocols/oscar/oscar.c:332
+#, fuzzy, c-format
+msgid "Direct IM with %s failed"
+msgstr "Directe verbinding met %s afgesloten"
+
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "Verbindingsfout!\n"
 
-#: src/protocols/oscar/oscar.c:339
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "Fatale verbindingsgout!\n"
 
-#: src/protocols/oscar/oscar.c:340 src/protocols/toc/toc.c:510
-#: src/protocols/toc/toc.c:520 src/protocols/toc/toc.c:586
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "Verbinding verbroken"
 
-#: src/protocols/oscar/oscar.c:352 src/protocols/toc/toc.c:754
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "De verbinding met chat ruimte %s is verbroken"
 
-#: src/protocols/oscar/oscar.c:353
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "Chat Fout!"
 
-#: src/protocols/oscar/oscar.c:363
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chat is momenteel niet bereikbaar."
 
-#: src/protocols/oscar/oscar.c:364
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - Chat"
 
-#: src/protocols/oscar/oscar.c:423 src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "Kan geen verbinding maken met host"
 
-#: src/protocols/oscar/oscar.c:431
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "Wachtwoord verzonden, wacht op antwoord\n"
 
-#: src/protocols/oscar/oscar.c:442
-#, c-format
-msgid "Logging in %s\n"
-msgstr "Bezig met aanmelden %s\n"
-
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "Interne verbindingsfout\n"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "Aanmelden bij AIM niet mogelijk"
 
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr "Aanmelding: %s"
 
-#: src/protocols/oscar/oscar.c:525
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "Afgemeld.\n"
 
-#: src/protocols/oscar/oscar.c:544 src/protocols/oscar/oscar.c:691
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "Kan geen verbinding maken"
 
-#: src/protocols/oscar/oscar.c:552
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr "Verbinding hersteld, Cookie verzonden"
 
-#. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:601 src/protocols/toc/toc.c:458
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#. Suspended account
-#: src/protocols/oscar/oscar.c:606
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Uw Account is momenteel afgesloten"
 
-#. connecting too frequently
-#: src/protocols/oscar/oscar.c:610
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -500,84 +1115,255 @@
 "U heeft zich te snel aan en afgemeld. Wacht 10 minuten en probeer het nog "
 "een keer. Als u verdergaat moet u nog langer wachten "
 
-#. client too old
-#: src/protocols/oscar/oscar.c:615
+#: src/protocols/oscar/oscar.c:653
 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:619 src/protocols/toc/toc.c:538
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Identificatie mislukt"
 
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "Interne Fout"
 
-#: src/protocols/oscar/oscar.c:1233 src/protocols/oscar/oscar.c:2544
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte verbinding met %s hersteld"
 
-#: src/protocols/oscar/oscar.c:1472
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#, c-format
+msgid ""
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#, fuzzy
+msgid "No reason given."
+msgstr "Geen bijnaam opgegeven"
+
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
+msgid "Gaim - ICQ Authorization Denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#, c-format
+msgid "The user %lu has granted your request to add them to your contact list."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
+msgid "Gaim - ICQ Authorization Granted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1585
 #, fuzzy, c-format
-msgid "You missed %d message%s from %s because %s invalid."
-msgstr "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
-
-#: src/protocols/oscar/oscar.c:1482
+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
+#, 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
 #, fuzzy, c-format
-msgid "You missed %d message%s from %s because %s too large."
-msgstr "Een bericht van %s is niet overgekomen omdat het te snel verzonden werd."
-
-#: src/protocols/oscar/oscar.c:1492
+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
+#, 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
+#, 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
 #, fuzzy, c-format
 msgid ""
-"You missed %d message%s from %s because the rate limit has been exceeded."
+"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
+#, 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
+#, 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
+#, 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
+#, 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:1501
+#: src/protocols/oscar/oscar.c:1634
 #, fuzzy, c-format
-msgid "You missed %d message%s 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:1510
+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
 #, fuzzy, c-format
-msgid "You missed %d message%s 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:1518
-#, fuzzy, c-format
-msgid "You missed %d message%s from %s for unknown reasons."
+msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Een bericht van %s is niet overgekomen, oorzaak onbekend"
 
-#: src/dialogs.c:2805 src/dialogs.c:2811 src/protocols/oscar/oscar.c:1524
-#: src/protocols/oscar/oscar.c:1556 src/protocols/oscar/oscar.c:1574
-#: src/protocols/yahoo/yay.c:168
+#: 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:1554
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
+#, c-format
+msgid "SNAC threw error: %s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1736
+#, fuzzy
+msgid "Gaim - Oscar SNAC Error"
+msgstr "Gaim - Fout"
+
+#: src/protocols/oscar/oscar.c:1753
+#, fuzzy, 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:1555 src/protocols/oscar/oscar.c:1573
+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:1572
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
-msgstr "Gebruikersinformatie voor %s is niet toegankelijk"
-
-#: src/protocols/oscar/oscar.c:1613
-#, c-format
+msgstr ""
+
+# #: src/protocols/oscar/oscar.c:1771
+# #, c-format
+# msgid "User information for %s unavailable: %s"
+# msgstr "Gebruikersinformatie voor %s is niet toegankelijk"
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
+msgid "Buddy Icon"
+msgstr "Buddy Icon"
+
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
+msgid "Voice"
+msgstr "Stem"
+
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
+msgid "IM Image"
+msgstr "IM Afbeelding"
+
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
+msgid "Chat"
+msgstr "Chat"
+
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
+msgid "Get File"
+msgstr "Bestanden Ophalen"
+
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
+msgid "Send File"
+msgstr "Bestanden Verzenden"
+
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
+msgid "Games"
+msgstr "Spellen"
+
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
+msgid "Stocks"
+msgstr "Koersen"
+
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "Buddy Lijst"
+
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
+msgid "EveryBuddy Bug"
+msgstr "Everybuddy Bug"
+
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
+#, fuzzy
+msgid "AP User"
+msgstr "Gebruiker"
+
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
+msgid "ICQ RTF"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
+msgid "Nihilist"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
+msgid "ICQ Unknown"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1886
+#, fuzzy
+msgid ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
+msgstr ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legenda:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normale AIM gebruiker<br><IMG SRC=\"aol_icon.gif\"> : AOL Gebruiker "
+"<br><IMG SRC=\"dt_icon.gif\"> : Trial AIM gebruiker <br><IMG SRC="
+"\"admin_icon.gif\"> : Administrator"
+
+#: src/protocols/oscar/oscar.c:1914
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
-"%sWarning Level : <B>%d %%</B><BR>\n"
-"Online Since : <B>%s</B><BR>\n"
-"Idle Minutes : <B>%d</B>\n"
-"<BR>\n"
+"Warning Level : <B>%d %%</B><BR>\n"
+"%s%s%s<BR>\n"
 "<HR><BR>\n"
 msgstr ""
 "Gebruikersnaam : <B>%s</B>  %s <BR>\n"
@@ -587,52 +1373,62 @@
 "<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1624
-#, fuzzy
-msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
-"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
-"Administrator"
-msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legenda:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Normale AIM gebruiker<br><IMG SRC=\"aol_icon.gif\"> : AOL Gebruiker "
-"<br><IMG SRC=\"dt_icon.gif\"> : Trial AIM gebruiker <br><IMG SRC=\"admin_icon."
-"gif\"> : Administrator"
-
-#: src/protocols/oscar/oscar.c:1634
-msgid "<i>No Information Provided</i>"
-msgstr "<i>Geen Informatie Gegeven</i>"
-
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>Gebruiker heeft geen afwezigheidsbericht</i>"
 
-#: src/protocols/oscar/oscar.c:1660
+#: src/protocols/oscar/oscar.c:1958
+#, fuzzy
+msgid "Client Capabilities: "
+msgstr "Mogelijkheden: %s\n"
+
+#: src/protocols/oscar/oscar.c:1966
+msgid "<i>No Information Provided</i>"
+msgstr "<i>Geen Informatie Gegeven</i>"
+
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "Uw verbinding is verbroken"
 
-#: src/protocols/oscar/oscar.c:1661
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL fout"
 
-#: src/dialogs.c:3338 src/protocols/oscar/oscar.c:2083
-#: src/protocols/oscar/oscar.c:2618 src/protocols/toc/toc.c:1543
-#: src/protocols/toc/toc.c:1560 src/protocols/toc/toc.c:1620
-#: src/protocols/toc/toc.c:1662 src/protocols/toc/toc.c:1781
-#: src/protocols/toc/toc.c:1811 src/protocols/toc/toc.c:1867
+#: src/protocols/oscar/oscar.c:2225
+msgid ""
+"The last message was not sent because you are over the rate limit. Please "
+"wait 10 seconds and try again."
+msgstr ""
+
+#: src/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:2342 src/protocols/toc/toc.c:1090
+#: src/protocols/oscar/oscar.c:3207
+#, 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
 msgid "Exchange:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2618
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Kan geen directe verbinding openen"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -642,115 +1438,135 @@
 "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:2646
-msgid "Get Away Msg"
+#: src/protocols/oscar/oscar.c:3583
+#, 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
+#, 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
+#, fuzzy
+msgid "Get Status Msg"
 msgstr "Haal afwezigheidsbericht op"
 
-#: src/protocols/oscar/oscar.c:2653
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "Direct bericht"
 
-#: src/protocols/toc/toc.c:397
+#: src/protocols/oscar/oscar.c:3636
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Mogelijkheden: %s\n"
+
+#: src/protocols/toc/toc.c:398
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kan niet naar bestand %s schrijven."
 
-#: src/protocols/toc/toc.c:400
+#: src/protocols/toc/toc.c:401
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kan het bestand %s niet lezen."
 
-#: src/protocols/toc/toc.c:403
+#: src/protocols/toc/toc.c:404
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Bericht te lang, laatste %s Bytes afgekort."
 
-#: src/protocols/toc/toc.c:406
+#: src/protocols/toc/toc.c:407
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s is niet ingelogd."
 
-#: src/protocols/toc/toc.c:409
+#: src/protocols/toc/toc.c:410
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Waarschuwing van %s is niet toegestaan."
 
-#: src/protocols/toc/toc.c:412
+#: src/protocols/toc/toc.c:413
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Een bericht is verloren gegaan. U overschreidt de snelheid van de server."
 
-#: src/protocols/toc/toc.c:415
+#: src/protocols/toc/toc.c:416
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s is niet toegankelijk."
 
-#: src/protocols/toc/toc.c:418
+#: src/protocols/toc/toc.c:419
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "U verzend te snel berichten naar %s."
 
-#: src/protocols/toc/toc.c:421
+#: src/protocols/toc/toc.c:422
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Een Bericht van %s is niet overgekomen omdat het te groot was."
 
-#: src/protocols/toc/toc.c:424
+#: src/protocols/toc/toc.c:425
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Een Bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: src/protocols/toc/toc.c:427
+#: src/protocols/toc/toc.c:428
 msgid "Failure."
 msgstr "Fout."
 
-#: src/protocols/toc/toc.c:430
+#: src/protocols/toc/toc.c:431
 msgid "Too many matches."
 msgstr "Te veel matches."
 
-#: src/protocols/toc/toc.c:433
+#: src/protocols/toc/toc.c:434
 msgid "Need more qualifiers."
 msgstr "Meer gegevens nodig."
 
-#: src/protocols/toc/toc.c:436
+#: src/protocols/toc/toc.c:437
 msgid "Dir service temporarily unavailable."
 msgstr "Profielen service is momenteel niet toegankelijk."
 
-#: src/protocols/toc/toc.c:439
+#: src/protocols/toc/toc.c:440
 msgid "Email lookup restricted."
 msgstr "Email zoekfunctie beperkt."
 
-#: src/protocols/toc/toc.c:442
+#: src/protocols/toc/toc.c:443
 msgid "Keyword ignored."
 msgstr "Sleutelwoord genegeerd."
 
-#: src/protocols/toc/toc.c:445
+#: src/protocols/toc/toc.c:446
 msgid "No keywords."
 msgstr "Geen sleutelwoorden."
 
-#: src/protocols/toc/toc.c:448
+#: src/protocols/toc/toc.c:449
 msgid "User has no directory information."
 msgstr "Deze gebruiker heeft geen profiel."
 
-#: src/protocols/toc/toc.c:452
+#: src/protocols/toc/toc.c:453
 msgid "Country not supported."
 msgstr "Land wordt niet ondersteund."
 
-#: src/protocols/toc/toc.c:455
+#: src/protocols/toc/toc.c:456
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Onbekende Fout: %s."
 
-#: src/protocols/toc/toc.c:461
+#: src/protocols/toc/toc.c:462
 msgid "The service is temporarily unavailable."
 msgstr "De service is momenteel niet bereikbaar."
 
-#: src/protocols/toc/toc.c:464
+#: src/protocols/toc/toc.c:465
 msgid "Your warning level is currently too high to log in."
 msgstr "Uw waarschuwingsniveau is momenteel te hoog om in te loggen."
 
-#: src/protocols/toc/toc.c:467
+#: src/protocols/toc/toc.c:468
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -758,45 +1574,46 @@
 "U hebt zich te snel aan en afgemeld. Wacht 10 Minuten en probeer het nog een "
 "keer."
 
-#: src/protocols/toc/toc.c:470
+#: src/protocols/toc/toc.c:471
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Onbekende Aanmeldingsfout: %s."
 
-#: src/protocols/toc/toc.c:473
-#, c-format
-msgid "An unknown error, %d, has occured.  Info: %s"
+#: src/protocols/toc/toc.c:474
+#, fuzzy, c-format
+msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Een onbekende fout, %d, is opgetreden. Info: %s"
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:491
 msgid "Connection Closed"
 msgstr "Verbinding verbroken"
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:529
 msgid "Waiting for reply..."
 msgstr "Wacht op antwoord..."
 
-#: src/protocols/toc/toc.c:594
+#: src/protocols/toc/toc.c:598
 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:595
+#: src/protocols/toc/toc.c:599
 msgid "TOC Resume"
 msgstr ""
 
-#: src/protocols/toc/toc.c:756
+#: src/protocols/toc/toc.c:763
 msgid "Chat Error"
 msgstr "Chat Fout"
 
-#: src/protocols/toc/toc.c:775
-msgid "Password Change Successeful"
+#: src/protocols/toc/toc.c:782
+#, fuzzy
+msgid "Password Change Successful"
 msgstr "Wachtwoord Veranderen Gelukt"
 
-#: src/dialogs.c:1490 src/protocols/toc/toc.c:775
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Wachtwoord Veranderen"
 
-#: src/protocols/toc/toc.c:778
+#: 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 "
@@ -807,226 +1624,287 @@
 "wordt. Gaim verhindert dat dit gebeurd maar u kunt geen berichten verzenden. "
 "Dit is tijdelijk, wees even geduldig."
 
-#: src/protocols/toc/toc.c:781
+#: src/protocols/toc/toc.c:788
 msgid "TOC Pause"
 msgstr "TOC Pause"
 
-#: src/protocols/toc/toc.c:1204
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Haal directory info op"
 
-#: src/protocols/toc/toc.c:1620 src/protocols/toc/toc.c:1662
-#: src/protocols/toc/toc.c:1781 src/protocols/toc/toc.c:1867
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "Kan niet verbinden voor transfer!"
 
-#: src/protocols/toc/toc.c:1811
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "Kan bestandsheader niet schrijven!"
 
-#: src/protocols/toc/toc.c:1900
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - Opslaan als..."
 
-#: src/protocols/toc/toc.c:1939
-#, c-format
-msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
+#: src/protocols/toc/toc.c:1962
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s vraagt %s, om bestand %d te accepteren: %s (%.2f %s)%s%s "
 
-#: src/protocols/toc/toc.c:1944
+#: src/protocols/toc/toc.c:1963
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr "%s vraagt %s, om bestand %d te accepteren: %s (%.2f %s)%s%s "
+
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s vraagt u om een bestand te verzenden"
 
-#: src/protocols/yahoo/yay.c:168
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "Het bericht is niet verzonden."
 
-#: src/protocols/yahoo/yay.c:698
-#, fuzzy
-msgid "Send offline message"
-msgstr "Bericht Offline verzenden."
-
-#: src/protocols/zephyr/zephyr.c:778
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:815
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Class"
 
-#: src/protocols/zephyr/zephyr.c:819
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "Instance"
 
-#: src/protocols/zephyr/zephyr.c:823
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "Ontvanger"
 
-#: src/applet.c:197
+#: src/about.c:102
+#, c-format
+msgid "About Gaim v%s"
+msgstr "Over Gaim v%s"
+
+#: src/about.c:135
+#, fuzzy
+msgid ""
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
+"\n"
+"URL: "
+msgstr ""
+"Gaim is een Client gebaseerd op het AOL's Intstant Messenger protocol. Het "
+"is in Gtk+ geschreven en is uitgegeven onder de GPL.\n"
+"\n"
+"URL: "
+
+#: src/about.c:137
+msgid ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+msgstr ""
+
+#: src/about.c:147
+msgid ""
+"Active Developers\n"
+"====================\n"
+"Rob Flynn (maintainer) [ rob@marko.net ]\n"
+"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+"\n"
+"Crazy Patch Writers\n"
+"===================\n"
+"Benjamin Miller\n"
+"Decklin Foster\n"
+"Nathan Walp\n"
+"Mark Doliner\n"
+"\n"
+"Retired Developers\n"
+"===================\n"
+"Jim Duchek\n"
+"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+"Mark Spencer (original author)   [ markster@marko.net ]"
+msgstr ""
+
+#: src/about.c:185
+msgid "Web Site"
+msgstr "Website"
+
+#: src/aim.c:153 src/buddy.c:2713
+msgid "Signoff"
+msgstr "Afmelden"
+
+#: src/aim.c:165
+msgid "Please enter your logon"
+msgstr "Vul je loginnaam in"
+
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
+msgid "Signon Error"
+msgstr "Aanmeldingsfout"
+
+#: src/aim.c:263
+msgid "Gaim - Login"
+msgstr "Gaim - Aanmelden"
+
+#: src/aim.c:281
+msgid "Screen Name: "
+msgstr "Gebruikersnaam:"
+
+#: src/aim.c:297
+msgid "Password: "
+msgstr "Wachtwoord:"
+
+#: src/aim.c:318 src/buddy.c:2717
+msgid "Quit"
+msgstr "Afsluiten"
+
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
+msgid "Accounts"
+msgstr "Accounts"
+
+#: src/aim.c:325 src/multi.c:915
+msgid "Signon"
+msgstr "Aanmelden"
+
+#: src/aim.c:357
+#, fuzzy
+msgid "About"
+msgstr "Over..."
+
+#: src/aim.c:358
+msgid "Options"
+msgstr "Opties"
+
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
+msgid "Plugins"
+msgstr "Plugins"
+
+#: src/aim.c:834 src/buddy.c:2755
+msgid "Preferences"
+msgstr "Instellingen"
+
+#: src/aim.c:844 src/multi.c:1479
+#, fuzzy
+msgid "Auto-login"
+msgstr "Automatisch Aanmelden"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "Bezig met aanmelden...."
 
-#: src/applet.c:200
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "Niet aangemeld. Klik voor login venster."
 
-#: src/applet.c:216
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr "Afwezig %d hangend"
 
-#: src/applet.c:219
+#: src/applet.c:131
 msgid "Away."
 msgstr "Afwezig"
 
-#: src/applet.c:291 src/buddy.c:478 src/buddy.c:2278 src/buddy.c:2414
-msgid "Away"
-msgstr "Afwezig"
-
-#: src/applet.c:294 src/away.c:387
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "Nieuw Afwezigheidsbericht"
 
-#: src/applet.c:441
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "Kan de gaim applet niet aanmaken!"
 
-#: src/applet.c:458
+#: src/applet.c:368
 msgid "About..."
 msgstr "Over..."
 
-#: src/away.c:203
+#: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Afwezig"
 
-#: src/away.c:249
+#: src/away.c:250
 msgid "I'm Back!"
 msgstr "Ik ben terug!"
 
-#: src/away.c:265 src/away.c:345 src/away.c:519
+#: src/away.c:266 src/away.c:346 src/away.c:520
 msgid "Back"
 msgstr "Terug"
 
-#: src/away.c:407
+#: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Afwezigheidsbericht verwijderen"
 
-#: src/away.c:595
+#: src/away.c:596
 msgid "Set All Away"
 msgstr "Zet alles op afwezig"
 
-#: src/buddy.c:473 src/buddy.c:2513 src/buddy_chat.c:1435
-#: src/conversation.c:1934 src/conversation.c:2310 src/dialogs.c:764
-#: src/dialogs.c:948 src/dialogs.c:1828 src/multi.c:986 src/prefs.c:1913
-#: src/prefs.c:2255 src/prefs.c:2289
-msgid "Add"
-msgstr "Toevoegen"
-
-#: src/buddy.c:474 src/buddy.c:2514 src/dialogs.c:774 src/dialogs.c:921
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Groep"
 
-#: src/buddy.c:475 src/buddy.c:2515 src/buddy_chat.c:1437
-#: src/conversation.c:1920 src/conversation.c:2307 src/prefs.c:1927
-#: src/prefs.c:2259 src/prefs.c:2293
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: src/buddy.c:479 src/buddy.c:1893 src/buddy.c:2277 src/prefs.c:2740
-msgid "Chat"
-msgstr "Chat"
-
-#: src/buddy.c:480 src/buddy.c:616 src/buddy.c:759 src/buddy.c:2275
-#: src/buddy_chat.c:820 src/buddy_chat.c:1257
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "Bericht"
 
-#: src/buddy.c:481 src/buddy.c:2276 src/buddy_chat.c:836 src/buddy_chat.c:1265
-#: src/buddy_chat.c:1443 src/conversation.c:2328
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:621 src/buddy.c:764 src/dialogs.c:913 src/dialogs.c:3192
-#: src/dialogs.c:3207
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:626 src/buddy.c:783
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alarm toevoegen"
 
-#: src/buddy.c:633 src/buddy.c:789
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Toon Logboek"
 
-#: src/buddy.c:748 src/buddy.c:777
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Naam wijzigen"
 
-#: src/buddy.c:771
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Alias verwijderen"
 
-#: src/buddy.c:1471 src/buddy.c:2419
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "Buddy-Alarm"
 
-#: src/buddy.c:1543
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "Nieuw Buddy-Alarm"
 
-#: src/buddy.c:1561
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Buddy-Alarm verwijderen"
 
-#: src/buddy.c:1884
-msgid "Buddy Icon"
-msgstr "Buddy Icon"
-
-#: src/buddy.c:1887
-msgid "Voice"
-msgstr "Stem"
-
-#: src/buddy.c:1890
-msgid "IM Image"
-msgstr "IM Afbeelding"
-
-#: src/buddy.c:1896
-msgid "Get File"
-msgstr "Bestanden Ophalen"
-
-#: src/buddy.c:1899
-msgid "Send File"
-msgstr "Bestanden Verzenden"
-
-#: src/buddy.c:1903
-msgid "Games"
-msgstr "Spellen"
-
-#: src/buddy.c:1906
-msgid "Stocks"
-msgstr "Koersen"
-
-#: src/buddy.c:1909
-msgid "EveryBuddy Bug"
-msgstr "Everybuddy Bug"
-
-#: src/buddy.c:1980
+#: src/buddy.c:1773
+msgid "[Click to edit]"
+msgstr ""
+
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Aangemeld: %s\n"
 
-#: src/buddy.c:1992
+#: src/buddy.c:2270
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Waarschuwingen: %d%%\n"
 
-#: src/buddy.c:2004
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Mogelijkheden: %s\n"
 
-#: src/buddy.c:2008
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1037,121 +1915,131 @@
 "Gebruikersnaam: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2012
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "Afwezig: "
 
-#: src/buddy.c:2082
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s heeft zich aangemeld"
 
-#: src/buddy.c:2137
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s heeft zich afgemeld"
 
-#: src/buddy.c:2310
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Info over geselecteerde Buddy"
 
-#: src/buddy.c:2311 src/dialogs.c:571
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "Bericht verzenden"
 
-#: src/buddy.c:2312
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Buddy-Chat starten"
 
-#: src/buddy.c:2313
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Activeer afwezigheidsbericht"
 
-#: src/buddy.c:2376
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Bestand"
 
-#: src/buddy.c:2380
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Buddy toevoegen"
 
-#: src/buddy.c:2382
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Chat binnengaan"
 
-#: src/buddy.c:2384
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "Nieuw Bericht"
 
-#: src/buddy.c:2386 src/dialogs.c:623
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Gebruikersinfo"
 
-#: src/buddy.c:2391
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Buddy Lijst importeren"
 
-#: src/buddy.c:2409
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Systeem"
 
-#: src/buddy.c:2432
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Protocol Acties"
 
-#: src/buddy.c:2438
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Privacy"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Toon Systeemlog"
 
-#: src/buddy.c:2450
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2453
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Laad Script"
 
-#: src/buddy.c:2457
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Deactiveer alle scripts"
 
-#: src/buddy.c:2461
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Toon Scripts"
 
-#: src/buddy.c:2469
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Help"
 
-#: src/buddy.c:2474
+#: src/buddy.c:2793
+#, fuzzy
+msgid "Online Help"
+msgstr "Online"
+
+#: src/buddy.c:2794
+#, fuzzy
+msgid "Debug Window"
+msgstr "Debug venster tonen"
+
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "Over Gaim"
 
-#: src/buddy.c:2493 src/prefs.c:2719
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Buddy Lijst"
 
-#: src/buddy.c:2546
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Buddy toevoegen"
 
-#: src/buddy.c:2547
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Nieuwe groep toevoegen"
 
-#: src/buddy.c:2548
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Geselecteerde Buddy/Groep verwijderen"
 
-#: src/buddy.c:2573
-msgid "Online"
-msgstr "Online"
-
-#: src/buddy.c:2575
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Buddy's Bewerken"
 
-#: src/buddy.c:2615
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Buddy Lijst"
 
@@ -1159,21 +2047,17 @@
 msgid "Join Chat"
 msgstr "Chat Binnengaan"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "Buddy Chat"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "Deelnemen aan chat als:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:419
-#: src/dialogs.c:589 src/dialogs.c:647 src/dialogs.c:766 src/dialogs.c:944
-#: src/dialogs.c:1233 src/dialogs.c:1438 src/dialogs.c:1562 src/dialogs.c:1622
-#: src/dialogs.c:1817 src/dialogs.c:1999 src/dialogs.c:2174 src/dialogs.c:2245
-#: src/dialogs.c:2937 src/dialogs.c:3194 src/dialogs.c:3375 src/dialogs.c:3744
-#: src/dialogs.c:3830 src/multi.c:720 src/multi.c:850 src/multi.c:1184
-#: src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -1181,16 +2065,16 @@
 msgid "Join"
 msgstr "Deelnemen"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1307
-#: src/buddy_chat.c:1399
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1113 src/dialogs.c:3202
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Buddy"
 
-#: src/buddy_chat.c:417 src/prefs.c:1878
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Bericht"
 
@@ -1198,628 +2082,679 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Nodig Buddy uit in Chat Ruimte"
 
-#: src/buddy_chat.c:827
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Negeren Opheffen"
 
-#: src/buddy_chat.c:829 src/buddy_chat.c:1261
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "Negeren"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:993
-#, c-format
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
+#, fuzzy, c-format
 msgid "%d %s in room"
-msgstr "%d personen in ruimte"
-
-#: src/buddy_chat.c:881
+msgstr "0 personen in ruimte"
+
+# #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+# #: src/buddy_chat.c:1544
+# #, c-format
+# msgid "%d %s in room"
+# msgstr "%d personen in ruimte"
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s is de ruimte binnengekomen."
 
-#: src/buddy_chat.c:955
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heet nu %s"
 
-#: src/buddy_chat.c:1001
+#: src/buddy_chat.c:1057
+#, fuzzy, c-format
+msgid "%s left the room (%s)."
+msgstr "%s is weggegaan"
+
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s is weggegaan"
 
-#: src/buddy_chat.c:1136
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Groeps Chat"
 
-#: src/buddy_chat.c:1197
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Onderwerp"
 
-#: src/buddy_chat.c:1238
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "0 personen in ruimte"
 
-#: src/buddy_chat.c:1312 src/buddy_chat.c:1398
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Fluisteren"
 
-#: src/buddy_chat.c:1317 src/buddy_chat.c:1396 src/buddy_chat.c:1445
-#: src/conversation.c:2339
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/buddy_chat.c:1439 src/conversation.c:2316
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Blokkeren"
 
-#: src/buddy_chat.c:1441 src/conversation.c:2322 src/dialogs.c:390
-#: src/dialogs.c:415
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Waarschuwen"
 
-#: src/conversation.c:387
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Gesprek Opslaan"
 
-#: src/conversation.c:542
-#, c-format
-msgid "Removing '%s' from buddylist.\n"
-msgstr "Verwijder '%s' van de buddylijst.\n"
-
-#: src/conversation.c:925
+#: src/conversation.c:492
+#, fuzzy
+msgid "Gaim - Insert Image"
+msgstr "Gaim - IM gebruiker"
+
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "Kan bericht niet verzenden: Te groot"
 
-#: src/conversation.c:925 src/conversation.c:927
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "Berichtfout"
 
-#: src/conversation.c:927
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "Kan bericht niet verzenden: Reden onbekend"
 
-#: src/conversation.c:1146
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "Momenteel bij %d, "
 
-#: src/conversation.c:1154
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Zet Positie op %d\n"
 
-#: src/conversation.c:1725 src/prefs.c:1233
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Vette Tekst"
 
-#: src/conversation.c:1725
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Vet"
 
-#: src/conversation.c:1729
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Cursieve Tekst"
 
-#: src/conversation.c:1730
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Cursief"
 
-#: src/conversation.c:1733 src/prefs.c:1245
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Onderstreepte Tekst"
 
-#: src/conversation.c:1734
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Onderstrepen"
 
-#: src/conversation.c:1738 src/prefs.c:1251
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Doorgehaalde Tekst"
 
-#: src/conversation.c:1738
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Doorhalen"
 
-#: src/conversation.c:1744
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Verklein lettertype"
 
-#: src/conversation.c:1744
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Klein"
 
-#: src/conversation.c:1747
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Normale Letter Grootte"
 
-#: src/conversation.c:1747
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/conversation.c:1750
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Vergroot Lettertype"
 
-#: src/conversation.c:1750
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Groot"
 
-#: src/conversation.c:1757 src/dialogs.c:2625 src/dialogs.c:2644
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Selecteer lettertype "
 
-#: src/conversation.c:1758
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Lettertype"
 
-#: src/conversation.c:1761 src/prefs.c:1281
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Tekstkleur"
 
-#: src/conversation.c:1762 src/conversation.c:1766
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Kleur"
 
-#: src/conversation.c:1766 src/prefs.c:1299
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Achtergrondkleur"
 
-#: src/conversation.c:1773 src/dialogs.c:2239
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Link invoegen"
 
-#: src/conversation.c:1774
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:1777
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Voeg Smiley in"
 
-#: src/conversation.c:1777
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:1784
+#: src/conversation.c:2242
+#, fuzzy
+msgid "Insert IM Image"
+msgstr "IM Afbeelding"
+
+#: src/conversation.c:2242
+#, fuzzy
+msgid "Image"
+msgstr "IM Afbeelding"
+
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Schakel logboek in"
 
-#: src/conversation.c:1785 src/prefs.c:244
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Logboek"
 
-#: src/conversation.c:1794
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Gesprek Opslaan"
 
-#: src/conversation.c:1795 src/dialogs.c:1442 src/dialogs.c:1626
-#: src/dialogs.c:2949 src/dialogs.c:3640
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/conversation.c:1799
-msgid "Enable sounds"
-msgstr "Activeer Geluiden"
-
-#: src/conversation.c:1800
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Geluid"
 
-#: src/conversation.c:2168
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - Gesprekken"
 
-#: src/conversation.c:2255
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Verzend Bericht als: "
 
-#: src/conversation.c:2744
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Icon Opslaan"
 
-#: src/conversation.c:2771
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Deactiveer Animatie"
 
-#: src/conversation.c:2776
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Activeer Animatie"
 
-#: src/conversation.c:2782
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Verstop Icon"
 
-#: src/conversation.c:2788
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Sla Icon op als..."
 
-#: src/dialogs.c:378
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Gebruiker Waarschuwen?"
 
-#: src/dialogs.c:398
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Wilt u %s echt waarschuwen?"
 
-#: src/dialogs.c:403
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Anoniem waarschuwen?"
 
-#: src/dialogs.c:407
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonieme waarschuwingen zijn weinig zinvol"
 
-#: src/dialogs.c:515 src/dialogs.c:594 src/dialogs.c:652 src/dialogs.c:1237
-#: src/dialogs.c:1566 src/dialogs.c:1677 src/dialogs.c:1998 src/dialogs.c:2178
-#: src/dialogs.c:2244 src/dialogs.c:3749 src/dialogs.c:3835 src/multi.c:725
+#: src/dialogs.c:471
+#, c-format
+msgid "Removing '%s' from buddylist.\n"
+msgstr "Verwijder '%s' van de buddylijst.\n"
+
+#: src/dialogs.c:496
+#, fuzzy, c-format
+msgid "Gaim - Remove %s?"
+msgstr "Gaim - Buddy hernoemen"
+
+#: src/dialogs.c:509
+#, fuzzy
+msgid "Remove Buddy"
+msgstr "Buddy hernoemen"
+
+#: src/dialogs.c:519
+#, c-format
+msgid ""
+"You are about to remove '%s' from\n"
+"your buddylist. Do you want to continue?"
+msgstr ""
+
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
+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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:561
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - IM gebruiker"
 
-#: src/dialogs.c:578
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "Verzend naar:"
 
-#: src/dialogs.c:630
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Gebruiker:"
 
-#: src/dialogs.c:657
+#: src/dialogs.c:802
+#, fuzzy
+msgid "Account:"
+msgstr "Account"
+
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Gebruikersinfo"
 
-#: src/dialogs.c:719
-msgid "Buddies"
-msgstr "Buddy's"
-
-#: src/dialogs.c:772
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Groep toevoegen"
 
-#: src/dialogs.c:797
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Groep Toevoegen"
 
-#: src/dialogs.c:881
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Buddy Toevoegen"
 
-#: src/dialogs.c:893
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Buddy Toevoegen"
 
-#: src/dialogs.c:903
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Gebruiker"
 
-#: src/dialogs.c:931
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Toevoegen Aan"
 
-#: src/dialogs.c:966
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Afwezig"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Zet privacy voor:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Alle gebruikers mogen contact opnemen"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Alleen onderstaande gebruikers toestaan"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Toegestaan"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Alle Gebruikers Blokkeren"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Onderstaande gebruikers blokkeren"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Geblokkeerd"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Vul een buddy in om te alarmeren"
 
-#: src/dialogs.c:966
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Buddy-Alarm Fout"
 
-#: src/dialogs.c:1082
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nieuw Buddy-Alarm "
 
-#: src/dialogs.c:1093
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "Wie Alarmeren"
 
-#: src/dialogs.c:1104
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "Account"
 
-#: src/dialogs.c:1128
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "Wanneer Alermeren"
 
-#: src/dialogs.c:1138
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Alermeren bij aanmelden"
 
-#: src/dialogs.c:1143
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Alarmeren bij terugkeer van afwezigheid"
 
-#: src/dialogs.c:1149
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Alarmeren bij terugkeer van Inactief"
 
-#: src/dialogs.c:1161
+#: src/dialogs.c:1767
+#, fuzzy
+msgid "Pounce when buddy is typing to you"
+msgstr "Geluid als buddy zich aanmeldt"
+
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Alarm Actie"
 
-#: src/dialogs.c:1172
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "Open Berichtvenster"
 
-#: src/dialogs.c:1177
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "Popup Melding"
 
-#: src/dialogs.c:1182
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "Verstuur bericht"
 
-#: src/dialogs.c:1195
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Commando uitvoeren bij alarm"
 
-#: src/dialogs.c:1208
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Speel geluid af bij alarm"
 
-#: src/dialogs.c:1223
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Sla dit alarm op na activatie"
 
-#: src/dialogs.c:1305
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Profiel Wijzigen"
 
-#: src/dialogs.c:1314
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "Directory Info"
 
-#: src/dialogs.c:1336
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Sta zoekopdrachten toe om uw info te vinden"
 
-#: src/dialogs.c:1339 src/dialogs.c:2017
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Voornaam"
 
-#: src/dialogs.c:1350 src/dialogs.c:2029
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Tweede Naam"
 
-#: src/dialogs.c:1362 src/dialogs.c:2041
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: src/dialogs.c:1373 src/dialogs.c:2053
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Meisjesnaam"
 
-#: src/dialogs.c:1384 src/dialogs.c:2065
-msgid "City"
-msgstr "Stad"
-
-#: src/dialogs.c:1395 src/dialogs.c:2076
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "Staat"
 
-#: src/dialogs.c:1406 src/dialogs.c:2087
-msgid "Country"
-msgstr "Land"
-
-#: src/dialogs.c:1460
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "Nieuwe wachtwoorden zijn niet gelijk"
 
-#: src/dialogs.c:1460 src/dialogs.c:1465
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Fout bij wachtwoord hernoemen"
 
-#: src/dialogs.c:1465
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Vul alle velden voledig in"
 
-#: src/dialogs.c:1490
-msgid "Gaim - Password Change"
-msgstr "Gaim - Wachtwoord veranderen"
-
-#: src/dialogs.c:1501
-msgid "Change Password"
-msgstr "Verander Wachtwoord"
-
-#: src/dialogs.c:1520
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Oud Wachtwoord"
 
-#: src/dialogs.c:1534
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Nieuw Wachtwoord"
 
-#: src/dialogs.c:1548
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Nieuw Wachtwoord (herhalen)"
 
-#: src/dialogs.c:1589
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Vul gebruikersinfo in"
 
-#: src/dialogs.c:1682
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Het resultaat van uw zoek opdracht:"
 
-#: src/dialogs.c:1807 src/dialogs.c:1814
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Toestaan"
 
-#: src/dialogs.c:1809 src/dialogs.c:1816
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Blokkeren"
 
-#: src/dialogs.c:1853
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Toestemming toevoegen"
 
-#: src/dialogs.c:1855
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Blokkade toevoegen"
 
-#: src/dialogs.c:1915
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Houd gesprek bij in logboek"
 
-#: src/dialogs.c:1993 src/dialogs.c:2156
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Buddy Zoeken"
 
-#: src/dialogs.c:2121
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Zoek Buddy via info"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Zoek Buddy via Email"
 
-#: src/dialogs.c:2163
-msgid "Email"
-msgstr "E-mail"
-
-#: src/dialogs.c:2258
-msgid "URL"
-msgstr "URL"
-
-#: src/dialogs.c:2266 src/plugins.c:211
-msgid "Description"
-msgstr "Beschrijving"
-
-#: src/dialogs.c:2290
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - URL Toevoegen"
 
-#: src/dialogs.c:2441 src/dialogs.c:2462 src/dialogs.c:2516
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Selecteer Tekstkleur"
 
-#: src/dialogs.c:2495
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Achtergrondkleur Selecteren"
 
-#: src/dialogs.c:2719
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importeren naar:"
 
-#: src/dialogs.c:2743
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importeer Buddylijst"
 
-#: src/dialogs.c:2804
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "U moet iets invullen"
 
-#: src/dialogs.c:2805 src/dialogs.c:2811
-msgid "Gaim - Error"
-msgstr "Gaim - Fout"
-
-#: src/dialogs.c:2811
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "U kunt geen leeg bericht maken"
 
-#: src/dialogs.c:2879
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - Nieuw afwezigheidsbericht"
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Nieuw afwezigheidsbericht"
 
-#: src/dialogs.c:2902
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Afwezig titel:"
 
-#: src/dialogs.c:2941
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Gebruik"
 
-#: src/dialogs.c:2945
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Opslaan en gebruiken"
 
-#: src/dialogs.c:3148
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Lachen!"
 
-#: src/dialogs.c:3200
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Alias voor Buddy"
 
-#: src/dialogs.c:3233
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias voor Buddy"
 
-#: src/dialogs.c:3305
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Logboek opslaan"
 
-#: src/dialogs.c:3337
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Kan %s - %s niet verwijderen."
 
-#: src/dialogs.c:3338
-msgid "Error"
-msgstr "Fout"
-
-#: src/dialogs.c:3365
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Logboek opschonen?"
 
-#: src/dialogs.c:3380
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3551
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:3614
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Gesprek"
 
-#: src/dialogs.c:3635
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Opschonen"
 
-#: src/dialogs.c:3713
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Groep hernoemen"
 
-#: src/dialogs.c:3723
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Groep hernoemen"
 
-#: src/dialogs.c:3730 src/dialogs.c:3816
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Nieuwe Naam:"
 
-#: src/dialogs.c:3799
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Buddy hernoemen"
 
-#: src/dialogs.c:3809
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Buddy hernoemen"
 
-#: src/dialogs.c:3893
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Selecteer Perl Script"
 
-#: src/gaimrc.c:1107
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kan configuratiebestand %s niet openen."
 
-#: src/gaimrc.c:1108
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Instellingsfout"
 
 #: src/html.c:183
-#, c-format
-msgid "Receieved: '%s'\n"
+#, fuzzy, c-format
+msgid "Received: '%s'\n"
 msgstr "Ontvangen: '%s'\n"
 
 #: src/html.c:221
@@ -1830,759 +2765,627 @@
 msgid "Plugin Error"
 msgstr "Plugin Fout"
 
-#: src/multi.c:411
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Buddy Icon Laden"
 
-#: src/multi.c:454
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "Buddy Icon Bestand"
 
-#: src/multi.c:465
+#: src/multi.c:508
 msgid "Browse"
 msgstr "Bladeren"
 
-#: src/multi.c:470 src/prefs.c:1457
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Wissen"
 
-#: src/multi.c:497
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "Gebruikersnaam:"
 
-#: src/multi.c:506
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: src/multi.c:517
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "Alias"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/multi.c:522
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "Onthoud Wachtwoord"
 
-#: src/multi.c:523
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "Automatisch Aanmelden"
 
-#: src/multi.c:563
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "Nieuwe Mail Meldingen "
 
-#: src/multi.c:703
+#: src/multi.c:706
+msgid "Register with server"
+msgstr ""
+
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Wijzig Account "
 
-#: src/multi.c:822
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr "Vul Wachtwoord in"
 
-#: src/multi.c:911
+#: src/multi.c:948
+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
+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 ""
+"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
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wilt u %s echt verwijderen?"
 
-#: src/multi.c:948
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Account Editor"
 
-#: src/multi.c:967
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Alles Selecteren"
 
-#: src/multi.c:972
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Selecteer Auto's"
 
-#: src/multi.c:976
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Niets Selecteren"
 
-#: src/multi.c:990
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Bewerken"
 
-#: src/multi.c:994
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Aan/Afmelden"
 
-#: src/multi.c:998
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/multi.c:1226
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
-"%s was unable to sign on: %s"
+"%s: %s"
+msgstr ""
+
+#: src/multi.c:1406
+#, fuzzy, c-format
+msgid "%s was unable to sign on"
 msgstr "Kan de aanmelding niet herstellen"
 
-#: src/perl.c:856
+#: src/multi.c:1417
+#, fuzzy
+msgid "Notice"
+msgstr "Stem"
+
+#: src/multi.c:1427
+#, c-format
+msgid "%s has been signed off"
+msgstr ""
+
+#: src/multi.c:1428
+#, fuzzy
+msgid "Connection Error"
+msgstr "Verbinding verbroken"
+
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perl Scripts"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Plugin Lijst"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
-#: src/plugins.c:238
+#: src/plugins.c:221
+#, fuzzy
+msgid "Loaded Plugins"
+msgstr "Plugins"
+
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Alles Selecteren"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Bestandspad:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Laden"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Laad een plugin uit een bestand"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Configureren"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Instellingen voor plugin"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Herladen"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Herlaadt de geselecteerde plugin "
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Uitschakelen"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Deactiveer de geselecteerde plugin"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Dit venster sluiten"
 
-#: src/prefs.c:190
-msgid "General Options"
-msgstr "Algemene Instellingen"
-
-#: src/prefs.c:198 src/prefs.c:372 src/prefs.c:538 src/prefs.c:639
-#: src/prefs.c:868 src/prefs.c:1003 src/prefs.c:1221 src/prefs.c:1521
-#: src/prefs.c:1795 src/prefs.c:2206
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "Alle opties hebben onmiddelijk effect tenzij anders aangegeven"
-
-#: src/prefs.c:210
-msgid "Miscellaneous"
-msgstr "Overig"
-
-#: src/prefs.c:218
-msgid "Use borderless buttons"
-msgstr "Gebruik knoppen zonder rand"
-
-#: src/prefs.c:222
-msgid "Show Buddy Ticker"
-msgstr "Buddy Ticker tonen"
-
-#: src/prefs.c:227
-msgid "Show Debug Window"
-msgstr "Debug venster tonen"
-
-#: src/prefs.c:230
-msgid "Report Idle Times"
-msgstr "Toon inactieve tijd"
-
-#L src/prefs.c:232
-msgid "Notify buddies that you are typing to them"
-msgstr "Laat buddy's zien dat je tegen ze typt"
-
-#: src/prefs.c:238
-msgid "None"
-msgstr "Geen"
-
-#: src/prefs.c:239
-msgid "Gaim Use"
-msgstr "van Gaim"
-
-#: src/prefs.c:241
-msgid "X Use"
-msgstr "van X"
-
-#: src/prefs.c:252
-msgid "Log all conversations"
-msgstr "Alle gesprekken loggen"
-
-#: src/prefs.c:253
-msgid "Strip HTML from logs"
-msgstr "Verwijder HTML uit het logboek"
-
-#: src/prefs.c:259
-msgid "Log when buddies sign on/sign off"
-msgstr "Log als buddy's zich aan/afmelden"
-
-#: src/prefs.c:261
-msgid "Log when buddies become idle/un-idle"
-msgstr "Log als buddy's inactief/actief worden"
-
-#: src/prefs.c:263
-msgid "Log when buddies go away/come back"
-msgstr "Log als buddy's weggaan of terugkomen"
-
-#: src/prefs.c:264
-msgid "Log your own signons/idleness/awayness"
-msgstr "Log uw eigen aan/afmeldingen"
-
-#: src/prefs.c:266
-msgid "Individual log file for each buddy's signons"
-msgstr "Eigen log voor elke buddy-aanmelding"
-
 #: src/prefs.c:269
-msgid "Browser"
-msgstr "Browser"
-
-#: src/prefs.c:281
-msgid "KFM"
-msgstr "Konqueror"
-
-#: src/prefs.c:282
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:283
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:286
-msgid "Pop up new window by default"
-msgstr "Open standaard nieuw venster"
-
-#: src/prefs.c:293
-msgid "GNOME URL Handler"
-msgstr "GNOME URL Handler"
-
-#: src/prefs.c:295
-msgid "Manual"
-msgstr "Handmatig"
-
-#: src/prefs.c:364
-msgid "Proxy Options"
-msgstr "Proxy Instellingen"
-
-#: src/prefs.c:376
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
+#, fuzzy
+msgid "Windows"
+msgstr "Berichtvenster"
+
+#: src/prefs.c:279
+msgid "Show Buddy Ticker"
+msgstr "Buddy Ticker tonen"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "Debug venster tonen"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "Titel"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Gebruik knoppen zonder rand"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Doorgehaalde Tekst"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Annuleren"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Voeg Smiley in"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Selecteer"
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
-"Niet alle protocollen kunnen de proxy instellingen gebruiken. "
-"Zie het README bestand voor info."
-
-#: src/prefs.c:381
-msgid "Proxy Type"
-msgstr "Proxy Type"
-
-#: src/prefs.c:393
-msgid "No Proxy"
-msgstr "Geen Proxy"
-
-#: src/prefs.c:405
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:415
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Tekstkleur"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Achtergrondkleur"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Toon grafische smileys"
 
 #: src/prefs.c:424
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:433
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
-#: src/prefs.c:451
-msgid "Host"
-msgstr "Host"
-
-#: src/prefs.c:467
-msgid "Port"
-msgstr "Poort"
-
-#: src/prefs.c:484
-msgid "User"
-msgstr "Gebruiker"
-
-#: src/prefs.c:500
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: src/prefs.c:530
-msgid "Buddy List Options"
-msgstr "Buddy Lijst Instellingen"
-
-#: src/prefs.c:542
-msgid "Buddy List Window"
-msgstr "Buddy Lijst Venster"
-
-#: src/prefs.c:554
-msgid "Hide IM/Info/Chat buttons"
-msgstr "IM/Info/Chat knoppen verbergen"
-
-#: src/prefs.c:556
-msgid "Automatically show buddy list on sign on"
-msgstr "Automatisch buddylijst tonen bij aanmelden"
-
-#: src/prefs.c:559
-msgid "Save Window Size/Position"
-msgstr "Venstergrootte en -positie opslaan"
-
-#: src/prefs.c:566
-msgid "Show pictures on buttons"
-msgstr "Knoppen met afbeeldingen tonen"
-
-#: src/prefs.c:571
-msgid "Display Buddy List near applet"
-msgstr "Toon Buddy Lijst vlakbij applet"
-
-#: src/prefs.c:574
-msgid "Group Displays"
-msgstr "Groepenweergave"
-
-#: src/prefs.c:586
-msgid "Hide groups with no online buddies"
-msgstr "Verberg groepen waarin niemand online is"
-
-#: src/prefs.c:592
-msgid "Show numbers in groups"
-msgstr "Toon aantal leden van groepen"
-
-#: src/prefs.c:594
-msgid "Buddy Displays"
-msgstr "Buddyweergave"
-
-#: src/prefs.c:606
-msgid "Show buddy type icons"
-msgstr "Toon buddy type icons"
-
-#: src/prefs.c:607
-msgid "Show warning levels"
-msgstr "Toon waarschuwingsniveau"
-
-#: src/prefs.c:613
-msgid "Show idle times"
-msgstr "Toon inactieve tijd"
-
-#: src/prefs.c:614
-msgid "Grey idle buddies"
-msgstr "Toon inactieve buddy's grijs"
-
-#: src/prefs.c:631
-msgid "Conversation Options"
-msgstr "Gespreksopties"
-
-#: src/prefs.c:643
-msgid "Keyboard Options"
-msgstr "Toetsenbord-instellingen"
-
-#: src/prefs.c:655
-msgid "Enter sends message"
-msgstr "Bericht verzenden met Enter"
-
-#: src/prefs.c:656
-msgid "Control-Enter sends message"
-msgstr "Bericht verzenden met Control-Enter"
-
-#: src/prefs.c:657
-msgid "Escape closes window"
-msgstr "Venster sluiten met Esc"
-
-#: src/prefs.c:663
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "HTML-tags invoegen met Ctrl-{B/I/U/S}"
-
-#: src/prefs.c:664
-msgid "Control-(number) inserts smileys"
-msgstr "Smiley invoegen met Ctrl-(cijfer)"
-
-#: src/prefs.c:665
-msgid "F2 toggles timestamp display"
-msgstr "Tijdweergave inschakelen met F2"
-
-#: src/prefs.c:667
-msgid "Display and General Options"
-msgstr "Weergave en Algemene Instellingen"
-
-#: src/prefs.c:679
-msgid "Show graphical smileys"
-msgstr "Toon grafische smileys"
-
-#: src/prefs.c:680
 msgid "Show timestamp on messages"
 msgstr "Toon tijdweergave in berichten"
 
-#: src/prefs.c:681
+#: src/prefs.c:425
 msgid "Show URLs as links"
 msgstr "Toon URL's als links"
 
-#: src/prefs.c:682
+#: src/prefs.c:426
 msgid "Highlight misspelled words"
 msgstr "Onderstreep fout gespelde woorden"
 
-#: src/prefs.c:683 src/prefs.c:1817
-msgid "Sending messages removes away status"
-msgstr "Verzenden van bericht heft afwezigheid op"
-
-#: src/prefs.c:684 src/prefs.c:1825
-msgid "Queue new messages when away"
-msgstr "Plaats berichten in wachtrij bij afwezigheid"
-
-#: src/prefs.c:690
+#: src/prefs.c:436
 msgid "Ignore colors"
 msgstr "Kleuren negeren"
 
-#: src/prefs.c:691
+#: src/prefs.c:437
 msgid "Ignore font faces"
 msgstr "Lettertype negeren"
 
-#: src/prefs.c:692
+#: src/prefs.c:438
 msgid "Ignore font sizes"
 msgstr "Lettergrootte negeren"
 
-#: src/prefs.c:693
+#: src/prefs.c:439
 msgid "Ignore TiK Automated Messages"
 msgstr "Negeer automatische Tik berichten"
 
-#: src/prefs.c:694 src/prefs.c:1815
-msgid "Ignore new conversations when away"
-msgstr "Negeer gesprekken tijdens afwezigheid"
-
-#: src/prefs.c:860
-msgid "IM Options"
-msgstr "Bericht-instellingen"
-
-#: src/prefs.c:872 src/prefs.c:2735
-msgid "IM Window"
-msgstr "Berichtvenster"
-
-#: src/prefs.c:888 src/prefs.c:1023
-msgid "Show buttons as: "
-msgstr "Toon knoppen als:"
-
-#: src/prefs.c:892 src/prefs.c:1028
-msgid "Pictures And Text"
-msgstr "Plaatjes en Tekst"
-
-#: src/prefs.c:893 src/prefs.c:1030
-msgid "Pictures"
-msgstr "Alleen Plaatjes"
-
-#: src/prefs.c:894 src/prefs.c:1031
-msgid "Text"
-msgstr "Alleen Tekst"
-
-#: src/prefs.c:905
-msgid "Show all conversations in one tabbed window"
-msgstr "Toon gesprekken in een venster met tabbladen"
-
-#: src/prefs.c:941
-msgid "Show chats in the same tabbed window"
-msgstr "Toon gesprekken in hetzelfde venster met tabbladen"
-
-#: src/prefs.c:907 src/prefs.c:1044
-msgid "Raise windows on events"
+#: src/prefs.c:459
+msgid "Enter sends message"
+msgstr "Bericht verzenden met Enter"
+
+#: src/prefs.c:460
+msgid "Control-Enter sends message"
+msgstr "Bericht verzenden met Control-Enter"
+
+#: src/prefs.c:469
+msgid "Escape closes window"
+msgstr "Venster sluiten met Esc"
+
+#: src/prefs.c:470
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "Venster sluiten met Esc"
+
+#: src/prefs.c:480
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "HTML-tags invoegen met Ctrl-{B/I/U/S}"
+
+#: src/prefs.c:481
+msgid "Control-(number) inserts smileys"
+msgstr "Smiley invoegen met Ctrl-(cijfer)"
+
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr "IM/Info/Chat knoppen verbergen"
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "Knoppen met afbeeldingen tonen"
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Automatisch buddylijst tonen bij aanmelden"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "Toon Buddy Lijst vlakbij applet"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Venstergrootte en -positie opslaan"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
 msgstr "Haal venster omhoog bij gebeurtenissen"
 
-#: src/prefs.c:908
-msgid "Show logins in window"
-msgstr "Toon aanmeldingen in venster"
-
-#: src/prefs.c:950
-msgid "Show aliases in tabs/titles"
-msgstr "Toon aliassen in tabs of titels"
-
-#: src/prefs.c:951
-msgid "Hide window on send"
-msgstr "Verberg venster bij verzenden"
-
-#: src/prefs.c:910 src/prefs.c:1047
-msgid "Window Sizes"
-msgstr "Vensterafmetingen"
-
-#: src/prefs.c:918 src/prefs.c:1055
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "Verberg groepen waarin niemand online is"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "Toon aantal leden van groepen"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "Toon buddy type icons"
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "Toon waarschuwingsniveau"
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "Toon inactieve tijd"
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr "Toon inactieve buddy's grijs"
+
+#: src/prefs.c:568 src/prefs.c:630
 msgid "New window width:"
 msgstr "Nieuwe vensterbreedte:"
 
-#: src/prefs.c:919 src/prefs.c:1056
+#: src/prefs.c:569 src/prefs.c:631
 msgid "New window height:"
 msgstr "Nieuwe vensterhoogte:"
 
-#: src/prefs.c:920 src/prefs.c:1057
+#: src/prefs.c:570 src/prefs.c:632
 msgid "Entry widget height:"
 msgstr "Hoogte van invoerveld:"
 
-#: src/prefs.c:922 src/prefs.c:1059
-msgid "Tab Placement"
-msgstr "Plaatsing van Tabs"
-
-#: src/prefs.c:942 src/prefs.c:1079
-msgid "Top"
-msgstr "Boven"
-
-#: src/prefs.c:944 src/prefs.c:1081
-msgid "Bottom"
-msgstr "Beneden"
-
-#: src/prefs.c:951 src/prefs.c:1088
-msgid "Left"
-msgstr "Links"
-
-#: src/prefs.c:953 src/prefs.c:1090
-msgid "Right"
-msgstr "Rechts"
-
-#: src/prefs.c:957
-msgid "Buddy Icons"
-msgstr "Buddy Icons"
-
-#: src/prefs.c:969
+#: src/prefs.c:571 src/prefs.c:633
+msgid "Raise windows on events"
+msgstr "Haal venster omhoog bij gebeurtenissen"
+
+#: src/prefs.c:572
+msgid "Hide window on send"
+msgstr "Verberg venster bij verzenden"
+
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "Verberg Buddy Icons"
 
-#: src/prefs.c:995
-msgid "Chat Options"
-msgstr "Chat Opties"
-
-#: src/prefs.c:1007
-msgid "Group Chat Window"
-msgstr "Groeps Chat Venster"
-
-#: src/prefs.c:1042
+#: src/prefs.c:582
+#, fuzzy
+msgid "Disable Buddy Icon Animation"
+msgstr "Deactiveer Animatie"
+
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Toon aanmeldingen in venster"
+
+# L src/prefs.c:232
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "Laat buddy's zien dat je tegen ze typt"
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "Volledige namen in Tabs"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "Oude stijl tabs"
+
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "Toon pesonen die weggaan of binnenkomen in venster"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Toon alle gesprekken in een venster met tabbladen"
+
+#: src/prefs.c:679
+msgid "Show aliases in tabs/titles"
+msgstr "Toon aliassen in tabs of titels"
+
+#: src/prefs.c:694
 msgid "Show all chats in one tabbed window"
 msgstr "Toon alle gesprekken in een venster met tabbladen"
 
-#: src/prefs.c:1087
-msgid "Show conversations in the same tabbed window"
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
 msgstr "Toon gesprekken in hetzelfde venster met tabbladen"
 
-#: src/prefs.c:1045
-msgid "Show people joining/leaving in window"
-msgstr "Toon pesonen die weggaan of binnenkomen in venster"
-
-#: src/prefs.c:1093
-msgid "Tab Completion"
-msgstr "Titels in Tabs"
-
-#: src/prefs.c:1105
-msgid "Tab-Complete Nicks"
-msgstr "Volledige namen in Tabs"
-
-#: src/prefs.c:1111
-msgid "Old-Style Tab Completion"
-msgstr "Oude stijl tabs"
-
-#: src/prefs.c:1213 src/prefs.c:2745
-msgid "Font Options"
-msgstr "Lettertypes"
-
-#: src/prefs.c:1239
-msgid "Italic Text"
-msgstr "Cursieve Tekst"
-
-#: src/prefs.c:1283 src/prefs.c:1301 src/prefs.c:1323
-msgid "Select"
-msgstr "Selecteer"
-
-#: src/prefs.c:1321
-msgid "Font Face for Text"
-msgstr "Lettertype"
-
-#: src/prefs.c:1336
-msgid "Font Size for Text"
-msgstr "Lettergrootte"
-
-#: src/prefs.c:1422
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Proxy Server"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Host"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Poort"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Gebruiker"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "Open standaard nieuw venster"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Alle gesprekken loggen"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "Verwijder HTML uit het logboek"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "Log als buddy's zich aan/afmelden"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Log als buddy's inactief/actief worden"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Log als buddy's weggaan of terugkomen"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Log uw eigen aan/afmeldingen"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "Eigen log voor elke buddy-aanmelding"
+
+#: src/prefs.c:956
+msgid "No sounds when you log in"
+msgstr "Geen geluid bij aanmelden"
+
+#: src/prefs.c:957
+msgid "Sounds while away"
+msgstr "Geluid bij afwezigheid"
+
+#: src/prefs.c:994
+#, c-format
+msgid ""
+"Sound command\n"
+"(%s for filename)"
+msgstr ""
+
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "Verzenden van bericht heft afwezigheid op"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "Plaats berichten in wachtrij bij afwezigheid"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "Negeer gesprekken tijdens afwezigheid"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
+msgid "Don't send auto-response"
+msgstr "Geen automatisch antwoord verzenden"
+
+#: src/prefs.c:1054
+msgid "Only send auto-response when idle"
+msgstr ""
+"Alleen automatisch antwoord\n"
+"verzenden wanneer u inactief bent"
+
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Geluidsconfiguratie"
 
-#: src/prefs.c:1462
+#: src/prefs.c:1338
+#, fuzzy
+msgid "Test"
+msgstr "Alleen Tekst"
+
+#: src/prefs.c:1348
 msgid "Choose..."
 msgstr "Kies..."
 
-#: src/prefs.c:1513
-msgid "Sound Options"
-msgstr "Geluidsinstellingen"
-
-#: src/prefs.c:1541
-msgid "No sounds when you log in"
-msgstr "Geen geluid bij aanmelden"
-
-#: src/prefs.c:1547 src/prefs.c:1816
-msgid "Sounds while away"
-msgstr "Geluid bij afwezigheid"
-
-#: src/prefs.c:1557
-msgid "Sound Player:"
-msgstr "Geluidsafspeler:"
-
-#: src/prefs.c:1626
-#, c-format
-msgid ""
-"Command to play sound files\n"
-"(%s for filename; internal if empty)"
-msgstr ""
-"Commando voor het afspelen van geluid\n"
-"(%s voor bestandsnaam, leeg laten voor\n"
-"interne speler)"
-
-#: src/prefs.c:1637
-msgid "Events"
-msgstr "Gebeurtenissen"
-
-#: src/prefs.c:1645
-msgid "Sound when buddy logs in"
-msgstr "Geluid als buddy zich aanmeldt"
-
-#: src/prefs.c:1646
-msgid "Sound when buddy logs out"
-msgstr "Geluid als buddy zich afmeldt"
-
-#: src/prefs.c:1652
-msgid "Sound when received message begins conversation"
-msgstr "Geluid bij starten van gesprek"
-
-#: src/prefs.c:1654
-msgid "Sound when message is received"
-msgstr "Geluid bij het ontvangen van een bericht"
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Bewerken"
+
+#: src/prefs.c:1589
+msgid "Edit"
+msgstr "Bewerken"
 
 #: src/prefs.c:1655
-msgid "Sound when message is sent"
-msgstr "Geluid bij het verzenden van bericht"
+#, fuzzy
+msgid "Interface"
+msgstr "Instance"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Lettertype"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Bericht"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "Berichtvenster"
 
 #: src/prefs.c:1661
-msgid "Sound in chat rooms when people enter"
-msgstr "Geluid als iemand chatruimte binnenkomt"
+#, fuzzy
+msgid "Chat Window"
+msgstr "Groeps Chat Venster"
 
 #: src/prefs.c:1662
-msgid "Sound in chat rooms when people leave"
-msgstr "Geluid als iemand uit chatruimte weggaat"
+msgid "Tabs"
+msgstr ""
 
 #: src/prefs.c:1663
-msgid "Sound in chat rooms when you talk"
-msgstr "Geluid bij het praten in chatruimtes"
+msgid "Proxy"
+msgstr "Proxy"
 
 #: src/prefs.c:1664
-msgid "Sound in chat rooms when others talk"
-msgstr "Geluid in chat ruimtes als anderen praten"
-
-#: src/prefs.c:1787 src/prefs.c:2767
+msgid "Browser"
+msgstr "Browser"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Geluiden"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Geluiden"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Afwezig titel:"
+
+#: src/prefs.c:1670
 msgid "Away Messages"
 msgstr "Afwezigheid"
 
-#: src/prefs.c:1824
-msgid "Don't send auto-response"
-msgstr "Geen automatisch antwoord verzenden"
-
-#: src/prefs.c:1889
-msgid "Only send auto-response when idle"
-msgstr "Alleen automatisch antwoord\n"
-       "verzenden wanneer u inactief bent"
-
-#: src/prefs.c:1904
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Tijd tussen het verzenden van automatische antwoorden (seconden):"
-
-#: src/prefs.c:1835
-msgid "Auto Away after"
-msgstr "Automatisch afwezig na"
-
-#: src/prefs.c:1849
-msgid "minutes using"
-msgstr "Minuten"
-
-#: src/prefs.c:1862
-msgid "Messages"
-msgstr "Berichten"
-
-#: src/prefs.c:1874
-msgid "Title"
-msgstr "Titel"
-
-#: src/prefs.c:1917
-msgid "Edit"
-msgstr "Bewerken"
-
-#: src/prefs.c:1921
-msgid "Make Away"
-msgstr "Toon Afwezig"
-
-#: src/prefs.c:2198
-msgid "Privacy Options"
-msgstr "Privacy-instellingen"
-
-#: src/prefs.c:2214
-msgid "Set privacy for:"
-msgstr "Zet privacy voor:"
-
-#: src/prefs.c:2233
-msgid "Allow all users to contact me"
-msgstr "Alle gebruikers mogen contact opnemen"
-
-#: src/prefs.c:2234
-msgid "Allow only the users below"
-msgstr "Alleen onderstaande gebruikers toestaan"
-
-#: src/prefs.c:2236
-msgid "Allow List"
-msgstr "Toegestaan"
-
-#: src/prefs.c:2267
-msgid "Deny all users"
-msgstr "Alle Gebruikers Blokkeren"
-
-#: src/prefs.c:2268
-msgid "Block the users below"
-msgstr "Onderstaande gebruikers blokkeren"
-
-#: src/prefs.c:2270
-msgid "Block List"
-msgstr "Geblokkeerd"
-
-#: src/prefs.c:2365
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Voorkeuren"
 
-#: src/prefs.c:2444
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim Debug output venster"
 
-#: src/prefs.c:2701
-msgid "General"
-msgstr "Algemeen"
-
-#: src/prefs.c:2706
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/prefs.c:2730
-msgid "Conversations"
-msgstr "Gesprekken"
-
-#: src/prefs.c:2756
-msgid "Sounds"
-msgstr "Geluiden"
-
-#: src/prefs.c:2778
-msgid "Privacy"
-msgstr "Privacy"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -2590,92 +3393,387 @@
 "not the same version I cannot safely tell you which one it was. Needless to "
 "say, it was not successfully loaded."
 msgstr ""
-"U hebt geprobeerd een protocol te laden dat een andere versie heeft dan "
-"dit 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."
+"U hebt geprobeerd een protocol te laden dat een andere versie heeft dan dit "
+"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:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Protocol Acties"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Verbinding Verbreken"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Accepteren?"
 
-#: src/prpl.c:154 src/prpl.c:228
-msgid "Accept"
-msgstr "Accepteren"
-
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nieuwe E-mail"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "Open E-mail"
 
-#: src/prpl.c:564
-#, c-format
-msgid "%s%s%s%s has made %s their buddy%s%s%s"
+#: src/prpl.c:578
+#, 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:572
+#: src/prpl.c:586
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"Do you wish to add them to your buddy list?"
+"Do you wish to add him or her to your buddy list?"
 msgstr ""
 "\n"
 "\n"
 "Wilt u ze toevoegen aan uw buddy lijst?"
 
-#: src/server.c:53
+#: src/prpl.c:629
+msgid ""
+"You do not currently have any protocols available that are able to register "
+"new accounts."
+msgstr ""
+
+#: src/prpl.c:666
+#, fuzzy
+msgid "Gaim - Registration"
+msgstr "Gaim - Gesprekken"
+
+#: src/prpl.c:681
+msgid "Registration Information"
+msgstr ""
+
+#: src/prpl.c:698
+#, fuzzy
+msgid "Register"
+msgstr "Wissen"
+
+#: src/server.c:55
 msgid "Please enter your password"
 msgstr "Vul uw wachtwoord in"
 
-#: src/server.c:60
-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 ""
-"U kunt zich niet aanmelden op dit account. U heeft de plugin niet geladen of "
-"het protocol heeft geen aanmeldings functie."
-
-#: src/server.c:62
-msgid "Login Error"
-msgstr "Aanmeldings Fout"
-
-#: src/server.c:535
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d berichten)"
 
-#: src/server.c:541
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 bericht)"
 
-#: src/server.c:756
+#: src/server.c:808
 msgid "Warned"
 msgstr "Gewaarschuwd"
 
-#: src/server.c:827
+#: src/server.c:901
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:828
+#: src/server.c:902
 msgid "No"
 msgstr "Nee"
+
+#: src/server.c:1101
+#, fuzzy
+msgid "More Info"
+msgstr "Haal Info op"
+
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "Buddy Icon"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "Geluid als buddy zich afmeldt"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "Geluid bij het ontvangen van een bericht"
+
+#: src/sound.c:66
+#, fuzzy
+msgid "Message received begins conversation"
+msgstr "Geluid bij starten van gesprek"
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "Berichten"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid ""
+#~ "Relax, help is just around the corner. The first thing you'll need to do "
+#~ "is get an AIM account; you can get one from http://aim.aol.com/. Just "
+#~ "click the button that says \"New Users\" and you can create an account "
+#~ "that way. Once you have your account, enter the username and password "
+#~ "into the login window that comes up when you start Gaim, and click the "
+#~ "Signon button. Once you're online, you can talk to one of the Gaim "
+#~ "developers for more assistance; their contact information is in the "
+#~ "AUTHORS file in the Gaim source, or at "
+#~ msgstr ""
+#~ "Rustig... Hulp is makkelijk te vinden. Het eerste wat u moet doen is een "
+#~ "AIM account aanmaken. Dat kan op http://aim.aol.com/. Klik op de knop "
+#~ "\"New Users\" en daarmee kunt u een nieuw account aanmaken. Heeft u dat "
+#~ "eenmaal gedaan dan kunt u zich aanmelden door uw gekozen Gebruikersnaam "
+#~ "en wachtwoord in te vullen in het login venster dat vershijnt als u gaim "
+#~ "start. Klik op aanmelden en u kunt gesprekken voeren met andere AIM "
+#~ "gebruikers maar ook met enkele van de Gaim ontwikkelaars. Zie het AUTHORS "
+#~ "bestand of op "
+
+#~ msgid "Help!"
+#~ msgstr "Help"
+
+#~ msgid "Handshake"
+#~ msgstr "Handshake"
+
+#, fuzzy
+#~ msgid "Sending key"
+#~ msgstr "Verzend bestand"
+
+#~ msgid "Logging in %s\n"
+#~ msgstr "Bezig met aanmelden %s\n"
+
+#, fuzzy
+#~ msgid "Send offline message"
+#~ msgstr "Bericht Offline verzenden."
+
+#~ 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"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Overig"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Toon inactieve tijd"
+
+#~ msgid "None"
+#~ msgstr "Geen"
+
+#~ msgid "X Use"
+#~ msgstr "van X"
+
+#~ msgid "KFM"
+#~ msgstr "Konqueror"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URL Handler"
+
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Toetsenbord-instellingen"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "Tijdweergave inschakelen met F2"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Weergave en Algemene Instellingen"
+
+#~ msgid "IM Options"
+#~ msgstr "Bericht-instellingen"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Toon knoppen als:"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Plaatjes en Tekst"
+
+#~ msgid "Pictures"
+#~ msgstr "Alleen Plaatjes"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Toon gesprekken in een venster met tabbladen"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Vensterafmetingen"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Plaatsing van Tabs"
+
+#~ 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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Cursieve Tekst"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Lettertype"
+
+#~ msgid "Font Size for Text"
+#~ msgstr "Lettergrootte"
+
+#~ msgid "Sound Options"
+#~ msgstr "Geluidsinstellingen"
+
+#~ msgid "Sound Player:"
+#~ msgstr "Geluidsafspeler:"
+
+#~ msgid ""
+#~ "Command to play sound files\n"
+#~ "(%s for filename; internal if empty)"
+#~ msgstr ""
+#~ "Commando voor het afspelen van geluid\n"
+#~ "(%s voor bestandsnaam, leeg laten voor\n"
+#~ "interne speler)"
+
+#~ msgid "Events"
+#~ msgstr "Gebeurtenissen"
+
+#~ msgid "Sound when message is sent"
+#~ msgstr "Geluid bij het verzenden van bericht"
+
+#~ msgid "Sound in chat rooms when people enter"
+#~ msgstr "Geluid als iemand chatruimte binnenkomt"
+
+#~ msgid "Sound in chat rooms when people leave"
+#~ msgstr "Geluid als iemand uit chatruimte weggaat"
+
+#~ msgid "Sound in chat rooms when you talk"
+#~ msgstr "Geluid bij het praten in chatruimtes"
+
+#~ msgid "Sound in chat rooms when others talk"
+#~ msgstr "Geluid in chat ruimtes als anderen praten"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "Tijd tussen het verzenden van automatische antwoorden (seconden):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Automatisch afwezig na"
+
+#~ msgid "minutes using"
+#~ msgstr "Minuten"
+
+#~ msgid "Make Away"
+#~ msgstr "Toon Afwezig"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Privacy-instellingen"
+
+#~ msgid "General"
+#~ msgstr "Algemeen"
+
+#~ msgid "Conversations"
+#~ msgstr "Gesprekken"
--- a/po/pl.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/pl.po	Thu Aug 08 18:11:17 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.60\n"
-"POT-Creation-Date: 2002-06-30 01:05-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -22,11 +22,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim Czat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2866 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Zamknij"
 
@@ -38,17 +38,16 @@
 msgid "Refresh"
 msgstr "Odwie"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2881
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "Dodaj"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2878
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "Usu"
 
@@ -72,7 +71,6 @@
 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:"
@@ -89,7 +87,7 @@
 msgid "Change"
 msgstr "Zmie"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Dostpny"
 
@@ -97,8 +95,8 @@
 msgid "Available for friends only"
 msgstr "Dostpny tylko dla przyjaci"
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
 #: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Zajty"
 
@@ -146,7 +144,7 @@
 msgid "Unknown Error Code."
 msgstr "Nieznany Kod Bdu."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
@@ -271,8 +269,7 @@
 msgid "Sex"
 msgstr "Pe"
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Miasto"
 
@@ -346,12 +343,9 @@
 msgid "Directory Search"
 msgstr "Przeszukiwanie Katalogu"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3904 src/protocols/jabber/jabber.c:3917
+#: 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
 msgid "Change Password"
 msgstr "Zmie haso"
 
@@ -372,7 +366,7 @@
 msgstr "Wylij wiadomo poprzez serwer"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2992 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Pobierz informacj"
@@ -385,7 +379,7 @@
 #: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
-msgstr "<B>$s zmieni temat na: %s</B>"
+msgstr "<B>%s zmieni temat na: %s</B>"
 
 #: src/protocols/irc/irc.c:825
 msgid "No such nick/channel"
@@ -438,7 +432,7 @@
 msgid "Channel:"
 msgstr "Kana:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Haso"
 
@@ -462,8 +456,8 @@
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1143
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "Dostpny"
 
@@ -493,13 +487,13 @@
 msgid "No such user"
 msgstr "Brak uytkownika"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2364
-#: src/protocols/jabber/jabber.c:2632
+#: 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/dialogs.c:887 src/protocols/jabber/jabber.c:1742
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Kumple"
 
@@ -519,13 +513,13 @@
 msgid "Password Change"
 msgstr "Zmiana hasa"
 
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3832
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "Poczenie utracone"
 
 #: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3834 src/protocols/jabber/jabber.c:3880
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
+#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
 msgid "Unable to connect"
 msgstr "Nie mona si poczy"
 
@@ -537,135 +531,132 @@
 msgid "Requesting Authentication Method"
 msgstr "danie metody autentykacji"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr "czenie"
 
-#: src/protocols/jabber/jabber.c:2363 src/protocols/jabber/jabber.c:2631
+#: 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:2599
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Pokj:"
 
-#: src/protocols/jabber/jabber.c:2603
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/protocols/jabber/jabber.c:2608
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr "Uchwyt:"
 
-#: src/protocols/jabber/jabber.c:2665
+#: src/protocols/jabber/jabber.c:2714
 msgid "Chats"
 msgstr "Czaty"
 
-#: src/protocols/jabber/jabber.c:2980
+#: src/protocols/jabber/jabber.c:3029
 msgid "View Error Msg"
 msgstr "Poka komunikat bdu"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2997
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Pobierz wiadomo Zajty"
 
-#: src/protocols/jabber/jabber.c:3004
+#: src/protocols/jabber/jabber.c:3053
 msgid "Un-hide From"
 msgstr "Odso Od"
 
-#: src/protocols/jabber/jabber.c:3007
+#: src/protocols/jabber/jabber.c:3056
 msgid "Temporarily Hide From"
 msgstr "Tymczasowo schowaj Od"
 
-#: src/protocols/jabber/jabber.c:3025
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr "Usu ze spisu"
 
-#: src/protocols/jabber/jabber.c:3030
+#: src/protocols/jabber/jabber.c:3079
 msgid "Cancel Presence Notification"
 msgstr "Anuluj pokazywanie powiadomienia"
 
-#: src/protocols/jabber/jabber.c:3232
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "Pena nazwa"
 
-#: src/protocols/jabber/jabber.c:3233
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "Nazwisko"
 
-#: src/protocols/jabber/jabber.c:3234
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "Nazwisko panieskie"
 
-#: src/protocols/jabber/jabber.c:3235
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3236
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3237
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Adres ulica"
 
-#: src/protocols/jabber/jabber.c:3238
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "Rozszerzony adres"
 
-#: src/protocols/jabber/jabber.c:3239
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "Miejsce (lokalizacja)"
 
-#: src/protocols/jabber/jabber.c:3240
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3241
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "Kod pocztowy"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3242
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Kraj"
 
-#: src/protocols/jabber/jabber.c:3243
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3244
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3245
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "Nazwa organizacji"
 
-#: src/protocols/jabber/jabber.c:3246
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "Jednostka organizacyjna"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3247
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Tytu"
 
-#: src/protocols/jabber/jabber.c:3248
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr "Rola"
 
-#: src/protocols/jabber/jabber.c:3249
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "Data urodzenia"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3250
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Opis"
 
-#: src/protocols/jabber/jabber.c:3275
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -673,23 +664,23 @@
 "Wszystkie ponisze pola s opcjonalne. Wprowad jedynie te informacje, ktre "
 "uwaasz za stosowne"
 
-#: src/protocols/jabber/jabber.c:3276
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr "Identyfikacja uytkownika"
 
-#: src/protocols/jabber/jabber.c:3688
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Edycja vCard Jabber"
 
-#: src/protocols/jabber/jabber.c:3762
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "Poprawa rejestracja na serwerze!"
 
-#: src/protocols/jabber/jabber.c:3789
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "Nieznany bd rejestracji"
 
-#: src/protocols/jabber/jabber.c:3898 src/protocols/jabber/jabber.c:3913
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "Ustaw informacje o uytkowniku"
 
@@ -842,8 +833,8 @@
 msgstr "Nieznany Kod Bdu."
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -851,97 +842,97 @@
 msgid "A message may not have been received."
 msgstr "Wiadomo moga zosta nieodebrana."
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim nie mg wysa wiadomoci"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, 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:1074
+#: src/protocols/msn/msn.c:1076
 #, 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:1175
+#: src/protocols/msn/msn.c:1177
 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:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 msgid "Error reading from server"
 msgstr "Bd podczas odczytu z serwera"
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr "danie wysania hasa"
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 msgid "Unable to send password"
 msgstr "Nie mona wysa hasa"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 msgid "Password sent"
 msgstr "Haso wysane"
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 msgid "Unable to write to server"
 msgstr "Nie mona zapisa na serwer"
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 msgid "Synching with server"
 msgstr "Synchronizacja z serwerem"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr "Nie ma mnie przy komputerze"
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr "Zaraz bd"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Busy"
 msgstr "Zajty"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr "Na telefonie"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr "Na lanczu"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr "Wyczy przyjazn nazw"
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr "Przyjazna nazwa zbyt duga."
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 msgid "Set Friendly Name"
 msgstr "Ustaw przyjazn nazw"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 msgid "Set Friendly Name:"
 msgstr "Ustaw przyjazn nazw:"
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr "Wyczy wszystkie przyjazne nazwy"
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Do jakiej grupy przyczy:"
@@ -1019,17 +1010,14 @@
 msgid "Connection established, cookie sent"
 msgstr "Ustanowiono poczenie, wysano ciasteczko"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Niepoprawny nick lub haso."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Twoje konto jest w tej chwili zawieszone."
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1039,7 +1027,6 @@
 "ponownie. Jeli bdziesz teraz prbowa dalej, bdziesz musia zaczeka "
 "duej."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Wersja klienta, ktrej uywasz, jest zbyt stara. Uaktualnij j."
@@ -1052,7 +1039,7 @@
 msgid "Internal Error"
 msgstr "Bd wewntrzny"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Ustanowiono bezporedni IM z %s"
@@ -1148,9 +1135,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Opucie %d wiadomoci od %s z nieznanych powodw."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c: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/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"
 
@@ -1187,68 +1174,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "Informacja uytkownika dla %s niedostpna: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "Ikona kupla"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "Gos"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "Obraz IM"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Czat"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Pobierz plik"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Wylij plik"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Gry"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "Zapasy"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "Wylij list kumpli"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "Bd EveryBuddy"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "Uytkownik AP"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "Icq RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "Serwer przekazujcy ICQ"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "Nieznany ICQ"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "Szyfrowanie Trillian"
 
@@ -1308,15 +1295,15 @@
 "Ostatnia wiadomo nie zostaa wysana poniewa przekroczye limit "
 "prdkoci. Zaczekaj 10 sekund i sprbuj ponownie."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1326,19 +1313,19 @@
 "Dopki przekraczasz limit niektrzy kolesie nie bd pokazywani jako "
 "dostpni."
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 msgid "Gaim - Warning"
 msgstr "Gaim - Ostrzeenie"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Wymiana:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Nie mona otworzy bezporedniego IM"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1349,7 +1336,7 @@
 "zobaczy twj adres IP i moe to by ryzykiem zabezpiecze. Czy chcesz "
 "kontynuowa?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1358,7 +1345,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:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1367,15 +1354,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:3600
+#: src/protocols/oscar/oscar.c:3615
 msgid "Get Status Msg"
 msgstr "Pobierz wiadomo o stanie"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "Bezporednia IM"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "Pobierz uprawnienia: "
 
@@ -1520,7 +1507,7 @@
 msgid "Password Change Successful"
 msgstr "Pomylna zmiana hasa."
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Zmiana hasa"
 
@@ -1659,14 +1646,11 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (autor oryginau)     [ markster@marko.net ]"
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Strona Web"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Wypisz si"
 
@@ -1674,7 +1658,7 @@
 msgid "Please enter your logon"
 msgstr "Wpisz swoj nazw logowania"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Bd zapisywania si"
 
@@ -1690,11 +1674,11 @@
 msgid "Password: "
 msgstr "Haso: "
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Wyjcie"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "Konta"
 
@@ -1706,19 +1690,19 @@
 msgid "About"
 msgstr "O ..."
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "Opcje"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 msgid "Auto-login"
 msgstr "Automatyczne logowanie"
 
@@ -1771,74 +1755,73 @@
 msgid "Set All Away"
 msgstr "Ustaw wszystkie Zajty"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Grupa"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2899
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Info"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Pseudo"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "Dodaj wychwyconego kumpla"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Poka log"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Zmie nazw"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Od-pseudo"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "Wychwy kumpla"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "Nowe wychwycenie kumpla"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Usu wychwycenie kumpla"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Kliknij by edytowa]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Zalogowany: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Ostrzeenia: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Uprawnienia: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1849,125 +1832,129 @@
 "Nazwa ekranu: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "Bezczynno: "
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s zalogowany."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s wylogowany."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Informacje o wybranym kumplu"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "Wylij IM"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Rozpocznij/przycz do czatu kumpla"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Aktywuj wiadomo Zajty"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Plik"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Dodaj kumpla"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Przycz do czatu"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "Nowa IM"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Pobierz informacje o uytkowniku"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Importuj list kumpli"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Narzdzia"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Akcje protokou"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Prywatno"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Poka log systemowy"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Wczytaj skrypt"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Wyaduj wszystkie skrypty"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Lista skryptw"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 msgid "Online Help"
 msgstr "Pomoc on-line"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 msgid "Debug Window"
 msgstr "Okno odpluskwiania"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "O Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Lista kumpli"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Dodaj nowego kumpla"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Dodaj now grup"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Usu wybranego kumpla/grup"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Edytuj kumpli"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - lista kumpli"
 
@@ -1979,13 +1966,13 @@
 msgid "Join Chat As:"
 msgstr "Przycz do czatu jako:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1993,16 +1980,16 @@
 msgid "Join"
 msgstr "Przycz"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Wywoaj"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Kole"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Wiadomo"
 
@@ -2010,68 +1997,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - zawoaj kumpla do pokoju czat"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Od-ignoruj"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "Ignoruj"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s w pokoju"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s wszed do pokoju."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s znany jest jako %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s wyszed z pokoju (%s)."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s wyszed z pokoju"
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - grupy czatw"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Temat:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "Nie ma ludzi w pokoju"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Szept"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2910
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Wylij "
 
-#: src/buddy_chat.c:1458 src/conversation.c:2887
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Blokuj"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2893 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Ostrze"
 
@@ -2105,187 +2091,187 @@
 msgid "Setting position to %d\n"
 msgstr "Ustawianie pozycji na %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Tekst pogrubiony"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Pogrubienie"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Tekst pochylony"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Pochylenie"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Tekst podkrelony"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Podkrelenie"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Tekst przekrelony"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Przekrelenie"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Zmiejsz wielko czcionki"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Maa"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Normalna wielko czcionki"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normalna"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Zwiksz wielko czcionki"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Dua"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Wybierz czcionk"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Czcionka"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Kolor tekstu"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Kolor"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Kolor ta"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Wstaw odnonik"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Odnonik"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Wstaw umiechnit twarz"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Umiech"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "Wstaw obraz IM"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr "Obraz"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Zacz logowanie"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Logowanie"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Zapisz rozmow"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Dwik"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - rozmowy"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Wylij wiadomo jako: "
 
-#: src/conversation.c:3455
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - zapisz ikon"
 
-#: src/conversation.c:3489
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Wycz animacj"
 
-#: src/conversation.c:3494
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Zacz animacj"
 
-#: src/conversation.c:3500
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Ukryj ikon"
 
-#: src/conversation.c:3506
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Zapisz ikon jako..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - ostrzec uytkownika?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Czy naprawd chcesz ostrzec uytkownika %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Ostrzec anonimowo?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonimowe ostrzeenia s mniej przykre."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Usuwanie '%s' z listy kumpli.\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Usun %s?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "Usu kumpla"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2294,361 +2280,381 @@
 "Zamierzasz usun '%s' ze swojej\n"
 "listy kumpli. Kontynuowa ? "
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Akceptuj"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "Ok"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - Uytkownik IM"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "kto IM:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Uytkownik:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 msgid "Account:"
 msgstr "Konto:"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Pobierz informacje o uytkowniku"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Dodaj grup"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Dodaj grup"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Dodaj kumpla"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Dodaj kumpla"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Kontakt"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Dodaj do"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Zajty!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Ustaw prywatno dla:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Pozwl wszystkim uytkownikom na kontakt ze mn"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Pozwl tylko uytkownikom poniej"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Lista zezwole"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Zabro wszystkim uytkownikom"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Blokuj uytkownikw poniej"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Lista blokowa"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Wprowad kumpla do wywoania."
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Bd wywoania kumpla"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nowe wywoanie kumpla"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "Wychwy Kto"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "Konto"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "Wychwy Kiedy"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Wywoaj przy zapisywaniu si"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Wywoaj przy powrocie z Zajty"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Wywoaj przy powrocie z bezczynnoci"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "Dwik gdy kole napisze do Ciebie"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Akcje protokou"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "Otwrz okno IM"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "Powiadomienie Popup"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "Wylij wiadomo"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Wykonaj polecenie przy wywoaniu"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Odtwrz dwik przy wywoaniu"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Zapisz to wywoanie po aktywacji"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - ustaw informacje katalogowe"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "Informacja katalogowa"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dopuszczaj przeszukiwania Web w celu znalezienia twojego info"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Imi"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Drugie imi"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Nazwisko"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Nazwisko panieskie"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "Stan"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "Nowe hasa nie s zgodne"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - bd zmiany hasa"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Wypenij cakowicie wszystkie pola"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Haso oryginalne"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Nowe haso"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Nowe haso (ponownie)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - ustaw informacj uytkownika"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Poniej s wyniki twojego wyszukiwania: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Akceptuj"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Odrzu"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - dodaj akceptacj"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - dodaj odrzucenie"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - loguj rozmow"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Szukaj kumpla"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - znajd kumpla wg informacji"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - znajd kumpla wg adresu email"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - Dodaj URL"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Wybierz kolor tekstu"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Wybierz kolor ta"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - importuj list kumpli"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "Nie moesz stworzy wiadomoci Zajty bez tytuu"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "Nie moesz stworzy pustej wiadomoci Zajty"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - nowa wiadomo zajty"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Nowa wiadomo zajty"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Tytu Zajty: "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Uyj"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Zapisz i uyj"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Umiech!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Pseudo kumpla"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - pseudo kumpla"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - zapisz plik logu"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Nie mona usun pliku %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Naprawd wyczyci log?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "Okej"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Rozmowa"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Wyczy"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - zmie nazw grupy"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Zmie nazw grupy"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Nowa nazwa:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - zmie nazw kumpla"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Zmie nazw kumpla"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - wybierz skrypt Perl"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nie mona otworzy pliku konfiguracji %s."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Bd preferencji"
 
@@ -2677,7 +2683,7 @@
 msgid "Browse"
 msgstr "Przegldaj"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Zeruj"
 
@@ -2717,7 +2723,18 @@
 msgid "Enter Password"
 msgstr "Wprowad haso"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2725,44 +2742,40 @@
 "Nie moesz zalogowa si na to konto; nie masz zaadowanego odpowiedniego "
 "protokou lub nie ma on funkcji logowania."
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "Bd logowania"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Jeste pewien, e chcesz usun %s?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - edytor kont"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Wybierz wszystkie"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Wybierz automaty"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Wybierz aden"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Modyfikuj"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Zapisz / wypisz si"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Usu"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2771,21 +2784,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nie mg si zalogowa"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "Uwaga"
 
-#: src/multi.c:1420
-#, c-format
+#: src/multi.c:1427
+#, fuzzy, c-format
 msgid "%s has been signed off"
-msgstr "%s wylogowa si: %s"
-
-#: src/multi.c:1421
+msgstr "%s nie mg si zalogowa"
+
+# #: src/multi.c:1427
+# #, c-format
+# msgid "%s has been signed off"
+# msgstr "%s wylogowa si: %s"
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr "Bd poczenia"
 
@@ -2793,552 +2810,361 @@
 msgid "Perl Scripts"
 msgstr "Skrypty Perl"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - lista wtyczek"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - wtyczki"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Wczytane wtyczki"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Wybierz wszystkie"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "cieka do plikw:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Wczytaj"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Wczytaj wtyczk z pliku"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Konfiguruj ustawienia wybranej wtyczki"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Wczytaj ponownie"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Wczytaj ponownie wybran wtyczk"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Wyaduj"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Wyaduj wybran wtyczk"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Zamknij to okno"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Opcje oglne"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "Wszystkie opcje dziaaj od razu, chyba, e napisano inaczej."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Rne"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Uywaj przyciskw bez obrysu"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "Poka wskanik kumpli"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "Poka okno odpluskwiania"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "Wychwy kumpli, do ktrych piszesz"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Raportuj czasy bezczynnoci"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "Brak"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Uyj Gaim"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "Uyj X"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Loguj wszystkie rozmowy"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "Wycignij HTML z logw"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "Loguj gdy kumple zapisuj/wypisuj si"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "Loguj gdy kumple staj si bezczynni/od-bezczynni"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "Loguj gdy kumple staj si zajci/wracaj"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "Loguj swoje wasne zapisywania/bezczynnoci/zajtoci"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "Oddzielne pliki logw dla kadego zapisania si kumpla"
+#, fuzzy
+msgid "Windows"
+msgstr "Okno IM"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "Przegldarka"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
-msgstr ""
-
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "Domylnie otwieraj nowe okno"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "Obsuga URL przez Gnome"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr "Rcznie (%s dla URL)"
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Opcje proxy"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Nie wszystkie protokoy mog uywa proxy. Przeczytaj plik README by "
-"dowiedzie si szczegw"
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Typ proxy"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Serwer proxy"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Bez proxy"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "Socks 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "Socks 5"
+msgid "Show Buddy Ticker"
+msgstr "Poka wskanik kumpli"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "Poka okno odpluskwiania"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "Stan"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Uywaj przyciskw bez obrysu"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Tekst przekrelony"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Anuluj"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Uytkownik jest zbyt aktywny"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Wybierz"
+
+#: src/prefs.c:345
+#, fuzzy
+msgid "Use custom size"
+msgstr "Uytkownik jest zbyt aktywny"
+
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Kolor tekstu"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Kolor ta"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Poka graficzne twarzyczki ;-)"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Poka znaczniki czasu wiadomoci"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "Poka URLe jako linki"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Podwietlaj le napisane sowa"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "Ignoruj kolory"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "Ignoruj krj czcionki"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "Ignoruj wielkoci czcionki"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "Serwer"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Port"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "Uytkownik"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "Haso"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "Opcje listy kumpli"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "Okno listy kumpli"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr "Ustawienie zakadek"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "Gra"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "D"
-
-#: src/prefs.c:586
+msgid "Ignore TiK Automated Messages"
+msgstr "Ignoruj automatyzowane wiadomoci TIK"
+
+#: src/prefs.c:459
+msgid "Enter sends message"
+msgstr "Enter wysya wiadomo"
+
+#: src/prefs.c:460
+msgid "Control-Enter sends message"
+msgstr "Control-Enter wysya wiadomo"
+
+#: src/prefs.c:469
+msgid "Escape closes window"
+msgstr "Escape zamyka okno"
+
+#: src/prefs.c:470
+msgid "Control-W closes window"
+msgstr "Control-W zamyka okno"
+
+#: src/prefs.c:480
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "Control-[B/I/U/S] wstawia tagi HTML"
+
+#: src/prefs.c:481
+msgid "Control-(number) inserts smileys"
+msgstr "Control-(liczba) wstawia twarzyczki :-)"
+
+#: src/prefs.c:500
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Ukryj przyciski IM/Info/Czat"
 
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "Automatycznie poka po zapisaniu si list kumpli"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "Poka list kumpli blisko apletu"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Zapisz wielko/pozycj okna"
-
-#: src/prefs.c:596
+#: src/prefs.c:501
 msgid "Show pictures on buttons"
 msgstr "Poka obrazki na przyciskach"
 
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr "Poka list kumpli przy logowaniach i wylogowaniach"
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "Ekrany grup"
-
-#: src/prefs.c:614
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Automatycznie poka po zapisaniu si list kumpli"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "Poka list kumpli blisko apletu"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Zapisz wielko/pozycj okna"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Powiksz okno przy zdarzeniach"
+
+#: src/prefs.c:526
 msgid "Hide groups with no online buddies"
 msgstr "Ukryj grupy bez dostpnych kumpli"
 
-#: src/prefs.c:620
+#: src/prefs.c:527
 msgid "Show numbers in groups"
 msgstr "Poka liczby w grupach"
 
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "Ekrany kumpli"
-
-#: src/prefs.c:634
+#: src/prefs.c:536
 msgid "Show buddy type icons"
 msgstr "Poka ikony typu kumpli"
 
-#: src/prefs.c:635
+#: src/prefs.c:537
 msgid "Show warning levels"
 msgstr "Poka poziomy ostrzee"
 
-#: src/prefs.c:641
+#: src/prefs.c:538
 msgid "Show idle times"
 msgstr "Poka czasy bezczynnoci"
 
-#: src/prefs.c:642
+#: src/prefs.c:539
 msgid "Grey idle buddies"
 msgstr "Bezczynni kumple w szarym kolorze"
 
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "Opcje rozmw"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Opcje klawiatury"
-
-#: src/prefs.c:683
-msgid "Enter sends message"
-msgstr "Enter wysya wiadomo"
-
-#: src/prefs.c:684
-msgid "Control-Enter sends message"
-msgstr "Control-Enter wysya wiadomo"
-
-#: src/prefs.c:685
-msgid "Escape closes window"
-msgstr "Escape zamyka okno"
-
-#: src/prefs.c:686
-msgid "Control-W closes window"
-msgstr "Control-W zamyka okno"
-
-#: src/prefs.c:692
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-[B/I/U/S] wstawia tagi HTML"
-
-#: src/prefs.c:693
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(liczba) wstawia twarzyczki :-)"
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "Szeroko nowego okna:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "Wysoko nowego okna:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Wprowad wysoko widgetu"
+
+#: src/prefs.c:571 src/prefs.c:633
+msgid "Raise windows on events"
+msgstr "Powiksz okno przy zdarzeniach"
+
+#: src/prefs.c:572
+msgid "Hide window on send"
+msgstr "Ukryj okno przy wysyaniu"
+
+#: src/prefs.c:581
+msgid "Hide Buddy Icons"
+msgstr "Ukryj ikony kumpla"
+
+#: src/prefs.c:582
+msgid "Disable Buddy Icon Animation"
+msgstr "Wycz animacj ikon kumpli"
+
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Poka logowania w oknie"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "Wychwy kumpli, do ktrych piszesz"
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "Uzupenianie nickw tabulatorem"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "Uzupenianie tab w starym stylu"
+
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "Poka ludzi przyczajcych si/wychodzcych w oknie"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "Pokazuj aliasy w zakadkach/tytuach/wskaniku"
 
 #: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 przecza wywietlanie znacznika czasu"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "Ekran i Opcje oglne"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "Poka graficzne twarzyczki ;-)"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "Poka znaczniki czasu wiadomoci"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "Poka URLe jako linki"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Podwietlaj le napisane sowa"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "Wysanie wiadomoci usuwa stan Zajty"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "Kolejkuj nowe wiadomoci gdy zajty"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "Ignoruj kolory"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "Ignoruj krj czcionki"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "Ignoruj wielkoci czcionki"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignoruj automatyzowane wiadomoci TIK"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "Ignoruj nowe rozmowy gdy zajty"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "Opcje IM"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "Okno IM"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "Poka przyciski jako: "
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "Obrazki i tekst"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "Obrazki"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "Tekst"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "Poka wszystkie rozmowy w jednym oknie z zakadkami"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
-
-#: src/prefs.c:967 src/prefs.c:1119
-msgid "Raise windows on events"
-msgstr "Powiksz okno przy zdarzeniach"
-
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "Poka logowania w oknie"
-
-#: src/prefs.c:969
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "Pokazuj aliasy w zakadkach/tytuach/wskaniku"
-
-#: src/prefs.c:970
-msgid "Hide window on send"
-msgstr "Ukryj okno przy wysyaniu"
-
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "Wielkoci okna"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "Szeroko nowego okna:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "Wysoko nowego okna:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Wprowad wysoko widgetu"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Ustawienie zakadek"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "Lewo"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "Prawo"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "Ikony kumpla"
-
-#: src/prefs.c:1031
-msgid "Hide Buddy Icons"
-msgstr "Ukryj ikony kumpla"
-
-#: src/prefs.c:1037
-msgid "Disable Buddy Icon Animation"
-msgstr "Wycz animacj ikon kumpli"
-
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "Opcje czatu"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "Okno grupy czatu"
-
-#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
 
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "Poka wszystkie rozmowy w jednym oknie z zakadkami"
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "Poka ludzi przyczajcych si/wychodzcych w oknie"
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "Uzupenianie tab"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "Uzupenianie nickw tabulatorem"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "Uzupenianie tab w starym stylu"
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "Opcje czcionki"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "Pochylony tekst"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "Wybierz"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "Krj czcionki tekstu"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "Wielko czcionki tekstu"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - konfiguracja dwiku"
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "Test"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "Wybierz..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Opcje dwiku"
-
-#: src/prefs.c:1649
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Serwer proxy"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Serwer"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Port"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Uytkownik"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Haso"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "Domylnie otwieraj nowe okno"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Loguj wszystkie rozmowy"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "Wycignij HTML z logw"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "Loguj gdy kumple zapisuj/wypisuj si"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Loguj gdy kumple staj si bezczynni/od-bezczynni"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Loguj gdy kumple staj si zajci/wracaj"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Loguj swoje wasne zapisywania/bezczynnoci/zajtoci"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "Oddzielne pliki logw dla kadego zapisania si kumpla"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "Bez dwikw gdy si logujesz"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Dwiki podczas zajtoci"
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "Sposb odgrywania"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3347,106 +3173,125 @@
 "Polecenie odegrania plikw\n"
 "(%s dla nazwy pliku)"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "Dwik odtwarzany gdy:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "Wiadomoci Zajty"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "Wysanie wiadomoci usuwa stan Zajty"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "Kolejkuj nowe wiadomoci gdy zajty"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "Ignoruj nowe rozmowy gdy zajty"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "Nie wysyaj automatycznej odpowiedzi"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "Wysyaj automatyczn odpowied tylko gdy bezczynny"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Czas pomidzy auto-opdowiedziami (w sekundach):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "Automatycznie Zajty po"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "minutach uywajc"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "Wiadomoci"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - konfiguracja dwiku"
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr "Test"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Wybierz..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Edycja"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Edycja"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "Zrb Zajty"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Opcje prywatnoci"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Ustaw prywatno dla:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "Pozwl wszystkim uytkownikom na kontakt ze mn"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "Pozwl tylko uytkownikom poniej"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "Lista zezwole"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "Zabro wszystkim uytkownikom"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "Blokuj uytkownikw poniej"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "Lista blokowa"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "Przykad:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Czcionka"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Wiadomo wysana"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "Okno IM"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Okno grupy czatu"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr ""
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Przegldarka"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Dwiki"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Zdarzenia"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Tytu Zajty: "
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "Wiadomoci Zajty"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - preferencje"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim okno wyjcia odplukswiania"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Oglnie"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr ""
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "Rozmowy"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Dwiki"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Prywatno"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3463,37 +3308,50 @@
 msgid "Protocol Error"
 msgstr "Bd protokou"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Akcje protokou"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Rozcz"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Akcpetujesz?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - prompt"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nowa poczta"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "Otwrz poczt"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 msgid ""
 "\n"
 "\n"
@@ -3503,7 +3361,7 @@
 "\n"
 "Chcesz ich doa do swojej listy kumpli?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3511,15 +3369,15 @@
 "Nie masz w tej chwili adnych dostpnych protokow, ktrymi mgby "
 "zarejestrowa nowe konta."
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - Rejestracja"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "Informacje rejestracji"
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "Rejestruj"
 
@@ -3527,28 +3385,28 @@
 msgid "Please enter your password"
 msgstr "Wpisz swoje haso"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d wiadomoci)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 wiadomo)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "Ostrzeono"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Tak"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "Nie"
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr "Wicej informacji"
 
@@ -3592,6 +3450,190 @@
 msgid "Someone says your name in chat"
 msgstr "Kto wymawia Twoje imi na czacie"
 
+#~ 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."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Rne"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Raportuj czasy bezczynnoci"
+
+#~ msgid "None"
+#~ msgstr "Brak"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Uyj Gaim"
+
+#~ msgid "X Use"
+#~ msgstr "Uyj X"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "Obsuga URL przez Gnome"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "Socks 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "Socks 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Opcje klawiatury"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 przecza wywietlanie znacznika czasu"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Ekran i Opcje oglne"
+
+#~ msgid "IM Options"
+#~ msgstr "Opcje IM"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Poka przyciski jako: "
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Obrazki i tekst"
+
+#~ msgid "Pictures"
+#~ msgstr "Obrazki"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Poka wszystkie rozmowy w jednym oknie z zakadkami"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Wielkoci okna"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Ustawienie zakadek"
+
+#~ msgid "Left"
+#~ msgstr "Lewo"
+
+#~ msgid "Right"
+#~ msgstr "Prawo"
+
+#~ msgid "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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Pochylony tekst"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Krj czcionki tekstu"
+
+#~ 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:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "Czas pomidzy auto-opdowiedziami (w sekundach):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Automatycznie Zajty po"
+
+#~ msgid "minutes using"
+#~ msgstr "minutach uywajc"
+
+#~ msgid "Messages"
+#~ msgstr "Wiadomoci"
+
+#~ msgid "Make Away"
+#~ msgstr "Zrb Zajty"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Opcje prywatnoci"
+
+#~ msgid "General"
+#~ msgstr "Oglnie"
+
+#~ msgid "Conversations"
+#~ msgstr "Rozmowy"
+
 #~ msgid "KFM"
 #~ msgstr "KFM"
 
@@ -3601,9 +3643,6 @@
 #~ msgid "Manual"
 #~ msgstr "Rcznie"
 
-#~ msgid "Events"
-#~ msgstr "Zdarzenia"
-
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "Dwik gdy kole si loguje"
 
--- a/po/ru.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/ru.po	Thu Aug 08 18:11:17 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -23,11 +23,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim - "
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr ""
 
@@ -40,17 +40,16 @@
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr ""
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr ""
 
@@ -74,7 +73,6 @@
 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 +91,7 @@
 msgid "Change"
 msgstr ":"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr ""
 
@@ -101,8 +99,8 @@
 msgid "Available for friends only"
 msgstr "   "
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr ""
 
@@ -118,7 +116,7 @@
 msgid "Invisible for friends only"
 msgstr "   "
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr ""
 
@@ -152,7 +150,7 @@
 msgid "Unknown Error Code."
 msgstr "  "
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -278,8 +276,7 @@
 msgid "Sex"
 msgstr ""
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr ""
 
@@ -358,12 +355,9 @@
 msgid "Directory Search"
 msgstr " "
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: 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
 msgid "Change Password"
 msgstr " "
 
@@ -384,7 +378,7 @@
 msgstr "   "
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr " "
@@ -450,7 +444,7 @@
 msgid "Channel:"
 msgstr ":"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr ""
 
@@ -458,48 +452,48 @@
 msgid "DCC Chat"
 msgstr "DCC "
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
 msgid "Password Change Error!"
 msgstr "Gaim -  "
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 #, fuzzy
 msgid "Unknown"
 msgstr " ICQ"
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr " \"\""
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -507,200 +501,210 @@
 "\n"
 "   ?"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 #, fuzzy
 msgid "No such user"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
+#: src/protocols/jabber/jabber.c:2681
 #, fuzzy
 msgid "Jabber Error"
 msgstr " "
 
-#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim -  "
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "."
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "  "
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 #, fuzzy
 msgid "Invalid Jabber I.D."
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr " "
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr " "
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr " "
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr ""
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "e-mail"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr " "
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "   .   ."
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim -  Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr " !"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "   "
 
@@ -869,8 +873,8 @@
 msgstr "  "
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -878,106 +882,106 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim   "
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "      ."
 
-#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "    ."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "   "
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "    ."
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "(UIN)"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "UIN"
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "  "
@@ -1055,17 +1059,14 @@
 msgid "Connection established, cookie sent"
 msgstr " ,  "
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "    ."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "   ."
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1075,7 +1076,6 @@
 "  .         "
 "."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "     ."
@@ -1088,7 +1088,7 @@
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "   %s "
@@ -1182,9 +1182,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "   %d   %s   ."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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 - "
 
@@ -1221,68 +1221,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "   %s : %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr " "
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "IM "
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr " "
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr " "
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "  "
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "EvryBuddy Bug"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr ""
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr " ICQ Server'"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr " ICQ"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr " Trillian"
 
@@ -1342,35 +1342,35 @@
 "   ,  .  10   "
 "  ."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 #, fuzzy
 msgid "Gaim - Warning"
 msgstr "  ?"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "   "
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1380,30 +1380,30 @@
 "      %s.     IP "
 ",      .   ?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "   "
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr " "
 
@@ -1549,7 +1549,7 @@
 msgid "Password Change Successful"
 msgstr "  "
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim -  "
 
@@ -1689,14 +1689,11 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr " "
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr " "
 
@@ -1704,7 +1701,7 @@
 msgid "Please enter your logon"
 msgstr ",   "
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr " "
 
@@ -1720,11 +1717,11 @@
 msgid "Password: "
 msgstr ""
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr ""
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr " "
 
@@ -1736,19 +1733,19 @@
 msgid "About"
 msgstr " ..."
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr ""
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr ""
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr " "
@@ -1802,74 +1799,73 @@
 msgid "Set All Away"
 msgstr "  \"\""
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr ""
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr " "
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr ""
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr " "
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr ""
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr ": %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1880,127 +1876,131 @@
 " : %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr " "
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s  "
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s "
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "  "
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr " "
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr ""
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "!"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr ""
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr " "
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "  "
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr " "
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "  "
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "  "
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr ""
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr ""
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "  "
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr " "
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "  "
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr " "
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr " "
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr "  "
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr " "
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr " "
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "  "
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "  "
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "  /"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr " "
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - C "
 
@@ -2012,13 +2012,13 @@
 msgid "Join Chat As:"
 msgstr "   :"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr ""
 
@@ -2026,16 +2026,16 @@
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "(UIN)"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr ""
 
@@ -2043,68 +2043,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim -    "
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr ""
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s   "
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s    "
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s  %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s    (%s)"
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s   "
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - "
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr ""
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "0    "
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr ""
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr ""
 
@@ -2138,187 +2137,187 @@
 msgid "Setting position to %d\n"
 msgstr "   %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr ""
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr ""
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr ""
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr ""
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr ""
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr " "
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr " "
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "   "
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr " "
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr ""
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr " "
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr ""
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr " "
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr " "
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr " "
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr " "
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr ""
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr " IM "
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr " "
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr " "
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "  :"
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim -  "
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr " "
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr " "
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr " "
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "  ..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "  ?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "    %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr " ?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "   ."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr " '%s'   .\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim -  %s?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr " "
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2327,362 +2326,382 @@
 "  '%s' \n"
 "  ?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr ""
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - "
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr " (UIN):"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "(UIN):"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr "a "
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "  "
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr " "
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr " "
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "UIN"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr " "
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - !"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "  :"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "   "
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "   "
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr " "
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "   "
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "    ' '"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "' '"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr " "
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr ""
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim -  "
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "a "
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr " "
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "  "
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "  "
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "  "
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "   "
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "  "
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "  "
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr " "
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr " "
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "   "
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "   "
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "  "
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr " "
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "   web    ."
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr ""
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr ""
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr ""
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr " "
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "/"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr " "
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "  "
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr " "
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr " "
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "  ( )"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr " "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr ""
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr " "
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim -   Email"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "  "
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr ":"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim -   "
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "      "
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "     "
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "  "
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr " "
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - "
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "   %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "  ?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr ""
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr " "
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr " (UIN):"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr " "
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim -   Perl"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "     %s."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr " "
 
@@ -2712,7 +2731,7 @@
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr ""
 
@@ -2753,7 +2772,18 @@
 msgid "Enter Password"
 msgstr " "
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2762,44 +2792,40 @@
 "    ,\n"
 "     ."
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr " "
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "   %s?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim -  "
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr " "
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr ""
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr ""
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "/"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2808,21 +2834,21 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s  "
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s "
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr " "
 
@@ -2830,558 +2856,361 @@
 msgid "Perl Scripts"
 msgstr "Perl "
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim -  "
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - "
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr " "
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr " "
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr ""
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr ""
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "   "
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr ""
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "  "
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr ""
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "  "
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr ""
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "  "
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr " "
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr " "
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "   ,    ."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr ""
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr " "
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr " "
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "  "
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "     "
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "   "
-
-#: src/prefs.c:248
-msgid "None"
-msgstr ""
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr " Gaim"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr " X"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "  "
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr " HTML     "
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr " / "
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "  /"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr " -  /"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "    //"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "  "
+#, fuzzy
+msgid "Windows"
+msgstr " "
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr ""
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
+msgid "Show Buddy Ticker"
+msgstr " "
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "  "
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "/"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr " "
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr " "
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr ""
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr " "
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr ""
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "    "
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME URL Handler"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr ""
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr " Proxy"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"       .\n"
-"  README     ."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr " Proxy"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Proxy "
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr " "
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr " "
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr " "
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "  "
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "  "
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr " URL  "
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr " "
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr " "
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "  "
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "  "
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr ""
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr ""
-
-#: src/prefs.c:496
-msgid "User"
-msgstr ""
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr ""
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "  "
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "  "
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr " :"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr ""
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr ""
-
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr " "
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "     "
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "    "
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr " / "
-
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "   "
-
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr ""
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "   (  Ofline)"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "  "
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr ""
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "  "
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "  "
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "  "
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr " "
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr " "
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr " "
-
-#: src/prefs.c:683
+msgid "Ignore TiK Automated Messages"
+msgstr "  "
+
+#: src/prefs.c:459
 msgid "Enter sends message"
 msgstr "Enter  "
 
-#: src/prefs.c:684
+#: src/prefs.c:460
 msgid "Control-Enter sends message"
 msgstr "Ctrl-Enter  "
 
-#: src/prefs.c:685
+#: src/prefs.c:469
 msgid "Escape closes window"
 msgstr "Esc  "
 
-#: src/prefs.c:686
+#: src/prefs.c:470
 #, fuzzy
 msgid "Control-W closes window"
 msgstr "Esc  "
 
-#: src/prefs.c:692
+#: src/prefs.c:480
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S}   HTML "
 
-#: src/prefs.c:693
+#: src/prefs.c:481
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl-()  "
 
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "        F2"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "   "
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "  "
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "  "
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr " URL  "
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr " "
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "      "
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr ""
-"   \n"
-" "
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr " "
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "  "
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "  "
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "  "
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr ""
-"     \n"
-""
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr " "
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr " "
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "  :"
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "  "
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr ""
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr ""
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "      c "
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "     "
-
-#: src/prefs.c:967 src/prefs.c:1119
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr " "
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "   "
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "     "
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "    "
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr " / "
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "-   "
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "   (  Ofline)"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "  "
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "  "
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "  "
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "  "
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr " "
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "  "
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "  "
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "  "
+
+#: src/prefs.c:571 src/prefs.c:633
 msgid "Raise windows on events"
 msgstr "-   "
 
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr " "
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "   "
-
-#: src/prefs.c:970
+#: src/prefs.c:572
 msgid "Hide window on send"
 msgstr "   "
 
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr " "
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "  "
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "  "
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "  "
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "  "
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr ""
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr ""
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr " "
-
-#: src/prefs.c:1031
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "  "
 
-#: src/prefs.c:1037
+#: src/prefs.c:582
 msgid "Disable Buddy Icon Animation"
 msgstr " "
 
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr " "
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr " "
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr "       "
-
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "     "
-
-#: src/prefs.c:1120
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr " "
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "     "
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "Tab -  "
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "  "
+
+#: src/prefs.c:652
 msgid "Show people joining/leaving in window"
 msgstr " /   "
 
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr " "
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "Tab -  "
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "  "
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr ""
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr " "
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr ""
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr " "
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr " "
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim -  "
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr ""
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr ""
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr " "
-
-#: src/prefs.c:1649
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "       "
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "   "
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "       "
+
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "     "
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Proxy "
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr ""
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr ""
+
+#: src/prefs.c:801
+msgid "User"
+msgstr ""
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr ""
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "    "
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "  "
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr " HTML     "
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr " / "
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "  /"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr " -  /"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "    //"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "  "
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "   "
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "   "
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr " "
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3390,106 +3219,129 @@
 "  \n"
 "(%s    )"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr " :"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "  (Away)"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "      "
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr ""
+"   \n"
+" "
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr ""
+"     \n"
+""
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "  "
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "  "
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "    ( ):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr " Away "
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr " "
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr ""
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim -  "
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr ""
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr ""
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr ""
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr ""
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr " "
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "  :"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "   "
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "   "
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr " "
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "   "
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "    ' '"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "' '"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr ":"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr ""
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr ""
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr " "
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr " "
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr ""
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr ""
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr ""
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr ""
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr ""
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "  (Away)"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "  Gaim"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr ""
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr ""
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr ""
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr ""
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr ""
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3505,37 +3357,50 @@
 msgid "Protocol Error"
 msgstr " "
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr ""
+
+#: src/prpl.c:101
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s  %s,  . %s ."
 
-#: src/prpl.c:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr " "
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - "
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim -  "
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr " "
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 #, fuzzy
 msgid ""
 "\n"
@@ -3546,21 +3411,21 @@
 "\n"
 "   ?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "      ."
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - "
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr ""
 
@@ -3568,28 +3433,28 @@
 msgid "Please enter your password"
 msgstr ",  "
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d )"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 )"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr ""
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr ""
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr " "
 
@@ -3637,6 +3502,184 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "General Options"
+#~ msgstr " "
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr "   ,    ."
+
+#~ msgid "Miscellaneous"
+#~ msgstr ""
+
+#~ msgid "Report Idle Times"
+#~ msgstr "   "
+
+#~ msgid "None"
+#~ msgstr ""
+
+#~ msgid "Gaim Use"
+#~ msgstr " Gaim"
+
+#~ msgid "X Use"
+#~ msgstr " X"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URL Handler"
+
+#~ msgid "Galeon"
+#~ msgstr ""
+
+#~ msgid "Proxy Options"
+#~ msgstr " Proxy"
+
+#~ msgid ""
+#~ "Not all protocols can use these proxy options. Please see the README file "
+#~ "for details."
+#~ msgstr ""
+#~ "       .\n"
+#~ "  README     ."
+
+#~ msgid "Proxy Type"
+#~ msgstr " Proxy"
+
+#~ msgid "No Proxy"
+#~ msgstr " "
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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 " "
+
+#~ msgid "Keyboard Options"
+#~ msgstr " "
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "        F2"
+
+#~ msgid "Display and General Options"
+#~ msgstr "   "
+
+#~ msgid "IM Options"
+#~ msgstr " "
+
+#~ msgid "Show buttons as: "
+#~ msgstr "  :"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "  "
+
+#~ msgid "Pictures"
+#~ msgstr ""
+
+#~ msgid "Text"
+#~ msgstr ""
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "      c "
+
+#~ msgid "Window Sizes"
+#~ msgstr " "
+
+#~ msgid "Tab Placement"
+#~ msgstr "  "
+
+#~ msgid "Left"
+#~ msgstr ""
+
+#~ msgid "Right"
+#~ msgstr ""
+
+#~ msgid "Buddy Icons"
+#~ msgstr " "
+
+#~ msgid "Chat Options"
+#~ msgstr " "
+
+#~ msgid "Show conversations in the same tabbed window"
+#~ msgstr "     "
+
+#~ msgid "Tab Completion"
+#~ msgstr " "
+
+#~ msgid "Font Options"
+#~ msgstr ""
+
+#~ msgid "Italic Text"
+#~ msgstr " "
+
+#~ msgid "Font Face for Text"
+#~ msgstr " "
+
+#~ msgid "Font Size for Text"
+#~ msgstr " "
+
+#~ msgid "Sound Options"
+#~ msgstr " "
+
+#~ msgid "Sound method"
+#~ msgstr " "
+
+#~ msgid "Sound played when:"
+#~ msgstr " :"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "    ( ):"
+
+#~ msgid "Auto Away after"
+#~ msgstr " Away "
+
+#~ msgid "minutes using"
+#~ msgstr " "
+
+#~ msgid "Messages"
+#~ msgstr ""
+
+#~ msgid "Make Away"
+#~ msgstr ""
+
+#~ msgid "Privacy Options"
+#~ msgstr " "
+
+#~ msgid "General"
+#~ msgstr ""
+
+#~ msgid "Conversations"
+#~ msgstr ""
+
 #~ msgid "Enable sounds"
 #~ msgstr " "
 
--- a/po/sk.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/sk.po	Thu Aug 08 18:11:17 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -23,11 +23,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Zatvori"
 
@@ -40,17 +40,16 @@
 msgid "Refresh"
 msgstr ""
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "Prida"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "Zrui"
 
@@ -74,7 +73,6 @@
 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 +91,7 @@
 msgid "Change"
 msgstr "Kanl:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Prtomn"
 
@@ -101,8 +99,8 @@
 msgid "Available for friends only"
 msgstr "Prtomn iba pre priateov"
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Pre"
 
@@ -118,7 +116,7 @@
 msgid "Invisible for friends only"
 msgstr "Neviditen iba pre priateov"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "Nedostupn"
 
@@ -152,7 +150,7 @@
 msgid "Unknown Error Code."
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
@@ -282,8 +280,7 @@
 msgid "Sex"
 msgstr "Pohlavie"
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Mesto"
 
@@ -362,12 +359,9 @@
 msgid "Directory Search"
 msgstr "Vyhladvanie v prieinku"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: src/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
 msgid "Change Password"
 msgstr "Zmeni heslo"
 
@@ -390,7 +384,7 @@
 msgstr "Poli sprvu cez server"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Zskaj Info"
@@ -456,7 +450,7 @@
 msgid "Channel:"
 msgstr "Kanl:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -465,47 +459,47 @@
 msgid "DCC Chat"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: 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:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr ""
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "Pripojen"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -513,215 +507,225 @@
 "\n"
 "elte si prida ich do Vho zoznamu kamartov?"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 #, fuzzy
 msgid "No such user"
 msgstr "iaden server"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: 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/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Kamarti"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autentifikcia preruen"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 #, fuzzy
 msgid "Unknown login error"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Heslo bolo spene zmenen"
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim - Zmena hesla"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 #, fuzzy
 msgid "Connection lost"
 msgstr "Spojenie ukonen"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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 "Nemem sa pripoji."
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 #, fuzzy
 msgid "Connected"
 msgstr "Odpojen."
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "Autentifikcia preruen"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 #, fuzzy
 msgid "Connecting"
 msgstr "Spojenie ukonen"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 #, fuzzy
 msgid "Invalid Jabber I.D."
 msgstr "Nesprvne meno"
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Miestnos:"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Pozrie zznam"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "Zobrazi notifikciu"
+
+#: src/protocols/jabber/jabber.c:3281
 #, fuzzy
 msgid "Full Name"
 msgstr "Prv meno"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 #, fuzzy
 msgid "Family Name"
 msgstr "Prv meno"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 #, fuzzy
 msgid "Given Name"
 msgstr "Druh meno"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 #, fuzzy
 msgid "Nickname"
 msgstr "Prezvka"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 #, fuzzy
 msgid "Locality"
 msgstr "ZLocate"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr ""
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Krajina"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 #, fuzzy
 msgid "Telephone"
 msgstr "Vybrat iaden"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Nzov"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 #, fuzzy
 msgid "Role"
 msgstr "Zrui"
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 #, fuzzy
 msgid "Birthday"
 msgstr "Rok narodenia"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Popis"
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 #, fuzzy
 msgid "Set User Info"
 msgstr "Zska informcie o uvateovi"
@@ -890,8 +894,8 @@
 msgstr "Neznmy chybov kd."
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -899,107 +903,107 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim neme posla sprvu"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 #, 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:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Chyba pri tan zo socketu."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Nemem ta sbor %s."
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "Heslo: "
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Nemem sa pripoji na server."
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "Pripjam sa na GG server"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "Kamart"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "Skry ikonu"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Druh meno"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Meno obrazovky: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 msgid "Invalid name"
 msgstr "Nesprvne meno"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Ktor skupinu pripoji:"
@@ -1077,17 +1081,14 @@
 msgid "Connection established, cookie sent"
 msgstr "Spojenie vytvoren, poslan cookie"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Nesprvne heslo alebo prezvka."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr ""
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1096,7 +1097,6 @@
 "Pripjali a odpjali ste sa vemi asto. Pokajte 10 mint, potom skste "
 "znova. Ak budete pokraova v pripjan, budete aka dlhie."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Verzia klienta ktor pouvate je velmi star. Naintalujte si nov na"
@@ -1109,7 +1109,7 @@
 msgid "Internal Error"
 msgstr "Vntorn chyba"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Priame IM spojenie s %s vytvoren"
@@ -1201,9 +1201,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Stratili ste %d sprv%s z %s z neznmych dvodov."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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"
 
@@ -1241,70 +1241,70 @@
 msgid "User information for %s unavailable: %s"
 msgstr "Informcie o pouvateovi %s su neprstupn: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "Kamartova ikona"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "Hlas"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Zska sbor"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Posla sbor"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Hry"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "Zoznam kamartov"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 #, fuzzy
 msgid "AP User"
 msgstr "Pouvate"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr ""
 
@@ -1363,35 +1363,35 @@
 "wait 10 seconds and try again."
 msgstr ""
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 #, fuzzy
 msgid "Gaim - Warning"
 msgstr "Gaim - Prihlsenie"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vmena:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Nemem otvori Priame IM spojenie"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1402,30 +1402,30 @@
 "pouvateom vidie Vau IP adresu, moe to by bezpenostn riziko. elte "
 "si pokraova"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Stav: %s"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "Priame IM"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr ""
 
@@ -1570,7 +1570,7 @@
 msgid "Password Change Successful"
 msgstr "Heslo bolo spene zmenen"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Zmena hesla"
 
@@ -1687,14 +1687,11 @@
 "Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Internetov strnka"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Odhlsi"
 
@@ -1702,7 +1699,7 @@
 msgid "Please enter your logon"
 msgstr ""
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Chyba pri prihlasovan"
 
@@ -1718,11 +1715,11 @@
 msgid "Password: "
 msgstr "Heslo: "
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Odchod"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "Kont"
 
@@ -1735,19 +1732,19 @@
 msgid "About"
 msgstr "O aplikcii Gaim"
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "Voby"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr ""
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "Aotomatick prihlasovanie sa"
@@ -1801,74 +1798,73 @@
 msgid "Set All Away"
 msgstr "Nastav vetko na 'Pre'"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Skupina"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Info"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Pozrie zznam"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Premenova"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Zrui alias"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr ""
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Pihlsen v: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Vstrahy: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1879,127 +1875,131 @@
 "Meno obrazovky: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr ""
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s prihlsen."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s odhlsen."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Informcie o vybratom kamartovi"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr ""
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Zaa/Pripoji sa k chatu s kamartom"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Aktivuj 'Pre' sprvu"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Sbor"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Prida kamarta"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "Pripoji sa k chatu"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr ""
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Zska informcie o uvateovi"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Importuj zoznam kamartov"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Nstroje"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Akcie protokolu"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Skromie"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Pozrie systmov zznam"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Nahra skript"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Zrui vetky skripty"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Zoznam scriptov"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr "Pripojen"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr "Zobraz ladiace okno"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "O aplikcii Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Zoznam kamartov"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Prida novho kamarta"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Prida nov skupinu"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Vymaza vybratho kamarta/skupinu"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Editova kamartov"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Zoznam kamartov"
 
@@ -2011,13 +2011,13 @@
 msgid "Join Chat As:"
 msgstr "Pripoji sa k chatu ako:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Zrui"
 
@@ -2025,16 +2025,16 @@
 msgid "Join"
 msgstr "Pripoji"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Pozva"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Kamart"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Sprva"
 
@@ -2042,68 +2042,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Pozva kamarta do chatovacej miestnosti"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Od-ignorova"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "Ignorova"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s v miestnosti"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s vstpil do miestnosti."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je teraz znmy ako %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, fuzzy, c-format
 msgid "%s left the room (%s)."
 msgstr "%s opustil miestnos."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s opustil miestnos."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Skupinov chaty"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "Tma:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "0 ud v miestnosti"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr ""
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Posla"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Blokova"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Varova"
 
@@ -2138,552 +2137,572 @@
 msgid "Setting position to %d\n"
 msgstr "Nastavi pozciu na %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Tun text"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Tun"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr ""
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Kurzva"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Podiarknut text"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Podiarknut"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Preiarknut text"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Preiarknut"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Zmeni vekos fontu"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Mal"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Normlna vekos fontu"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normlny"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "Zvi vekost fontu"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Vek"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Vybra font"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Font"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Farba textu"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Farba"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Farba pozadia"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Vloi odkaz"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Odkaz"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Vloi smajlka"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Smajlk"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Vloi smajlka"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Povoli zaznamenvanie"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Zanamenvanie"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Uloi konverzciu"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Uloi"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konverzcie"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Posla sprvu ako: "
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Uloi ikonu"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Nepovoli animcie"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Povoli animcie"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Skry ikonu"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Uloi ikonu ako..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr ""
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr ""
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr ""
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr ""
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Maem '%s' zo zoznamu kamaratov.\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, fuzzy, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Premenova skupinu"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 #, fuzzy
 msgid "Remove Buddy"
 msgstr "Premenova kamarta"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Akceptova"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - IM pouvate"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr ""
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Pouvate:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr "Konto"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Zska informcie o pouvatelovi"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Prida skupinu"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Prida skupinu"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Prida kamarta"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Prida kamarta"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Kontakt"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Prida k"
 
-#: src/dialogs.c:1134
-msgid "Please enter a buddy to pounce."
-msgstr ""
-
-#: src/dialogs.c:1134
-msgid "Buddy Pounce Error"
-msgstr ""
-
-#: src/dialogs.c:1270
-msgid "Gaim - New Buddy Pounce"
-msgstr ""
-
-#. <pounce type="who">
-#: src/dialogs.c:1281
-msgid "Pounce Who"
-msgstr ""
-
-#: src/dialogs.c:1292
-msgid "Account"
-msgstr "Konto"
-
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
-msgid "Pounce When"
-msgstr ""
-
-#: src/dialogs.c:1328
-msgid "Pounce on sign on"
-msgstr ""
-
-#: src/dialogs.c:1337
-msgid "Pounce on return from away"
-msgstr ""
-
-#: src/dialogs.c:1346
-msgid "Pounce on return from idle"
-msgstr ""
-
-#: src/dialogs.c:1355
+#: src/dialogs.c:1417
 #, fuzzy
-msgid "Pounce when buddy is typing to you"
-msgstr "Zvuk ke sa kamart prihlsi"
-
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
-msgid "Pounce Action"
-msgstr ""
-
-#: src/dialogs.c:1376
-msgid "Open IM Window"
-msgstr "Otvori IM okno"
-
-#: src/dialogs.c:1385
-msgid "Popup Notification"
-msgstr "Zobrazi notifikciu"
-
-#: src/dialogs.c:1394
-msgid "Send Message"
-msgstr "Posla sprvu"
-
-#: src/dialogs.c:1415
-msgid "Execute command on pounce"
+msgid "Gaim - Privacy"
+msgstr "Skromie"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
 msgstr ""
 
 #: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Nastav bezpenos pre:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Povo vetkm povateom kontaktova ma"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Povo iba niie uvedench pouvateov"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Zoznam povolench"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Odmietnu vetkch pouvateov"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Blokova niie uvedench pouvateov"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Zoznam blokovanch"
+
+#: src/dialogs.c:1546
+msgid "Please enter a buddy to pounce."
+msgstr ""
+
+#: src/dialogs.c:1546
+msgid "Buddy Pounce Error"
+msgstr ""
+
+#: src/dialogs.c:1682
+msgid "Gaim - New Buddy Pounce"
+msgstr ""
+
+#: src/dialogs.c:1693
+msgid "Pounce Who"
+msgstr ""
+
+#: src/dialogs.c:1704
+msgid "Account"
+msgstr "Konto"
+
+#: src/dialogs.c:1730
+msgid "Pounce When"
+msgstr ""
+
+#: src/dialogs.c:1740
+msgid "Pounce on sign on"
+msgstr ""
+
+#: src/dialogs.c:1749
+msgid "Pounce on return from away"
+msgstr ""
+
+#: src/dialogs.c:1758
+msgid "Pounce on return from idle"
+msgstr ""
+
+#: src/dialogs.c:1767
+#, fuzzy
+msgid "Pounce when buddy is typing to you"
+msgstr "Zvuk ke sa kamart prihlsi"
+
+#: src/dialogs.c:1777
+msgid "Pounce Action"
+msgstr ""
+
+#: src/dialogs.c:1788
+msgid "Open IM Window"
+msgstr "Otvori IM okno"
+
+#: src/dialogs.c:1797
+msgid "Popup Notification"
+msgstr "Zobrazi notifikciu"
+
+#: src/dialogs.c:1806
+msgid "Send Message"
+msgstr "Posla sprvu"
+
+#: src/dialogs.c:1827
+msgid "Execute command on pounce"
+msgstr ""
+
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr ""
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr ""
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Povoli Internetovm vyhladvaom njs informcie o Vs"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Prv meno"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Druh meno"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Priezvisko"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr ""
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "tt"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr ""
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Chyba zmeny hesla"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Vyplte vetky polka"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Star heslo"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Nov heslo"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Nov heslo (znova)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Nastavi informcie o pouvateovi"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Niie s vsledky vyhadvania: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Povoli"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Zamietnu"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Prida povolenie"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Prida zkaz"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Zaznamenaj konverzciu"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Njs kamarta"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Njs kamarta poda informcie"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Njs kamarta poda emailu"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - Prida URL"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Veberte farbu textu"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Vyberte farbu pozadia"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importuj zoznam kamartov"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "Nemete vytvori 'Pre' sprvu s przdnym nzvom"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "Nemete vytvori przdnu 'Pre' sprvu"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - Nov 'Pre' sprva"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Nov 'Pre' sprva"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Nzov 'Pre': "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Poui"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Uloi a Poui"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "???"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Alias kamarta"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias kamarta"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Uloit zznamov sbor"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Nemem vymaza sbor %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Skutone vymaza zznamy?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Dtum"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Konverzcia"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Vyisti"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Premenova skupinu"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Premenova Skupinu"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Nov meno"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Premenova kamarta"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Premenova kamarta"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vyberte si Perlov skript"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nemem otvori konfiguran sbor %s."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Chyba ???"
 
@@ -2713,7 +2732,7 @@
 msgid "Browse"
 msgstr "Prehliada"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "Zrui"
 
@@ -2754,7 +2773,18 @@
 msgid "Enter Password"
 msgstr "Vlote heslo"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2762,70 +2792,66 @@
 "Nemoete sa prihlsi na toto konto, nemte nahran protokol, alebo protokol "
 "nem funkciu prihlsenia"
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "Chyba pri Prihlasovan"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste si, e chcete vymazat %s"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor knt"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Vybra Vetky"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr ""
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Vybrat iaden"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Zmeni"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Prihlsi/Odhlsi"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Zmaza"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s nebol schopn prihlsi sa do: %s"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 #, fuzzy
 msgid "Notice"
 msgstr "Hlas"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr ""
 "%s\n"
 "%s nebol schopn prihlsi sa do: %s"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 #, fuzzy
 msgid "Connection Error"
 msgstr "Spojenie ukonen"
@@ -2834,561 +2860,363 @@
 msgid "Perl Scripts"
 msgstr "Perlov skripty"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Zoznam pluginov"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Pluginy"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 #, fuzzy
 msgid "Loaded Plugins"
 msgstr "Gaim - Pluginy"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Vybra Vetky"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Cesta k sboru:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Nahra"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Nahraj plugin zo sboru"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Konfigurova"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Konfigurovat nastavenia zvolenho pluginu"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Znovu nahra"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Znovu nahra zvolen plugin"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Zrui"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Zrui zvolen plugin"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Zatvor toto okno"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Veobecn voby"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "Vetky voby sa ihne pouij, pokia nie je napsan inak."
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Rzne"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Poui tlatka bez okrajov"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr ""
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "Zobraz ladiace okno"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr ""
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Reportuj poet neinnost"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "iadne"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Gaim Poui"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr ""
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Zaznamena vsetky rozhovory"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "Zru HTML zo zznamov"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "Zaznamena ke sa kamarti prihlsia/odhlsia"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "Zaznamena ke sa kamarti stan neinnmi/innmi"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "Zaznamena ke kamarti oddu pre/vrtia sa"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "Zaznamena vlastn prihlsenia/neinnosti/odchody pre"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "Samostatn zznamov sbor pre kadho pripojenho kamarta"
+#, fuzzy
+msgid "Windows"
+msgstr "IM okno"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "Prehliada"
-
-#: src/prefs.c:291
-msgid "Konqueror"
+msgid "Show Buddy Ticker"
 msgstr ""
 
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
-msgstr ""
-
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "tandadne otvor nov okno"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:306
-msgid "Galeon"
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "Zobraz ladiace okno"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "tt"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Poui tlatka bez okrajov"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Preiarknut text"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Zrui"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Vloi smajlka"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Vybra"
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Voby proxy"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Nie vetky protokoly mou poui tieto voby proxy. Pozrite si,\n"
-"prosm, README sbor pre detaily."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Typ proxy"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Bez proxy"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Farba textu"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Farba pozadia"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Zobraz smajlkov graficky"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Zobraz asov znaku pri sprvach"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "Zobraz URL ako linky"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Zvrazni nesprvne psan slov"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "Ignoruj farby"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "Ignoruj vzhady fontu"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "Ignoruj vekosti fontu"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "Hostite"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Port"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "Pouvate"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "Heslo"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "Voby zoznamu kamratov"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "Okno zo zoznamom kamartov"
-
-#: src/prefs.c:569
+msgid "Ignore TiK Automated Messages"
+msgstr "Ignoruj TiK automatick sprvy"
+
+#: src/prefs.c:459
+msgid "Enter sends message"
+msgstr "Enter pole sprvu"
+
+#: src/prefs.c:460
+msgid "Control-Enter sends message"
+msgstr "Control-Enter pole sprvu"
+
+#: src/prefs.c:469
+msgid "Escape closes window"
+msgstr "Tlaidlo Escape zatvor okno"
+
+#: src/prefs.c:470
 #, fuzzy
-msgid "Tab Placement:"
-msgstr "Poloha zloky"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "Hore"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "Dole"
-
-#: src/prefs.c:586
+msgid "Control-W closes window"
+msgstr "Tlaidlo Escape zatvor okno"
+
+#: src/prefs.c:480
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "Control-{B/I/U/S} vlo HTML znaky"
+
+#: src/prefs.c:481
+msgid "Control-(number) inserts smileys"
+msgstr "Control-(slo) vlo smajlka"
+
+#: src/prefs.c:500
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Skry tlatka IM/Informcie/Chat"
 
-#: src/prefs.c:588
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "Zobraz obrzky na tlatkach"
+
+#: src/prefs.c:511
 msgid "Automatically show buddy list on sign on"
 msgstr "Automaticky zobraz zoznam kamartov pri prihlsen"
 
-#: src/prefs.c:590
+#: src/prefs.c:513
 msgid "Display Buddy List near applet"
 msgstr ""
 
-#: src/prefs.c:593
+#: src/prefs.c:516
 msgid "Save Window Size/Position"
 msgstr "Ulo vekost/pozciu okna"
 
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "Zobraz obrzky na tlatkach"
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Zvi okno pri udalostiach"
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "Skry skupiny so iadnymi propojenmi kamartmi"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "Zobraz sla v skupinch"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr ""
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr ""
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr ""
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "Vka novho okna:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "rka novho okna:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Vka vstupnho okienka:"
+
+#: src/prefs.c:571 src/prefs.c:633
+msgid "Raise windows on events"
+msgstr "Zvi okno pri udalostiach"
+
+#: src/prefs.c:572
+#, fuzzy
+msgid "Hide window on send"
+msgstr "Zvi okno pri udalostiach"
+
+#: src/prefs.c:581
+msgid "Hide Buddy Icons"
+msgstr "Skry ikony kamartov"
+
+#: src/prefs.c:582
+#, fuzzy
+msgid "Disable Buddy Icon Animation"
+msgstr "Nepovoli animcie"
+
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Zobraz prihlasovacie men v okne"
 
 #: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "Zobrazenia skupiny"
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "Skry skupiny so iadnymi propojenmi kamartmi"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "Zobraz sla v skupinch"
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr ""
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr ""
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr ""
-
-#: src/prefs.c:641
-msgid "Show idle times"
+msgid "Notify buddies that you are typing to them"
 msgstr ""
 
 #: src/prefs.c:642
-msgid "Grey idle buddies"
+msgid "Tab-Complete Nicks"
+msgstr ""
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
 msgstr ""
 
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "Voby konverzcie"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Voby klvesnice"
-
-#: src/prefs.c:683
-msgid "Enter sends message"
-msgstr "Enter pole sprvu"
-
-#: src/prefs.c:684
-msgid "Control-Enter sends message"
-msgstr "Control-Enter pole sprvu"
-
-#: src/prefs.c:685
-msgid "Escape closes window"
-msgstr "Tlaidlo Escape zatvor okno"
-
-#: src/prefs.c:686
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "Zobraz ud pripjajcich/odchdzajcich v okne"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Tlaidlo Escape zatvor okno"
-
-#: src/prefs.c:692
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} vlo HTML znaky"
-
-#: src/prefs.c:693
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(slo) vlo smajlka"
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Zobraz vetky chaty v jednom okne so zlokami"
+
+#: src/prefs.c:679
+msgid "Show aliases in tabs/titles"
+msgstr ""
 
 #: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr ""
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "Voby zobrazenia a veobecn voby"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "Zobraz smajlkov graficky"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "Zobraz asov znaku pri sprvach"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "Zobraz URL ako linky"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Zvrazni nesprvne psan slov"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "Posielanie sprv zru stav 'Pre'"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "Ke som 'Pre' nov sprvy zara do rady"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "Ignoruj farby"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "Ignoruj vzhady fontu"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "Ignoruj vekosti fontu"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignoruj TiK automatick sprvy"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "Ignoruj nov konverzciu ke ste 'Pre'"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "Voby IM"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "IM okno"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "Zobraz tlatka ako:"
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "Obrzky a text"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "Obrzky"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "Text"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "Zobraz vetky konverzcie v jednom okne so zlokami"
-
-#: src/prefs.c:960
-#, fuzzy
-msgid "Show chats in the same tabbed window"
-msgstr "Zobraz vetky chaty v jednom okne so zlokami"
-
-#: src/prefs.c:967 src/prefs.c:1119
-msgid "Raise windows on events"
-msgstr "Zvi okno pri udalostiach"
-
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "Zobraz prihlasovacie men v okne"
-
-#: src/prefs.c:969
-msgid "Show aliases in tabs/titles/ticker"
-msgstr ""
-
-#: src/prefs.c:970
-#, fuzzy
-msgid "Hide window on send"
-msgstr "Zvi okno pri udalostiach"
-
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "Vekosti okna"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "Vka novho okna:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "rka novho okna:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Vka vstupnho okienka:"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Poloha zloky"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "Vavo"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "Vpravo"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "Kamartova ikona"
-
-#: src/prefs.c:1031
-msgid "Hide Buddy Icons"
-msgstr "Skry ikony kamartov"
-
-#: src/prefs.c:1037
-#, fuzzy
-msgid "Disable Buddy Icon Animation"
-msgstr "Nepovoli animcie"
-
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "Voby chatu"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "Okno skupinovho chatu"
-
-#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Zobraz vetky chaty v jednom okne so zlokami"
 
-#: src/prefs.c:1112
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Zobraz vetky chaty v jednom okne so zlokami"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Proxy Server"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Hostite"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Port"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Pouvate"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Heslo"
+
+#: src/prefs.c:877
 #, fuzzy
-msgid "Show conversations in the same tabbed window"
-msgstr "Zobraz vetky konverzcie v jednom okne so zlokami"
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "Zobraz ud pripjajcich/odchdzajcich v okne"
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr ""
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr ""
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr ""
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "Voby fontov"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "Kurzva"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "Vybra"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "Vzhad fontu pre text"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "Vekos fontu pre text"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Nastavenie zvukov"
-
-#: src/prefs.c:1543
-#, fuzzy
-msgid "Test"
-msgstr "Text"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "Vyberte..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Zvuky Voby"
-
-#: src/prefs.c:1649
+msgid "Open new window by default"
+msgstr "tandadne otvor nov okno"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Zaznamena vsetky rozhovory"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "Zru HTML zo zznamov"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "Zaznamena ke sa kamarti prihlsia/odhlsia"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Zaznamena ke sa kamarti stan neinnmi/innmi"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Zaznamena ke kamarti oddu pre/vrtia sa"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Zaznamena vlastn prihlsenia/neinnosti/odchody pre"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "Samostatn zznamov sbor pre kadho pripojenho kamarta"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "Ziadne zvuky ke sa prihlsite"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Zvuky pokia ste 'Pre'"
 
-#: src/prefs.c:1665
-#, fuzzy
-msgid "Sound method"
-msgstr "Zvuky Voby"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, fuzzy, c-format
 msgid ""
 "Sound command\n"
@@ -3397,108 +3225,126 @@
 "Prkaz na prehrvanie zvukovch sborov\n"
 "(%s pre meno sboru; vntorn ak je przdny)"
 
-#: src/prefs.c:1751
-#, fuzzy
-msgid "Sound played when:"
-msgstr "Zvukov prehrva:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "'Pre' sprvy"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "Posielanie sprv zru stav 'Pre'"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "Ke som 'Pre' nov sprvy zara do rady"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "Ignoruj nov konverzciu ke ste 'Pre'"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "Neposla aotumatick odpove"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 #, fuzzy
 msgid "Only send auto-response when idle"
 msgstr "Neposla aotumatick odpove"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
+#: src/prefs.c:1081
+msgid "Set away when idle"
 msgstr ""
 
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "Automaticky 'Pre' po"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "mint pouva"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "Sprvy"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Nastavenie zvukov"
+
+#: src/prefs.c:1338
+#, fuzzy
+msgid "Test"
+msgstr "Text"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Vyberte..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Edituj"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Edituj"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "Urob 'Pre'"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Voba Skromie"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Nastav bezpenos pre:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "Povo vetkm povateom kontaktova ma"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "Povo iba niie uvedench pouvateov"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "Zoznam povolench"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "Odmietnu vetkch pouvateov"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "Blokova niie uvedench pouvateov"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "Zoznam blokovanch"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+msgid "Interface"
+msgstr ""
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Font"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Sprvy"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "IM okno"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Okno skupinovho chatu"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Prehliada"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Zvuky"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Udalosti"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Nzov 'Pre': "
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "'Pre' sprvy"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Nastavenia"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim vonkajie ladiace okno"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Hlavn"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "Konverzcie"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Zvuky"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Skromie"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3514,37 +3360,50 @@
 msgid "Protocol Error"
 msgstr "Chyba Protokolu"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Akcie protokolu"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Odpoji"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Akceptova?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr ""
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nov Pota"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "Otvori potu"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 #, fuzzy
 msgid ""
 "\n"
@@ -3555,22 +3414,22 @@
 "\n"
 "elte si prida ich do Vho zoznamu kamartov?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - Konverzcie"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 #, fuzzy
 msgid "Register"
 msgstr "Zrui"
@@ -3579,28 +3438,28 @@
 msgid "Please enter your password"
 msgstr "Zadajte, prosm, Vae heslo"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d sprv)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 sprva)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr ""
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "no"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "Nie"
 
-#: src/server.c:1076
+#: src/server.c:1101
 #, fuzzy
 msgid "More Info"
 msgstr "Zskaj Info"
@@ -3650,6 +3509,167 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "General Options"
+#~ msgstr "Veobecn voby"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr "Vetky voby sa ihne pouij, pokia nie je napsan inak."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Rzne"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Reportuj poet neinnost"
+
+#~ msgid "None"
+#~ msgstr "iadne"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Gaim Poui"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "Buddy List Options"
+#~ msgstr "Voby zoznamu kamratov"
+
+#~ msgid "Buddy List Window"
+#~ msgstr "Okno zo zoznamom kamartov"
+
+#, fuzzy
+#~ msgid "Tab Placement:"
+#~ msgstr "Poloha zloky"
+
+#~ msgid "Top"
+#~ msgstr "Hore"
+
+#~ msgid "Bottom"
+#~ msgstr "Dole"
+
+#~ msgid "Group Displays"
+#~ msgstr "Zobrazenia skupiny"
+
+#~ msgid "Conversation Options"
+#~ msgstr "Voby konverzcie"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Voby klvesnice"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Voby zobrazenia a veobecn voby"
+
+#~ msgid "IM Options"
+#~ msgstr "Voby IM"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Zobraz tlatka ako:"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Obrzky a text"
+
+#~ msgid "Pictures"
+#~ msgstr "Obrzky"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Zobraz vetky konverzcie v jednom okne so zlokami"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Vekosti okna"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Poloha zloky"
+
+#~ msgid "Left"
+#~ msgstr "Vavo"
+
+#~ msgid "Right"
+#~ msgstr "Vpravo"
+
+#~ msgid "Buddy Icons"
+#~ msgstr "Kamartova ikona"
+
+#~ msgid "Chat Options"
+#~ msgstr "Voby chatu"
+
+#, fuzzy
+#~ msgid "Show conversations in the same tabbed window"
+#~ msgstr "Zobraz vetky konverzcie v jednom okne so zlokami"
+
+#~ msgid "Font Options"
+#~ msgstr "Voby fontov"
+
+#~ msgid "Italic Text"
+#~ msgstr "Kurzva"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Vzhad fontu pre text"
+
+#~ 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:"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Automaticky 'Pre' po"
+
+#~ msgid "minutes using"
+#~ msgstr "mint pouva"
+
+#~ msgid "Messages"
+#~ msgstr "Sprvy"
+
+#~ msgid "Make Away"
+#~ msgstr "Urob 'Pre'"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Voba Skromie"
+
+#~ msgid "General"
+#~ msgstr "Hlavn"
+
+#~ msgid "Conversations"
+#~ msgstr "Konverzcie"
+
 #~ msgid "Enable sounds"
 #~ msgstr "Povoli zvuky"
 
@@ -3659,9 +3679,6 @@
 #~ msgid "Manual"
 #~ msgstr "Nvod"
 
-#~ msgid "Events"
-#~ msgstr "Udalosti"
-
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "Zvuk ke sa kamart prihlsi"
 
--- a/po/sv.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/sv.po	Thu Aug 08 18:11:17 2002 +0000
@@ -2,12 +2,12 @@
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001.
 #
-# $Id: sv.po 3362 2002-07-02 05:42:26Z robflynn $
+# $Id: sv.po 3407 2002-08-08 18:11:17Z chipx86 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -24,11 +24,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim-chatt"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "Stng"
 
@@ -40,17 +40,16 @@
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "Lgg till"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -74,7 +73,6 @@
 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:"
@@ -91,7 +89,7 @@
 msgid "Change"
 msgstr "ndra"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr "Tillgnglig"
 
@@ -99,8 +97,8 @@
 msgid "Available for friends only"
 msgstr "Tillgnglig endast fr vnner"
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "Frnvarande"
 
@@ -116,7 +114,7 @@
 msgid "Invisible for friends only"
 msgstr "Osynlig endast fr vnner"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr "Otillgnglig"
 
@@ -148,7 +146,7 @@
 msgid "Unknown Error Code."
 msgstr "Oknd felkod."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -274,8 +272,7 @@
 msgid "Sex"
 msgstr "Kn"
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "Ort"
 
@@ -349,12 +346,9 @@
 msgid "Directory Search"
 msgstr "Katalogskning"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: src/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
 msgid "Change Password"
 msgstr "Byt lsenord"
 
@@ -375,7 +369,7 @@
 msgstr "Skicka meddelande genom servern"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Hmta information"
@@ -441,7 +435,7 @@
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "Lsenord:"
 
@@ -449,216 +443,226 @@
 msgid "DCC Chat"
 msgstr "DCC-chatt"
 
-#: src/protocols/jabber/jabber.c:942
+#: 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:943 src/protocols/jabber/jabber.c:948
+#: 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:947
+#: 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:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr "Oknd"
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "Ansluten"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr "Utkad frnvaro"
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr "Str inte"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr "Fel %s: %s"
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 msgid "Unknown Error in presence"
 msgstr "Oknt fel i nrvaro"
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, 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:1632
+#: src/protocols/jabber/jabber.c:1655
 msgid "No such user"
 msgstr "Ingen sdan anvndare"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: 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/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Kompisar"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "Oknt inloggningsfel"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 msgid "Password successfully changed."
 msgstr "ndring av lsenord lyckades."
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 msgid "Password Change"
 msgstr "Lsenordsndring"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "Anslutningen tappades"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "Kan inte ansluta"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "Ansluten"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "Begr autentiseringsmetod"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: 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:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "Rum:"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr "Handtag:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "Chatt"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Visa logg"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Frnvaromeddelande"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "Visa notifiering"
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "Fullstndigt namn"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "Efternamn"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "Frnamn"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "Gatuadress"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "Utkad adress"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "E-post"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "Organisationsnamn"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "Organisationsenhet"
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr "Roll"
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "Fdelsedag"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -666,23 +670,23 @@
 "Alla poster nedan r valfria. Ange endast den information som du trivs med "
 "att lmna ut"
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr "Anvndaridentitet"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Redigera Jabber-vCard"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "Serverregistrering lyckades!"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "Oknt registreringsfel"
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "Stll in anvndarinformation"
 
@@ -851,8 +855,8 @@
 msgstr "Oknd felkod."
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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"
 
@@ -860,106 +864,106 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim kunde inte skicka ett meddelande"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Anvndaren %s vill lgga till dig i dennes kompislista."
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "Anvndaren %s vill lgga till dig i dennes kompislista."
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 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:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "Fel vid lsning frn uttag (socket)."
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Kan inte lsa frn uttag"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "Lsenord: "
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "Kan inte ansluta till servern."
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "Ansluter till GG-servern"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "Kompis"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "Dlj ikon"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "Efternamn"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Skrmnamn: "
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 msgid "Invalid name"
 msgstr "Ogiltigt namn"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "G in i vilken grupp:"
@@ -1037,17 +1041,14 @@
 msgid "Connection established, cookie sent"
 msgstr "Anslutning etablerad, kaka skickad"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Felaktigt smeknamn eller lsenord."
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Ditt konto r avstngt fr tillfllet."
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1056,7 +1057,6 @@
 "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."
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Versionen av klienten du anvnder r fr gammal. Uppgradera p "
@@ -1069,7 +1069,7 @@
 msgid "Internal Error"
 msgstr "Internt fel"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direktmeddelande med %s etablerat"
@@ -1167,9 +1167,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Du missade %d meddelanden frn %s p grund av oknda orsaker."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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"
 
@@ -1206,68 +1206,68 @@
 msgid "User information for %s unavailable: %s"
 msgstr "Anvndarinformation fr %s r inte tillgnglig: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "Kompisikon"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "Rst"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "Snabbmeddelandebild"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "Hmta fil"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "Skicka fil"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Spel"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "Aktier"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "Skicka kompislista"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy-fel"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr "AP-anvndare"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr "ICQ-RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "ICQ-serverrelay"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ICQ-oknd"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr "Trillansk kryptering"
 
@@ -1327,15 +1327,15 @@
 "Det senaste meddelandet skickades inte eftersom du r ver frekvensgrnsen. "
 "Vnta 10 sekunder och frsk igen."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1345,19 +1345,19 @@
 "har %d. Till dess att du r under grnsen kommer en del av dina kompisar "
 "inte att visas som online."
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 msgid "Gaim - Warning"
 msgstr "Gaim - Varning"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vxel:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "Kan inte ppna direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1368,7 +1368,7 @@
 "kommer att lta dem se din IP-adress, och kan vara en skerhetsrisk. Vill du "
 "fortstta?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1377,7 +1377,7 @@
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Fjrrklienten stder inte "
 "skickande av statusmeddelanden.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1386,15 +1386,15 @@
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Anvndaren har inga "
 "statusmeddelanden.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 msgid "Get Status Msg"
 msgstr "Hmta statusmeddelande"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "Direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "Hmta kapabiliteter"
 
@@ -1540,7 +1540,7 @@
 msgid "Password Change Successful"
 msgstr "Lsenordsndring lyckades"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - Lsenordsndring"
 
@@ -1678,14 +1678,11 @@
 "Eric Warmenhoven                      [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (ursprunglig frfattare) [ markster@marko.net ]"
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Webbplats"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "Logga ut"
 
@@ -1693,7 +1690,7 @@
 msgid "Please enter your logon"
 msgstr "Ange ditt inloggningsnamn"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "Inloggningsfel"
 
@@ -1709,11 +1706,11 @@
 msgid "Password: "
 msgstr "Lsenord: "
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "Konton"
 
@@ -1726,19 +1723,19 @@
 msgstr "Om"
 
 # src/menus.c:311
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "Alternativ"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "Instllningar"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "Logga in automatiskt"
@@ -1793,74 +1790,73 @@
 msgid "Set All Away"
 msgstr "Stll in alla frnvarande"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Grupp"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "Snabbmeddelande"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "Information"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "Lgg till kompisanfall"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "Visa logg"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "Byt namn"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "Avaliasera"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "Kompisanfall"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "Nytt kompisanfall"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "Ta bort kompisanfall"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[Klicka fr att redigera]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Inloggad: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Varningar: %d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Kapabiliteter: %s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1871,125 +1867,129 @@
 "Skrmnamn: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "Inaktivitet: "
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggade in."
 
-#: src/buddy.c:2424 src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggade ut."
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "Information om vald kompis"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "Skicka snabbmeddelande"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "Starta/g in i en kompischatt"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "Aktivera frnvaromeddelande"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "Arkiv"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "Lgg till en kompis"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "G in i en chatt"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "Nytt snabbmeddelande"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "Hmta anvndarinformation"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "Importera kompislista"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "Verktyg"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Protokolltgrder"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "Persondataskydd"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "Visa systemlogg"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "Ls in skript"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "Glm alla skript"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "Lista skript"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "Hjlp"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 msgid "Online Help"
 msgstr "Onlinehjlp"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 msgid "Debug Window"
 msgstr "Felskningsfnster"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "Kompislista"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "Lgg till en ny kompis"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "Lgg till en ny grupp"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "Ta bort vald kompis/grupp"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "Redigera kompisar"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Kompislista"
 
@@ -2001,13 +2001,13 @@
 msgid "Join Chat As:"
 msgstr "G in i chatt som:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -2015,17 +2015,17 @@
 msgid "Join"
 msgstr "Anslut"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "Bjud in"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "Kompis"
 
 # src/sidebar.c:103
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Meddelande"
 
@@ -2033,68 +2033,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Bjud in kompis till chattrum"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "Avignorera"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "Ignorera"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s i rummet"
 
-#: src/buddy_chat.c:941
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s kom in i rummet."
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s r nu knd som %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s lmnade rummet (%s)."
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s lmnade rummet."
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Gruppchatter"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "mne:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "0 personer i rummet"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Viska"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "Skicka"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "Blockera"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "Varna"
 
@@ -2128,188 +2127,188 @@
 msgid "Setting position to %d\n"
 msgstr "Stller in positionen till %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "Gr texten fet"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "Fet"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "Gr texten kursiv"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "Kursiv"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "Understryk text"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "Understrykning"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "Genomstryk text"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "Genomstrykning"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "Minska typsnittsstorleken"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "Liten"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "Normal typsnittsstorlek"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "ka typsnittsstorleken"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "Stor"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "Vlj typsnitt"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "Typsnitt"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "Textfrg"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "Frg"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "Bakgrundsfrg"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "Infoga lnk"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "Lnk"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Infoga smiley"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "Infoga snabbmeddelandebild"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr "Bild"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "Anvnd loggning"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "Loggning"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Spara konversation"
 
 # src/menus.c:280
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "Spara"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "Ljud"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konversationer"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Skicka meddelande som: "
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Spara ikon"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "Anvnd inte animering"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "Anvnd animation"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "Dlj ikon"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "Spara ikon som..."
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Varna anvndare?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Vill du verkligen varna %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "Varna anonymt?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyma varningar r mindre barska."
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Ta bort \"%s\" frn kompislistan.\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Ta bort %s?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "Ta bort kompis"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -2318,361 +2317,381 @@
 "Du hller p att ta bort \"%s\" frn\n"
 "din kompislista. Vill du fortstta?"
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "Acceptera"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - Snabbmeddelandeanvndare"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "Snabbmeddelande till vem:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "Anvndare:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 msgid "Account:"
 msgstr "Konto:"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Hmta anvndarinformation"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "Lgg till grupp"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - Lgg till grupp"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Lgg till kompis"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "Lgg till kompis"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "Kontakt"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "Lgg till i"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - Frnvarande!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "Stll in ostrdhet fr:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "Tillt alla anvndare att kontakta mig"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "Tillt endast anvndarna nedan"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "Tilltelselista"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "Neka alla anvndare"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "Blockera anvndarna nedan"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "Blockera lista"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "Ange en kompis att anfalla."
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "Kompisanfallsfel"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nytt kompisanfall"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "Anfall vem"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "Konto"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "Anfall nr"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Anfall vid inloggning"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Anfall vid terkomst frn frnvaro"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Anfall vid terkomst frn inaktivitet"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "Anfall d kompis skriver till dig"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "Anfallstgrd"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "ppna snabbmeddelandefnster"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "Visa notifiering"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "Skicka meddelande"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "Kr kommando vid anfall"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "Spela ljud vid anfall"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "Spara detta anfall efter aktivering"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Stll in kataloginformation"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "Kataloginformation"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Tillt webbtjnster att hitta din information"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "Frnamn"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "Andranamn"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "Efternamn"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "Flicknamn"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "Delstat"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "Nya lsenorden stmmer inte verens"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Fel vid lsenordsbyte"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "Fyll i alla flt helt"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "Gammalt lsenord"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "Nytt lsenord"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "Nytt lsenord (igen)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Stll in anvndarinformation"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Nedan r resultaten frn din skning: "
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "Tillt"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "Neka"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Lgg till tilltelse"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Lgg till nekan"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Logga konversation"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Sk efter kompis"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Sk kompis efter information"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Sk kompis efter e-post"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - Lgg till URL"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "Vlj textfrg"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "Vlj bakgrundsfrg"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "Importera till:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importera kompislista"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "Du kan inte skapa ett frnvaromeddelande med en tom titel"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "Kunde inte skapa ett tomt frnvaromeddelande"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - Nytt frnvaromeddelande"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "Nytt frnvaromeddelande"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "Frnvarotitel: "
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "Anvnd"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "Spara och anvnd"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Le!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "Aliaskompis"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Aliaskompis"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Spara loggfil"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Kan inte ta bort filen %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Vill du verkligen tmma loggen?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "Okej"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "Konversation"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "Tm"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Byt namn p gruppen"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "Byt namn p gruppen"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "Nytt namn:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Byt namn p kompis"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Byt namn p kompis"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vlj Perlskript"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunde inte ppna konfigurationsfilen %s."
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "Instllningsfel"
 
@@ -2701,7 +2720,7 @@
 msgid "Browse"
 msgstr "Blddra"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "terstll"
 
@@ -2741,7 +2760,18 @@
 msgid "Enter Password"
 msgstr "Ange lsenord"
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2749,44 +2779,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:949
-msgid "Login Error"
-msgstr "Inloggningsfel"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, 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:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Kontoredigerare"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "Markera alla"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "Markera automatiskt"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "Markera inga"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "Modifera"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "Logga in/ut"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
@@ -2795,21 +2821,21 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s kunde inte logga in"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "Meddelande"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s har kopplats frn"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr "Anslutningsfel"
 
@@ -2817,554 +2843,360 @@
 msgid "Perl Scripts"
 msgstr "Perlskript"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista ver insticksmoduler"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - Insticksmoduler"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Inlsta insticksmoduler"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "Markera alla"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "Filskvg:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "Ls in"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "Ls in en insticksmodul frn en fil"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "Konfigurera instllningar fr den valda insticksmodulen"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "Ls om"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "Ls om den markerade insticksmodulen"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "Glm"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "Glm den valda insticksmodulen"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "Stng detta fnster"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "Allmnna instllningar"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "Alla ndringar brjar glla omedelbart svida inte annat anges."
-
-# src/prefs.c:111
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "Diverse"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "Anvnd ramlsa knappar"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "Visa kompistickare"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "Visa felskningsfnster"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "Meddela kompisar att du skriver till dem"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "Rapportera inaktivitetstider"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "Ingen"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Gaim-anvndning"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "X-anvndning"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "Logga alla konversationer"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "Ta bort HTML frn loggar"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "Logga d kompisar loggar in/ut"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "Logga d kompisar blir inaktiva/kommer tillbaka frn inaktivitet"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "Logga d kompisar blir frnvarande/kommer tillbaka"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "Logga dina egna inloggningar/inaktivitet/frnvarande"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "Individuell loggfil fr varje kompis inloggning"
+#, fuzzy
+msgid "Windows"
+msgstr "Snabbmeddelandefnster"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "Webblsare"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
+msgid "Show Buddy Ticker"
+msgstr "Visa kompistickare"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "Visa felskningsfnster"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "Delstat"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "Anvnd ramlsa knappar"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "Genomstryk text"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "Avbryt"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Infoga smiley"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "Markera"
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "Visa nytt fnster som standard"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME:s URL-hanterare"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "Proxyalternativ"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr ""
-"Inte alla protokoll kan anvnda dessa proxyalternativ. Se filen README fr "
-"detaljer."
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "Proxytyp"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "Proxyserver"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "Ingen proxy"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "Textfrg"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "Bakgrundsfrg"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "Visa grafiska smileys"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Visa tidsstmpel p meddelanden"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "Visa URL:er som lnkar"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "Markera felstavade ord"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "Ignorera frger"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "Ignorera typsnittsvarianter"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "Ignorera typsnittsstorlekar"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "Vrd"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "Port"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "Anvndare"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "Lsenord"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "Alternativ fr kompislista"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "Kompislistefnster"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr "Flikplacering:"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "verst"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "Nederst"
-
-#: src/prefs.c:586
+msgid "Ignore TiK Automated Messages"
+msgstr "Ignorera automatiserade TiK-meddelanden"
+
+#: src/prefs.c:459
+msgid "Enter sends message"
+msgstr "Retur skickar meddelande"
+
+#: src/prefs.c:460
+msgid "Control-Enter sends message"
+msgstr "Control-Retur skickar meddelande"
+
+#: src/prefs.c:469
+msgid "Escape closes window"
+msgstr "Escape stnger fnster"
+
+#: src/prefs.c:470
+msgid "Control-W closes window"
+msgstr "Control-W stnger fnster"
+
+#: src/prefs.c:480
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "Control-{B/I/U/S} infogar HTML-taggar"
+
+#: src/prefs.c:481
+msgid "Control-(number) inserts smileys"
+msgstr "Control-(nummer) infogar smileys"
+
+#: src/prefs.c:500
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Dlj snabbmeddelande-/info-/chattknappar"
 
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "Visa automatiskt kompislista vid inloggning"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "Visa kompislista nra panelprogrammet"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "Spara fnsterstorlek/position"
-
-#: src/prefs.c:596
+#: src/prefs.c:501
 msgid "Show pictures on buttons"
 msgstr "Visa bilder p knappar"
 
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr "Hj kompislista vid inloggningar och utloggningar"
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "Gruppvisningar"
-
-#: src/prefs.c:614
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "Visa automatiskt kompislista vid inloggning"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "Visa kompislista nra panelprogrammet"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "Spara fnsterstorlek/position"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "Hj fnster vid hndelser"
+
+#: src/prefs.c:526
 msgid "Hide groups with no online buddies"
 msgstr "Dlj grupper med inga anslutna kompisar"
 
-#: src/prefs.c:620
+#: src/prefs.c:527
 msgid "Show numbers in groups"
 msgstr "Visa nummer i grupper"
 
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "Kompisvisningar"
-
-#: src/prefs.c:634
+#: src/prefs.c:536
 msgid "Show buddy type icons"
 msgstr "Visa kompistypikoner"
 
-#: src/prefs.c:635
+#: src/prefs.c:537
 msgid "Show warning levels"
 msgstr "Visa varningsniver"
 
-#: src/prefs.c:641
+#: src/prefs.c:538
 msgid "Show idle times"
 msgstr "Visa inaktivitetstider"
 
-#: src/prefs.c:642
+#: src/prefs.c:539
 msgid "Grey idle buddies"
 msgstr "Frga inaktiva kompisar gra"
 
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "Konversationsalternativ"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "Tangentbordsalternativ"
-
-#: src/prefs.c:683
-msgid "Enter sends message"
-msgstr "Retur skickar meddelande"
-
-#: src/prefs.c:684
-msgid "Control-Enter sends message"
-msgstr "Control-Retur skickar meddelande"
-
-#: src/prefs.c:685
-msgid "Escape closes window"
-msgstr "Escape stnger fnster"
-
-#: src/prefs.c:686
-msgid "Control-W closes window"
-msgstr "Control-W stnger fnster"
-
-#: src/prefs.c:692
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} infogar HTML-taggar"
-
-#: src/prefs.c:693
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(nummer) infogar smileys"
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "Ny fnsterbredd:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "Ny fnsterhjd:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "Hjd p postwidget:"
+
+#: src/prefs.c:571 src/prefs.c:633
+msgid "Raise windows on events"
+msgstr "Hj fnster vid hndelser"
+
+#: src/prefs.c:572
+msgid "Hide window on send"
+msgstr "Dlj fnster vid skickande"
+
+#: src/prefs.c:581
+msgid "Hide Buddy Icons"
+msgstr "Dlj kompisikoner"
+
+#: src/prefs.c:582
+msgid "Disable Buddy Icon Animation"
+msgstr "Inaktivera kompisikonanimering"
+
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "Visa inloggningar i fnster"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr "Meddela kompisar att du skriver till dem"
+
+#: src/prefs.c:642
+msgid "Tab-Complete Nicks"
+msgstr "Tabbkomplettera smeknamn"
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr "Gammaldags tabbkomplettering"
+
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "Visa personer som gr in/lmnar i fnstret"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "Visa alla chattar i ett fnster med flikar"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "Visa alias i flikar/titlar"
 
 #: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 slr p/av tidsstmpelvisningen"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "Visnings- och allmnna instllningar"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "Visa grafiska smileys"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "Visa tidsstmpel p meddelanden"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "Visa URL:er som lnkar"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "Markera felstavade ord"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "Att skicka meddelanden tar bort frnvarostatus"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "Klgg nya meddelanden vid frnvaro"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "Ignorera frger"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "Ignorera typsnittsvarianter"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "Ignorera typsnittsstorlekar"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignorera automatiserade TiK-meddelanden"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "Ignorera nya konversationer vid frnvaro"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "Snabbmeddelandealternativ"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "Snabbmeddelandefnster"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "Visa knappar som: "
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "Bilder och text"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "Bilder"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "Text"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "Visa alla konversationer i ett fnster med flikar"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "Visa chattar i samma flikfnster"
-
-#: src/prefs.c:967 src/prefs.c:1119
-msgid "Raise windows on events"
-msgstr "Hj fnster vid hndelser"
-
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "Visa inloggningar i fnster"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "Visa alias i flikar/titlar"
-
-#: src/prefs.c:970
-msgid "Hide window on send"
-msgstr "Dlj fnster vid skickande"
-
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "Fnsterstorlekar"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "Ny fnsterbredd:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "Ny fnsterhjd:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "Hjd p postwidget:"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Flikplacering"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "Vnster"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "Hger"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "Kompisikoner"
-
-#: src/prefs.c:1031
-msgid "Hide Buddy Icons"
-msgstr "Dlj kompisikoner"
-
-#: src/prefs.c:1037
-msgid "Disable Buddy Icon Animation"
-msgstr "Inaktivera kompisikonanimering"
-
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "Chattalternativ"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "Gruppchatfnster"
-
-#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Visa alla chattar i ett fnster med flikar"
 
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "Visa konversationer i samma flikfnster"
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "Visa personer som gr in/lmnar i fnstret"
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "Tabbkomplettering"
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr "Tabbkomplettera smeknamn"
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr "Gammaldags tabbkomplettering"
-
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "Typsnittsalternativ"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "Kursiv text"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "Markera"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "Typsnitt fr text"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "Typsnittsstorlek fr text"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Ljudkonfiguration"
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "Test"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "Vlj..."
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "Ljudalternativ"
-
-#: src/prefs.c:1649
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "Visa chattar i samma flikfnster"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "Proxyserver"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "Vrd"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "Port"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "Anvndare"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "Lsenord"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "Visa nytt fnster som standard"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "Logga alla konversationer"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "Ta bort HTML frn loggar"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "Logga d kompisar loggar in/ut"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "Logga d kompisar blir inaktiva/kommer tillbaka frn inaktivitet"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "Logga d kompisar blir frnvarande/kommer tillbaka"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "Logga dina egna inloggningar/inaktivitet/frnvarande"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "Individuell loggfil fr varje kompis inloggning"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "Inga ljud nr du loggar in"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "Ljud d du r frnvarande"
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "Ljudmetod"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3373,106 +3205,125 @@
 "Ljudkommando\n"
 "(%s fr filnamn)"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "Ljud spelas d:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "Frnvaromeddelanden"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "Att skicka meddelanden tar bort frnvarostatus"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "Klgg nya meddelanden vid frnvaro"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "Ignorera nya konversationer vid frnvaro"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "Skicka inte automatiskt svar"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "Skicka endast automatiskt svar vid inaktivitet"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Tid mellan skickande av automatiskt svar (i sekunder):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "Automatiskt frnvarande efter"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "minuters anvndning"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "Meddelanden"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Ljudkonfiguration"
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr "Test"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "Vlj..."
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "Redigera"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "Gr frnvarande"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "Ostrdhetsalternativ"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "Stll in ostrdhet fr:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "Tillt alla anvndare att kontakta mig"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "Tillt endast anvndarna nedan"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "Tilltelselista"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "Neka alla anvndare"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "Blockera anvndarna nedan"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "Blockera lista"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+#, fuzzy
+msgid "Interface"
+msgstr "Instans:"
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "Typsnitt"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Meddelande skickat"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "Snabbmeddelandefnster"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "Gruppchatfnster"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "Proxyserver"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "Webblsare"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "Ljud"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "Hndelser"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "Frnvarotitel: "
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "Frnvaromeddelanden"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - Egenskaper"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim-felskningsutdatafnster"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "Allmnt"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "Proxyserver"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "Konversationer"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "Ljud"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "Persondataskydd"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3489,37 +3340,50 @@
 msgid "Protocol Error"
 msgstr "Protokollfel"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Protokolltgrder"
+
+#: src/prpl.c:101
 #, 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:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Koppla frn"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "Acceptera?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - Nytt brev"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "ppna brev"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 msgid ""
 "\n"
 "\n"
@@ -3529,7 +3393,7 @@
 "\n"
 "Vill du lgga till honom eller henne till din kompislista?"
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3537,15 +3401,15 @@
 "Du har fr tillfllet inga tillgngliga protokoll som klarar av att "
 "registrera nya konton."
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrering"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "Registreringsinformation"
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "Registrera"
 
@@ -3553,28 +3417,28 @@
 msgid "Please enter your password"
 msgstr "Ange ditt lsenord"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d meddelanden)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 meddelande)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "Varnad"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "Nej"
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr "Mer information"
 
@@ -3618,6 +3482,188 @@
 msgid "Someone says your name in chat"
 msgstr "Ngon sger ditt namn i chatt"
 
+#~ 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."
+
+# src/prefs.c:111
+#~ msgid "Miscellaneous"
+#~ msgstr "Diverse"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "Rapportera inaktivitetstider"
+
+#~ msgid "None"
+#~ msgstr "Ingen"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Gaim-anvndning"
+
+#~ msgid "X Use"
+#~ msgstr "X-anvndning"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME:s URL-hanterare"
+
+#~ 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."
+#~ msgstr ""
+#~ "Inte alla protokoll kan anvnda dessa proxyalternativ. Se filen README "
+#~ "fr detaljer."
+
+#~ msgid "Proxy Type"
+#~ msgstr "Proxytyp"
+
+#~ msgid "No Proxy"
+#~ msgstr "Ingen proxy"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "Tangentbordsalternativ"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 slr p/av tidsstmpelvisningen"
+
+#~ msgid "Display and General Options"
+#~ msgstr "Visnings- och allmnna instllningar"
+
+#~ msgid "IM Options"
+#~ msgstr "Snabbmeddelandealternativ"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "Visa knappar som: "
+
+#~ msgid "Pictures And Text"
+#~ msgstr "Bilder och text"
+
+#~ msgid "Pictures"
+#~ msgstr "Bilder"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "Visa alla konversationer i ett fnster med flikar"
+
+#~ msgid "Window Sizes"
+#~ msgstr "Fnsterstorlekar"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Flikplacering"
+
+#~ msgid "Left"
+#~ msgstr "Vnster"
+
+#~ msgid "Right"
+#~ msgstr "Hger"
+
+#~ msgid "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"
+
+#~ msgid "Italic Text"
+#~ msgstr "Kursiv text"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "Typsnitt fr text"
+
+#~ 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:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "Tid mellan skickande av automatiskt svar (i sekunder):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Automatiskt frnvarande efter"
+
+#~ msgid "minutes using"
+#~ msgstr "minuters anvndning"
+
+#~ msgid "Messages"
+#~ msgstr "Meddelanden"
+
+#~ msgid "Make Away"
+#~ msgstr "Gr frnvarande"
+
+#~ msgid "Privacy Options"
+#~ msgstr "Ostrdhetsalternativ"
+
+#~ msgid "General"
+#~ msgstr "Allmnt"
+
+#~ msgid "Conversations"
+#~ msgstr "Konversationer"
+
 #~ msgid "Enable sounds"
 #~ msgstr "Anvnd ljud"
 
@@ -3690,9 +3736,6 @@
 #~ msgid "Help!"
 #~ msgstr "Hjlp!"
 
-#~ msgid "Events"
-#~ msgstr "Hndelser"
-
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "Ljud d kompis loggar in"
 
--- a/po/zh_CN.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/zh_CN.po	Thu Aug 08 18:11:17 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\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"
@@ -25,11 +25,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim "
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "ر"
 
@@ -41,17 +41,16 @@
 msgid "Refresh"
 msgstr "ˢ"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr ""
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "ɾ"
 
@@ -75,7 +74,6 @@
 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 +92,7 @@
 msgid "Change"
 msgstr "ȡ"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr ""
 
@@ -102,8 +100,8 @@
 msgid "Available for friends only"
 msgstr ""
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "ʱ뿪"
 
@@ -120,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr ""
 
@@ -157,7 +155,7 @@
 msgid "Unknown Error Code."
 msgstr ""
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr ""
@@ -294,8 +292,7 @@
 msgid "Sex"
 msgstr ""
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr ""
 
@@ -374,12 +371,9 @@
 msgid "Directory Search"
 msgstr "ַ¼"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: 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
 msgid "Change Password"
 msgstr ""
 
@@ -403,7 +397,7 @@
 msgstr "Ϣ"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "ûϸ"
@@ -472,7 +466,7 @@
 msgid "Channel:"
 msgstr "ȡ"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "룺"
 
@@ -481,259 +475,268 @@
 msgid "DCC Chat"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
 msgid "Password Change Error!"
 msgstr "Gaim - "
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr ""
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 msgid "No such user"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
+#: src/protocols/jabber/jabber.c:2681
 #, fuzzy
 msgid "Jabber Error"
 msgstr "Ϣ"
 
-#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "Ƕ"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 #, fuzzy
 msgid "Authenticating"
 msgstr "֤ʧ"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 #, fuzzy
 msgid "Unknown login error"
 msgstr "¼"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Gaim - "
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim - "
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 #, fuzzy
 msgid "Connection lost"
 msgstr "ѹر"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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:2062
+#: src/protocols/jabber/jabber.c:2085
 #, fuzzy
 msgid "Connected"
 msgstr "ѶϿ"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "֤ʧ"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 #, fuzzy
 msgid "Connecting"
 msgstr "ѹر"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 #, fuzzy
 msgid "Invalid Jabber I.D."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 #, fuzzy
 msgid "Server:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 #, fuzzy
 msgid "Handle:"
 msgstr "ʱ䣺"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "鿴¼"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "յʱ뿪Ϣ"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+msgid "Cancel Presence Notification"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3281
 #, fuzzy
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 #, fuzzy
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 #, fuzzy
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr ""
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 #, fuzzy
 msgid "Telephone"
 msgstr "ȫѡ"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 #, fuzzy
 msgid "Role"
 msgstr "ɾ"
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr ""
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 #, fuzzy
 msgid "User Identity"
 msgstr "ûϸ"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 #, fuzzy
 msgid "Server Registration successful!"
 msgstr "ûע"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 #, fuzzy
 msgid "Set User Info"
 msgstr "ûϸ"
@@ -903,8 +906,8 @@
 msgstr "¼"
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: 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 ""
@@ -913,111 +916,111 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 #, fuzzy
 msgid "Gaim was unable to send a message"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 #, fuzzy
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "㱻 (%s) ϳˣ"
 
-#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "ȡļ %s "
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "ܶļ %s"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "룺"
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "ܵ¼ AIM"
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "עµû"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "ظǶǵͼ"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "¼"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "¼"
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 #, fuzzy
 msgid "Invalid name"
 msgstr ""
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Ҫ飺"
@@ -1095,17 +1098,14 @@
 msgid "Connection established, cookie sent"
 msgstr "ӳɹͳɡɣ"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr ""
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr ""
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1113,7 +1113,6 @@
 msgstr ""
 "ӣϿƵ̫ˣʮԡҪԣȵʱ"
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "ʹõ汾̫ˡµİɣ"
@@ -1126,7 +1125,7 @@
 msgid "Internal Error"
 msgstr "ڲ"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "<HR><B>ѽ %s ֱӡ</B><BR><HR>"
@@ -1217,9 +1216,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Īضʧһ %s Ϣ"
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: 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 - "
 
@@ -1244,10 +1243,14 @@
 msgstr "Gaim - "
 
 #: src/protocols/oscar/oscar.c:1753
-#, c-format
+#, fuzzy, c-format
 msgid "Your message to %s did not get sent: %s"
-msgstr " %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 "ԭ"
@@ -1255,73 +1258,77 @@
 #: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
-msgstr "޷鵽û %s Ϣ"
-
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+msgstr ""
+
+# #: src/protocols/oscar/oscar.c:1771
+# #, c-format
+# msgid "User information for %s unavailable: %s"
+# msgstr "޷鵽û %s Ϣ"
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "ͼ"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "IM ͼ"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "ļ"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "ļ"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "Ϸ"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "Ʊ"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "б"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 #, fuzzy
 msgid "AP User"
 msgstr "¼û"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr ""
 
@@ -1384,35 +1391,35 @@
 "wait 10 seconds and try again."
 msgstr ""
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 #, fuzzy
 msgid "Gaim - Warning"
 msgstr "Gaim - û"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "ֱܽ"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1420,30 +1427,30 @@
 "continue?"
 msgstr " %s ׽¶ĺβͣзա"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "յʱ뿪Ϣ"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "ֱϢ"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 #, fuzzy
 msgid "Get Capabilities"
 msgstr "ԣ%s\n"
@@ -1588,7 +1595,7 @@
 msgid "Password Change Successful"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - "
 
@@ -1704,14 +1711,11 @@
 "Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "ַ"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "뿪"
 
@@ -1719,7 +1723,7 @@
 msgid "Please enter your logon"
 msgstr "ĵ¼"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "¼"
 
@@ -1735,11 +1739,11 @@
 msgid "Password: "
 msgstr "룺"
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "˳"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "ʺ"
 
@@ -1751,19 +1755,19 @@
 msgid "About"
 msgstr ""
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "ѡ  "
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "    "
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr ""
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "Զ¼"
@@ -1818,74 +1822,73 @@
 msgid "Set All Away"
 msgstr "ʺΪ뿪"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "Ⱥ"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "ʱϢ"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "ϸ"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "Ŷ"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "Ӽ"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "鿴¼"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr ""
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "ȥŶ"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "ȡ"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr ""
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "ѵ¼ʺţ %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "棺%d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "ԣ%s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1894,130 +1897,138 @@
 msgstr ""
 "Ŷ%s                \n"
 "¼%s\n"
-"%s%s%s"
-
-#: src/buddy.c:2286
+"%s%s%s%s%s%s"
+
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "ʱ䣺"
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "<HR><B>%s ѵ¼</B><BR><HR>"
 
-#: src/buddy.c:2424 src/buddy.c:2429
-#, c-format
+#: src/buddy.c:2428 src/buddy.c:2433
+#, fuzzy, c-format
 msgid "%s logged out."
-msgstr "<HR><B>%s 뿪 %s%s </B><BR><HR>"
-
-#: src/buddy.c:2614
+msgstr "<HR><B>%s ѵ¼</B><BR><HR>"
+
+# #: src/buddy.c:2428 src/buddy.c:2433
+# #, c-format
+# msgid "%s logged out."
+# msgstr "<HR><B>%s 뿪 %s%s </B><BR><HR>"
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "ѡеѵ"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "ʱϢ"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "һ"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "ʱ뿪Ϣ"
 
-#: src/buddy.c:2689
-msgid "File"
-msgstr "ļ"
-
 #: src/buddy.c:2693
+msgid "File"
+msgstr "ļ"
+
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "һǶ"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr ""
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "ʱϢ"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "ûϸ"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "б"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Э鶯"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "˽"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "鿴ϵͳ¼"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl "
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "ؽű"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "жؽű"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "гѼؽű"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr ""
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr "ʾ Debug "
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr " Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "б"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "һ¸Ƕ"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "һ¸Ƕ"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 #, fuzzy
 msgid "Remove selected Buddy/Group"
 msgstr "ɾѡеĸǶ"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "޸б"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - б"
 
@@ -2029,13 +2040,13 @@
 msgid "Join Chat As:"
 msgstr "趨ʹõdzƣ"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "ȡ"
 
@@ -2043,16 +2054,16 @@
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr ""
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "Ϣ"
 
@@ -2061,69 +2072,73 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr ""
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 #, fuzzy
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr ""
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
-#, c-format
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
+#, fuzzy, c-format
 msgid "%d %s in room"
-msgstr " %d һ"
-
-#: src/buddy_chat.c:941
+msgstr "ûˣȥ"
+
+# #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+# #: src/buddy_chat.c:1544
+# #, c-format
+# msgid "%d %s in room"
+# msgstr " %d һ"
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s "
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "[%s] ʹû [%s]"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, fuzzy, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 뿪"
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s 뿪"
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim Ⱥ"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "⣺"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "ûˣȥ"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "Ļ"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "ͳ"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "ס죡"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr ""
 
@@ -2160,565 +2175,593 @@
 msgid "Setting position to %d\n"
 msgstr "λ趨 %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr ""
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr ""
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "б"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "б"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "¼"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "¼"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr ""
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "С"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "С"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "С"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr ""
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr ""
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "ѡ"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr ""
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "ɫ"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "ɫ"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "ɫ"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "볬"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "Цͼ"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "Ц"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "IM ͼ"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 #, fuzzy
 msgid "Image"
 msgstr "IM ͼ"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "ʼ¼"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "¼"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "Ի"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - жԻ"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "Ϣ"
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 #, fuzzy
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Ϊ"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr ""
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 #, fuzzy
 msgid "Enable Animation"
 msgstr ""
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 #, fuzzy
 msgid "Hide Icon"
 msgstr "ظǶǵͼ"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 #, fuzzy
 msgid "Save Icon As..."
 msgstr "Gaim - Ϊ"
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - û"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "뾯 %s"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "棿"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "治ô"
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr " %sѱɾȥ\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, fuzzy, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - "
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 #, fuzzy
 msgid "Remove Buddy"
 msgstr "Ƕ"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr ""
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "ȷ"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - ʱϢû"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "һTʱϢ"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "û"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr "ʺ"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - ȡû"
 
-#: src/dialogs.c:940
-msgid "Add Group"
-msgstr ""
-
 #: src/dialogs.c:965
+msgid "Add Group"
+msgstr ""
+
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr ""
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 #, fuzzy
 msgid "Contact"
 msgstr ""
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 #, fuzzy
 msgid "Add To"
 msgstr ""
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - ʱ뿪"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "˽ѡΪ"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "еûϵ"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "ֻûϵ"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "ûб"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "ܾûϵ"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "סЩһ"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "סļһ"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "ҪӵģǶ"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "ʱ"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - "
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 #, fuzzy
 msgid "Account"
 msgstr "ʺ"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "Ӻʱ¼"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "Ӻʱ"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "Ӻʱ־ָ"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "ѵ¼"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 #, fuzzy
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 #, fuzzy
 msgid "Open IM Window"
 msgstr "ʱϢ"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr ""
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 #, fuzzy
 msgid "Send Message"
 msgstr "Ϣ"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "ִֶ"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "ֶͲ"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "´ηȻִ"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 趨ַ¼"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "ַ¼"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "ҳѰҵ"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr ""
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr ""
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr ""
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr ""
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "ʡ"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "벻һ"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "еı"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr ""
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "루ȷ"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 趨û"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "Ľ"
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "ܾ"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - ӽֹ"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ¼Ի"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "Ѱ"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - ûϲѰ"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ݵʲѰ"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "趨ɫ"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "趨ɫ"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr ""
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - б"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "ʱ뿪Ϣûб"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "ʱ뿪ϢΪ"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - ʱ뿪Ϣ"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "µʱ뿪Ϣ"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "ʱ뿪⣺"
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "ʹ"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "沢ʹ"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "Ц"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "ȡһŶ"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - ȡһŶ"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - ¼Ϊ"
 
-#: src/dialogs.c:3603
-#, c-format
+#: src/dialogs.c:3981
+#, fuzzy, c-format
 msgid "Unable to remove file %s - %s"
-msgstr "ɾļ %s"
-
-#: src/dialogs.c:3631
+msgstr "ܶļ %s"
+
+# #: src/dialogs.c:3981
+# #, c-format
+# msgid "Unable to remove file %s - %s"
+# msgstr "ɾļ %s"
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "Ҫ¼"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "ȷ"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 #, fuzzy
 msgid "Date"
 msgstr "ʡ"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 #, fuzzy
 msgid "Conversation"
 msgstr "Ի"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - "
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr ""
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "֣"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Ƕ"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "Ƕ"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - ѡ Perl ű"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
-msgstr "޷ļ"
-
-#: src/gaimrc.c:1137
+msgstr ""
+
+# #: src/gaimrc.c:1137
+# #, c-format
+# msgid "Could not open config file %s."
+# msgstr "޷ļ"
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "ѡ"
 
@@ -2750,7 +2793,7 @@
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr ""
 
@@ -2792,7 +2835,18 @@
 msgid "Enter Password"
 msgstr ""
 
-#: src/multi.c:947
+#: src/multi.c:948
+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
 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."
@@ -2801,70 +2855,66 @@
 "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:949
-msgid "Login Error"
-msgstr "¼"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "ɾ %s"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - ʺű༭"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "ȫѡ"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "ѡԶظϢ"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "ȫѡ"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "޸"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "¼/뿪"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "ɾ"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 #, fuzzy
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 #, fuzzy
 msgid "Connection Error"
 msgstr "ѹر"
@@ -2873,558 +2923,363 @@
 msgid "Perl Scripts"
 msgstr "Perl ű"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - б"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - "
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 #, fuzzy
 msgid "Loaded Plugins"
 msgstr ""
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "ȫѡ"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "ļ·"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr ""
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "ļز"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "趨"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "ѡIJ"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "¼"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "¼ѡеIJ"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "жز"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "жѡIJ"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "ڽ̸ʾ¼dzϢ"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "һѡ"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "û⣬е趨Ч"
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr ""
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "ʹޱ߿ť"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "ʾͼ"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "ʾ Debug "
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr ""
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "淢ʱ"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr ""
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Gaim ʹ"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "X ʹ"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "¼жԻ"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "¼ļڵ HTML "
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "¼Ƕ¼˳ʱ"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "¼Ƕʲôʱ򷢴ʲôʱ"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "¼Ƕʲôʱ뿪ʲôʱ"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "¼Լʱ¼//뿪"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "ÿһǶʹòͬļ¼ļ"
+#, fuzzy
+msgid "Windows"
+msgstr "ʱϢ"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr ""
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr ""
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
-msgstr ""
-
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "ȱʡ´"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME URL Handler"
-
-#: src/prefs.c:306
-msgid "Galeon"
+msgid "Show Buddy Ticker"
+msgstr "ʾͼ"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "ʾ Debug "
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "ʽ"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "ʹޱ߿ť"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr ""
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "ȡ"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "Цͼ"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "ѡ"
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "ѡ"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr "еЭ鶼ʹЩã README ļ"
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr ""
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr ""
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "޴"
-
-#: src/prefs.c:420
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "ɫ"
+
+#: src/prefs.c:385
 #, fuzzy
-msgid "SOCKS 4"
-msgstr "SOCKS v4 "
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr ""
+msgid "Background color"
+msgstr "ɫ"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "ʾͼЦ"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "Ϣʾʱ"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "Գӷʽʾ URL"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "ʾƴĵ"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "յϢɫ"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "յϢ"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "յϢС"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr ""
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "ַ"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "˿"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "¼û"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "¼"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "бѡ"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "б"
-
-#: src/prefs.c:569
-#, fuzzy
-msgid "Tab Placement:"
-msgstr "Իҳλ"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr ""
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "׶"
-
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr " Ϣ/Ϣ/ ť"
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "¼Զʾб"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr " applet ʾб"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "洰ڵĴСλ"
-
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "ڰťʾͼ"
-
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "ʾ"
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "ûиǶ¼"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "ʾ"
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "бʾ"
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "ʾͼ"
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "ʾ漶"
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "ʾתʱ"
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr ""
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "Իѡ"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "ѡ"
-
-#: src/prefs.c:683
+msgid "Ignore TiK Automated Messages"
+msgstr "ԶɵϢ"
+
+#: src/prefs.c:459
 msgid "Enter sends message"
 msgstr " Enter Ϣ"
 
-#: src/prefs.c:684
+#: src/prefs.c:460
 msgid "Control-Enter sends message"
 msgstr "Ctrl-Enter Ϣ"
 
-#: src/prefs.c:685
+#: src/prefs.c:469
 msgid "Escape closes window"
 msgstr "ESC رմ"
 
-#: src/prefs.c:686
+#: src/prefs.c:470
 #, fuzzy
 msgid "Control-W closes window"
 msgstr "ESC رմ"
 
-#: src/prefs.c:692
+#: src/prefs.c:480
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S}  HTML "
 
-#: src/prefs.c:693
+#: src/prefs.c:481
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl- Цͼ"
 
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 лʱʾ"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "ʾһѡ"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "ʾͼЦ"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "Ϣʾʱ"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "Գӷʽʾ URL"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "ʾƴĵ"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "ϢʱԶȡʱ뿪״̬"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "ʱ뿪ʱյϢŵ"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "յϢɫ"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "յϢ"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "յϢС"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "ԶɵϢ"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "ʱ뿪ʱµĶԻ"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "ʱϢѡ"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "ʱϢ"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "ťʾã"
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "ͼκ"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "ͼ"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr ""
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "һҳʾжԻ"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "ͬһһҳʾԻ"
-
-#: src/prefs.c:967 src/prefs.c:1119
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr " Ϣ/Ϣ/ ť"
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "ڰťʾͼ"
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "¼Զʾб"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr " applet ʾб"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "洰ڵĴСλ"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "¼ʱ"
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "ûиǶ¼"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "ʾ"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "ʾͼ"
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "ʾ漶"
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "ʾתʱ"
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr ""
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "µĴڿ趨"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "µĴڸ߶趨"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "봰ڸ߶ȣ"
+
+#: src/prefs.c:571 src/prefs.c:633
 msgid "Raise windows on events"
 msgstr "¼ʱ"
 
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "ڽ̸ʾ¼dzϢ"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "ڴڻҳıʾŶ"
-
-#: src/prefs.c:970
+#: src/prefs.c:572
 msgid "Hide window on send"
 msgstr "Ϣش"
 
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "ڴС趨"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "µĴڿ趨"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "µĴڸ߶趨"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "봰ڸ߶ȣ"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Իҳλ"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr ""
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "ұ"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "ͼ"
-
-#: src/prefs.c:1031
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "ظǶǵͼ"
 
-#: src/prefs.c:1037
+#: src/prefs.c:582
 #, fuzzy
 msgid "Disable Buddy Icon Animation"
 msgstr ""
 
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "ѡ"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "촰"
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr "һҳʾ"
-
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "һҳʾжԻ"
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "ڴʾǼ/뿪Ϣ"
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "TAB Զȫ"
-
-#: src/prefs.c:1180
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "ڽ̸ʾ¼dzϢ"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr ""
+
+#: src/prefs.c:642
 msgid "Tab-Complete Nicks"
 msgstr "TAB Զȫdz"
 
-#: src/prefs.c:1186
+#: src/prefs.c:643
 msgid "Old-Style Tab Completion"
 msgstr "ʽ TAB Զȫ"
 
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "ѡ"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "б"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "ѡ"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "ֵ"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "ֵС"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - "
-
-#: src/prefs.c:1543
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "ڴʾǼ/뿪Ϣ"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "һҳʾ"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "ڴڻҳıʾŶ"
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "һҳʾ"
+
+#: src/prefs.c:704
 #, fuzzy
-msgid "Test"
-msgstr ""
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "ѡ"
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "ѡ"
-
-#: src/prefs.c:1649
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "ͬһһҳʾԻ"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr ""
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "ַ"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "˿"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "¼û"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "¼"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "ȱʡ´"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "¼жԻ"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "¼ļڵ HTML "
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "¼Ƕ¼˳ʱ"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "¼Ƕʲôʱ򷢴ʲôʱ"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "¼Ƕʲôʱ뿪ʲôʱ"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "¼Լʱ¼//뿪"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "ÿһǶʹòͬļ¼ļ"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "ĵؽȥǹزҪ"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "뿪ʱ"
 
-#: src/prefs.c:1665
-#, fuzzy
-msgid "Sound method"
-msgstr ""
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, fuzzy, c-format
 msgid ""
 "Sound command\n"
@@ -3433,107 +3288,125 @@
 "\n"
 "(ļ·ʹ %s; Ϊʹڲ)"
 
-#: src/prefs.c:1751
-#, fuzzy
-msgid "Sound played when:"
-msgstr ""
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "ʱ뿪Ϣ"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "ϢʱԶȡʱ뿪״̬"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "ʱ뿪ʱյϢŵ"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "ʱ뿪ʱµĶԻ"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "ҪԶظ"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "ֻڷʱŷԶظ"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "Զظļ ()"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "Զ"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "ʱʹ"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "Ϣ"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - "
+
+#: src/prefs.c:1338
+#, fuzzy
+msgid "Test"
+msgstr ""
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "ѡ"
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "༭"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "༭"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "趨Ϊʱ뿪"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "˽ѡ"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "˽ѡΪ"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "еûϵ"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "ֻûϵ"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "ûб"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "ܾûϵ"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "סЩһ"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "סļһ"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+msgid "Interface"
+msgstr ""
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr ""
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "Ϣ"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "ʱϢ"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "촰"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr ""
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr ""
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr ""
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "¼Ч"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "ʱ뿪⣺"
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "ʱ뿪Ϣ"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - 趨"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim "
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "һ趨"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr ""
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "Ի"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr ""
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "˽"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3546,60 +3419,73 @@
 msgid "Protocol Error"
 msgstr "Э"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Э鶯"
+
+#: src/prpl.c:101
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s ʹ %sѾɾˡ%s ߡ"
 
-#: src/prpl.c:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "Ͽ"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "ܣ"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - ʾ"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 #, fuzzy
 msgid "Gaim - New Mail"
 msgstr "Gaim - ļ"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr ""
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, 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:578
+#: src/prpl.c:586
 msgid ""
 "\n"
 "\n"
 "Do you wish to add him or her to your buddy list?"
 msgstr ""
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - ûע"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "ע"
 
@@ -3607,29 +3493,29 @@
 msgid "Please enter your password"
 msgstr "ĵ¼"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d Ϣ)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 Ϣ)"
 
-#: src/server.c:783
+#: src/server.c:808
 #, fuzzy
 msgid "Warned"
 msgstr ""
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Yes"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1076
+#: src/server.c:1101
 #, fuzzy
 msgid "More Info"
 msgstr "ûϸ"
@@ -3679,6 +3565,174 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "General Options"
+#~ msgstr "һѡ"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr "û⣬е趨Ч"
+
+#~ msgid "Miscellaneous"
+#~ msgstr ""
+
+#~ msgid "Report Idle Times"
+#~ msgstr "淢ʱ"
+
+#~ msgid "None"
+#~ msgstr ""
+
+#~ msgid "Gaim Use"
+#~ msgstr "Gaim ʹ"
+
+#~ msgid "X Use"
+#~ msgstr "X ʹ"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URL Handler"
+
+#~ msgid "Proxy Options"
+#~ msgstr "ѡ"
+
+#~ msgid ""
+#~ "Not all protocols can use these proxy options. Please see the README file "
+#~ "for details."
+#~ msgstr "еЭ鶼ʹЩã README ļ"
+
+#~ msgid "Proxy Type"
+#~ msgstr ""
+
+#~ msgid "No Proxy"
+#~ msgstr "޴"
+
+#, fuzzy
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS v4 "
+
+#~ msgid "Buddy List Options"
+#~ msgstr "бѡ"
+
+#~ msgid "Buddy List Window"
+#~ msgstr "б"
+
+#, fuzzy
+#~ msgid "Tab Placement:"
+#~ msgstr "Իҳλ"
+
+#~ msgid "Top"
+#~ msgstr ""
+
+#~ msgid "Bottom"
+#~ msgstr "׶"
+
+#~ msgid "Group Displays"
+#~ msgstr "ʾ"
+
+#~ msgid "Buddy Displays"
+#~ msgstr "бʾ"
+
+#~ msgid "Conversation Options"
+#~ msgstr "Իѡ"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "ѡ"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 лʱʾ"
+
+#~ msgid "Display and General Options"
+#~ msgstr "ʾһѡ"
+
+#~ msgid "IM Options"
+#~ msgstr "ʱϢѡ"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "ťʾã"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "ͼκ"
+
+#~ msgid "Pictures"
+#~ msgstr "ͼ"
+
+#~ msgid "Text"
+#~ msgstr ""
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "һҳʾжԻ"
+
+#~ msgid "Window Sizes"
+#~ msgstr "ڴС趨"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Իҳλ"
+
+#~ msgid "Left"
+#~ msgstr ""
+
+#~ msgid "Right"
+#~ msgstr "ұ"
+
+#~ msgid "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 "ѡ"
+
+#~ msgid "Italic Text"
+#~ msgstr "б"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "ֵ"
+
+#~ msgid "Font Size for Text"
+#~ msgstr "ֵС"
+
+#~ msgid "Sound Options"
+#~ msgstr "ѡ"
+
+#, fuzzy
+#~ msgid "Sound method"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Sound played when:"
+#~ msgstr ""
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "Զظļ ()"
+
+#~ msgid "Auto Away after"
+#~ msgstr "Զ"
+
+#~ msgid "minutes using"
+#~ msgstr "ʱʹ"
+
+#~ msgid "Messages"
+#~ msgstr "Ϣ"
+
+#~ msgid "Make Away"
+#~ msgstr "趨Ϊʱ뿪"
+
+#~ msgid "Privacy Options"
+#~ msgstr "˽ѡ"
+
+#~ msgid "General"
+#~ msgstr "һ趨"
+
+#~ msgid "Conversations"
+#~ msgstr "Ի"
+
 #~ msgid "Enable sounds"
 #~ msgstr ""
 
@@ -3688,9 +3742,6 @@
 #~ msgid "Manual"
 #~ msgstr "ûֲ"
 
-#~ msgid "Events"
-#~ msgstr "¼Ч"
-
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "ѵ¼"
 
@@ -3779,9 +3830,6 @@
 #~ msgid "Tabbed Window Options"
 #~ msgstr "ҳѡ"
 
-#~ msgid "Font Style"
-#~ msgstr "ʽ"
-
 #~ msgid "Underlined Text"
 #~ msgstr "¼"
 
--- a/po/zh_TW.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/zh_TW.po	Thu Aug 08 18:11:17 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\n"
 "PO-Revision-Date: 2002-07-09 17:02+0800\n"
 "Last-Translator: Paladin Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -16,34 +16,20 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/chatlist.c:67
-#: src/buddy_chat.c:272
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
 msgid "Buddy Chat"
 msgstr "與好友聊天"
 
-#: plugins/chatlist.c:166
-#: plugins/chatlist.c:168
-#: plugins/chatlist.c:407
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
 #: plugins/chatlist.c:409
 msgid "Gaim Chat"
 msgstr "Gaim - 聊天"
 
-#: plugins/chatlist.c:339
-#: src/about.c:165
-#: src/aim.c:320
-#: src/buddy.c:2716
-#: src/buddy_chat.c:1322
-#: src/buddy_chat.c:1419
-#: src/buddy_chat.c:1449
-#: src/conversation.c:2864
-#: src/dialogs.c:567
-#: src/dialogs.c:3899
-#: src/multi.c:1069
-#: src/plugins.c:277
-#: src/prefs.c:2547
-#: src/prpl.c:438
-#: src/prpl.c:685
-#: src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: 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:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "關閉"
 
@@ -55,32 +41,16 @@
 msgid "Refresh"
 msgstr "更新"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364
-#: src/buddy.c:492
-#: src/buddy.c:2827
-#: src/buddy_chat.c:1454
-#: src/conversation.c:2389
-#: src/conversation.c:2879
-#: src/dialogs.c:932
-#: src/dialogs.c:1114
-#: src/dialogs.c:2095
-#: src/multi.c:1053
-#: src/prefs.c:2041
-#: src/prefs.c:2383
-#: src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: 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:1565
 msgid "Add"
 msgstr "增加"
 
-#: plugins/chatlist.c:365
-#: src/buddy.c:494
-#: src/buddy.c:2829
-#: src/buddy_chat.c:1456
-#: src/conversation.c:2375
-#: src/conversation.c:2876
-#: src/prefs.c:2055
-#: src/prefs.c:2387
-#: src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "移除"
 
@@ -104,7 +74,6 @@
 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 ""
@@ -121,8 +90,7 @@
 msgid "Change"
 msgstr "變更"
 
-#: src/protocols/gg/gg.c:71
-#: src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr ""
 
@@ -130,12 +98,8 @@
 msgid "Available for friends only"
 msgstr "只有好友可以看到我上線"
 
-#: src/applet.c:197
-#: src/buddy.c:497
-#: src/buddy.c:2582
-#: src/buddy.c:2727
-#: src/protocols/gg/gg.c:73
-#: src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "離開"
 
@@ -151,8 +115,7 @@
 msgid "Invisible for friends only"
 msgstr "隱身(只好好友可以看到我)"
 
-#: src/protocols/gg/gg.c:77
-#: src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr ""
 
@@ -184,8 +147,7 @@
 msgid "Unknown Error Code."
 msgstr "未知的錯誤代碼。"
 
-#: src/protocols/gg/gg.c:302
-#: src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr "狀態:%s"
@@ -255,20 +217,13 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
-#: src/protocols/gg/gg.c:595
-#: src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762
-#: src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821
-#: src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845
-#: src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984
-#: src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066
-#: src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149
-#: src/protocols/gg/gg.c:1214
+#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
+#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
 msgid "Gadu-Gadu Error"
 msgstr "Gadu-Gadu 錯誤"
 
@@ -308,21 +263,16 @@
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/gg/gg.c:712
-#: src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
 msgid "Birth year"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:721
-#: src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
 #: src/protocols/gg/gg.c:725
 msgid "Sex"
 msgstr "性別"
 
-#. Line 5
-#: src/dialogs.c:1624
-#: src/dialogs.c:2332
-#: src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "城市"
 
@@ -338,8 +288,7 @@
 msgid "Buddy List successfully transferred to server"
 msgstr "成功的將好朋名單傳送到伺服器上"
 
-#: src/protocols/gg/gg.c:816
-#: src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
 #: src/protocols/gg/gg.c:840
 msgid "Gadu-Gadu Information"
 msgstr "Gadu-Gadu 資訊"
@@ -383,8 +332,7 @@
 msgid "Deletion of Buddies List from Server failed (%s)"
 msgstr "刪除伺服器上的好友名單失敗(%s)"
 
-#: src/protocols/gg/gg.c:1114
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
 #, c-format
 msgid "Connect to search service failed (%s)"
 msgstr "連線到搜尋服務失敗(%s)"
@@ -394,35 +342,25 @@
 msgid "Changing Password failed (%s)"
 msgstr "修改密碼失敗(%s)"
 
-#: src/protocols/gg/gg.c:1158
-#: src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
 msgid "Directory Search"
 msgstr "目錄搜尋"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741
-#: src/protocols/gg/gg.c:1160
-#: src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748
-#: src/protocols/jabber/jabber.c:3761
+#: src/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
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: src/protocols/gg/gg.c:1162
-#: src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Import Buddies List from Server"
 msgstr "自伺服器上匯入好友名單"
 
-#: src/protocols/gg/gg.c:1164
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
 msgid "Export Buddies List to Server"
 msgstr "匯出好友名單到伺服器上"
 
-#: src/protocols/gg/gg.c:1166
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
 msgid "Delete Buddies List from Server"
 msgstr "將伺服器上的好友名單刪除"
 
@@ -430,22 +368,18 @@
 msgid "Send message through server"
 msgstr "透過伺服器傳送訊息"
 
-#: src/protocols/icq/gaim_icq.c:469
-#: src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860
-#: src/protocols/oscar/oscar.c:3593
+#: src/protocols/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/toc/toc.c:1219
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/irc/irc.c:444
-#: src/protocols/irc/irc.c:1783
+#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr ""
 
-#: src/protocols/irc/irc.c:572
-#: src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s 把聊天主題修改為:%s</B>"
@@ -454,10 +388,8 @@
 msgid "No such nick/channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/irc.c:825
-#: src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830
-#: src/protocols/irc/irc.c:1073
+#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
+#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
 msgid "IRC Error"
 msgstr "IRC 錯誤"
 
@@ -471,11 +403,12 @@
 
 #: src/protocols/irc/irc.c:976
 #, c-format
-msgid "%s has requested a DCC chat.  Would you like to establish the direct connection?"
+msgid ""
+"%s has requested a DCC chat.  Would you like to establish the direct "
+"connection?"
 msgstr "%s 要求和您用 DCC 來聊天。您想接受他的邀請嗎?"
 
-#: src/protocols/irc/irc.c:1001
-#: src/protocols/msn/msn.c:315
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "無法寫入"
 
@@ -502,8 +435,7 @@
 msgid "Channel:"
 msgstr "Channel:"
 
-#: src/multi.c:549
-#: src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "密碼:"
 
@@ -511,253 +443,246 @@
 msgid "DCC Chat"
 msgstr "DCC 聊天"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943
-#: src/protocols/jabber/jabber.c:948
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 msgid "Password Change Error!"
 msgstr "密碼修改錯誤!"
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr "未知"
 
-#: src/buddy.c:2887
-#: src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "上線"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr "錯誤 %s:%s"
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 msgid "Unknown Error in presence"
 msgstr "未知的錯誤發生。"
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他們的好友清單中。"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 msgid "No such user"
 msgstr "沒有這個使用者"
 
-#: src/protocols/jabber/jabber.c:1634
-#: src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
+#: src/protocols/jabber/jabber.c:2681
 msgid "Jabber Error"
 msgstr "Jabber 錯誤"
 
-#: src/dialogs.c:887
-#: src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 msgid "Unknown login error"
 msgstr "未知的登入錯誤"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 msgid "Password successfully changed."
 msgstr "密碼修改成功。"
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 msgid "Password Change"
 msgstr "修改密碼"
 
-#: src/protocols/jabber/jabber.c:2054
-#: src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 msgid "Connection lost"
 msgstr "失去連線"
 
-#: src/protocols/jabber/jabber.c:2056
-#: src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678
-#: src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741
-#: src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c: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
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 msgid "Connected"
 msgstr "連線成功"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 msgid "Requesting Authentication Method"
 msgstr "要求認證的方式"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083
-#: src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/protocols/jabber/jabber.c:2340
-#: src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 msgid "Invalid Jabber I.D."
 msgstr "無效的 Jabber 名稱"
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr "聊天室:"
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 msgid "Server:"
 msgstr "伺服器:"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 msgid "Chats"
 msgstr "聊天"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 msgid "View Error Msg"
 msgstr "觀看錯誤訊息"
 
-#: src/buddy_chat.c:886
-#: src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+#, fuzzy
+msgid "Cancel Presence Notification"
+msgstr "跳出通知"
+
+#: src/protocols/jabber/jabber.c:3281
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 msgid "Given Name"
 msgstr "給予一個名字"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/dialogs.c:2525
-#: src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr "其他地址"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr "郵遞區號"
 
-#. Line 7
-#: src/dialogs.c:1646
-#: src/dialogs.c:2354
-#: src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "國家"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 msgid "Telephone"
 msgstr "電話"
 
-#: src/dialogs.c:2430
-#: src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "電子郵件"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr "組織名稱"
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr "組織單位"
 
-#: src/prefs.c:2000
-#: src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "離開原因的標題"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr "生日"
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533
-#: src/plugins.c:211
-#: src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3119
-msgid "All items below are optional. Enter only the information with which you feel comfortable"
+#: src/protocols/jabber/jabber.c:3324
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable"
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可"
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 msgid "User Identity"
 msgstr "使用者識別"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 編輯 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 msgid "Server Registration successful!"
 msgstr "伺服器註冊成功!"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr "未知的註冊錯誤"
 
-#: src/protocols/jabber/jabber.c:3742
-#: src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -909,12 +834,9 @@
 msgid "Unknown Error Code"
 msgstr "未知的錯誤代碼"
 
-#: src/protocols/msn/msn.c:351
-#: src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813
-#: src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283
-#: src/protocols/msn/msn.c:2336
+#: 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 錯誤"
 
@@ -922,101 +844,97 @@
 msgid "A message may not have been received."
 msgstr "有個訊息可能沒被收到。"
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 msgid "Gaim was unable to send a message"
 msgstr "Gaim 無法送出訊息"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, 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:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "使用者 %s(%s)想要將您加入他們的好友清單"
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
-#: src/protocols/msn/msn.c:1435
-#: src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 msgid "Unable to send password"
 msgstr "無法送出密碼"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 msgid "Unable to write to server"
 msgstr "無法寫入到伺服器"
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 msgid "Synching with server"
 msgstr "伺服器同步"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr "去吃午飯了"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129
-#: src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 msgid "Set Friendly Name"
 msgstr "設定好友名稱"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 msgid "Set Friendly Name:"
 msgstr "設定好友名稱:"
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283
-#: src/protocols/msn/msn.c:2336
+#: 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:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "加入群組:"
@@ -1039,15 +957,12 @@
 msgid "major connection error\n"
 msgstr "主要連結錯誤\n"
 
-#: src/protocols/oscar/oscar.c:382
-#: src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524
-#: src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: src/protocols/oscar/oscar.c:394
-#: src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
@@ -1064,8 +979,7 @@
 msgid "Gaim - Chat"
 msgstr "Gaim - 聊天"
 
-#: src/protocols/oscar/oscar.c:467
-#: src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
@@ -1090,8 +1004,7 @@
 msgid "Signed off.\n"
 msgstr "登出。\n"
 
-#: src/protocols/oscar/oscar.c:605
-#: src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "無法連線"
 
@@ -1099,29 +1012,27 @@
 msgid "Connection established, cookie sent"
 msgstr "連線建立,送出 Cookie"
 
-#. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:639
-#: src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
-msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
-msgstr "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連線,那麼您的等待時間將會更加的延長。"
-
-#. client too old
+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
 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:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "認證失敗"
 
@@ -1129,108 +1040,102 @@
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1248
-#: src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, 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:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
-msgid "The user %lu has denied your request to add them to your contact list for the following reason:\n"
+msgid ""
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
 "%s"
-msgstr "使用者 %lu 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
+msgstr ""
+"使用者 %lu 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1504
-#: src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:1505
-#: src/protocols/oscar/oscar.c:2457
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr "Gaim - ICQ 拒絕認證"
 
-#: src/protocols/oscar/oscar.c:1511
-#: src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "使用者 %lu 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:1512
-#: src/protocols/oscar/oscar.c:2464
+#: 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
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
-msgstr "您遺失了由 %s 送來的 %d 個訊息,因為那是無效的。"
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為那是無效的。"
 
 #: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
-msgstr "您遺失了由 %s 送來的 %d 個訊息,因為那是無效的。"
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為那是無效的。"
 
 #: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
-msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這個訊息太大了。"
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息太大了。"
 
 #: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
-msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這個訊息太大了。"
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息太大了。"
 
 #: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
-msgstr "您遺失了由 %s 送來的 %d 個訊息,因為訊息的發送速率到了上限。"
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為訊息的發送速率到了上限。"
 
 #: src/protocols/oscar/oscar.c:1606
 #, c-format
-msgid "You missed %d messages from %s because the rate limit has been exceeded."
-msgstr "您遺失了由 %s 送來的 %d 個訊息,因為訊息的發送速率到了上限。"
+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
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
-msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這個訊息可能不懷好意。"
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
 
 #: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
-msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這些訊息可能不懷好意。"
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這些訊息可能不懷好意。"
 
 #: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
-msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這個訊息可能不懷好意。"
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
 
 #: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
-msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這個訊息可能不懷好意。"
+msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息,因為這個訊息可能不懷好意。"
 
 #: src/protocols/oscar/oscar.c:1634
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
-msgstr "您因為不明的原因,而遺失了由 %s 送來的 %d 個訊息。"
+msgstr "您因為不明的原因,而遺失了由 %2$s 送來的 %1$d 個訊息。"
 
 #: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
-msgstr "您因為不明的原因,而遺失了由 %s 送來的 %d 個訊息。"
-
-#: src/dialogs.c:3076
-#: src/dialogs.c:3082
-#: src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594
+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 - 錯誤"
 
@@ -1258,8 +1163,7 @@
 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
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "原因不明"
 
@@ -1268,91 +1172,78 @@
 msgid "User information for %s unavailable: %s"
 msgstr "使用者 %s 的個人資訊並不存在:%s"
 
-#: src/buddy.c:2131
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: src/buddy.c:2134
-#: src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "聲音"
 
-#: src/buddy.c:2137
-#: src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "即時訊息圖片"
 
-#: src/buddy.c:498
-#: src/buddy.c:2140
-#: src/buddy.c:2581
-#: src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "聊天"
 
-#: src/buddy.c:2143
-#: src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "接收文件"
 
-#: src/buddy.c:2146
-#: src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/buddy.c:2150
-#: src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "遊戲"
 
-#: src/buddy.c:2153
-#: src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "股票"
 
-#: src/buddy.c:2156
-#: src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/buddy.c:2159
-#: src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/buddy.c:2162
-#: src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 msgid "AP User"
 msgstr ""
 
-#: src/buddy.c:2165
-#: src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/buddy.c:2168
-#: src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2171
-#: src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/buddy.c:2174
-#: src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr "ICQ 未知"
 
-#: src/buddy.c:2177
-#: src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:1886
-msgid "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
+msgid ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:1914
@@ -1389,64 +1280,75 @@
 msgstr "AOL 錯誤"
 
 #: src/protocols/oscar/oscar.c:2225
-msgid "The last message was not sent because you are over the rate limit. Please wait 10 seconds and try again."
+msgid ""
+"The last message was not sent because you are over the rate limit. Please "
+"wait 10 seconds and try again."
 msgstr "訊息並未送出,因為您已經達到發送訊息速率的上限。請等待十秒後再試一次。"
 
-#: src/dialogs.c:3604
-#: src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541
-#: src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888
+#: 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:3192
+#: src/protocols/oscar/oscar.c:3207
 #, 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."
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 msgid "Gaim - Warning"
 msgstr "Gaim - 警告"
 
-#: src/protocols/oscar/oscar.c:3213
-#: src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "交換:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
-msgid "You have selected to open a Direct IM connection with %s. Doing this will let them see your IP address, and may be a security risk. Do you wish to continue?"
-msgstr "您選擇和 %s 開啟一個即時訊息。這樣子的做法會讓對方知道您的 IP 位址,同時存在著系統安全上的顧慮。您確定要繼續嗎?"
-
-#: src/protocols/oscar/oscar.c:3568
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+"您選擇和 %s 開啟一個即時訊息。這樣子的做法會讓對方知道您的 IP 位址,同時存在"
+"著系統安全上的顧慮。您確定要繼續嗎?"
+
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not support sending status messages.</I><BR>"
-msgstr "<B>UIN:</B> %s<BR><B>狀態:</B> %s<BR><HR><BR><I>遠方的客戶端不支援狀態訊息的傳送。</I><BR>"
-
-#: src/protocols/oscar/oscar.c:3575
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+"<B>UIN:</B> %s<BR><B>狀態:</B> %s<BR><HR><BR><I>遠方的客戶端不支援狀態訊息的"
+"傳送。</I><BR>"
+
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message.</I><BR>"
-msgstr "<B>UIN:</B> %s<BR><B>狀態:</B> %s<BR><HR><BR><I>使用都沒有設定狀態訊息。</I><BR>"
-
-#: src/protocols/oscar/oscar.c:3600
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+"<B>UIN:</B> %s<BR><B>狀態:</B> %s<BR><HR><BR><I>使用都沒有設定狀態訊息。</"
+"I><BR>"
+
+#: src/protocols/oscar/oscar.c:3615
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "直接消息"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 msgid "Get Capabilities"
 msgstr "取得相容性資訊"
 
@@ -1549,8 +1451,12 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:468
-msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
-msgstr "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連線,那麼您的等待時間將會更加的延長。"
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+"線,那麼您的等待時間將會更加的延長。"
 
 #: src/protocols/toc/toc.c:471
 #, c-format
@@ -1586,14 +1492,19 @@
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/dialogs.c:1730
-#: src/protocols/toc/toc.c:782
+#: 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. When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
-msgstr "TOC has sent a PAUSE command. When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
+msgid ""
+"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
+"sent to it, and may kick you off if you send a message. Gaim will prevent "
+"anything from going through. This is only temporary, please be patient."
+msgstr ""
+"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
+"sent to it, and may kick you off if you send a message. Gaim will prevent "
+"anything from going through. This is only temporary, please be patient."
 
 #: src/protocols/toc/toc.c:788
 msgid "TOC Pause"
@@ -1603,10 +1514,8 @@
 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:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "無法開啟傳輸的連線!"
 
@@ -1701,15 +1610,11 @@
 "Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "網址"
 
-#: src/aim.c:153
-#: src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "登出"
 
@@ -1717,9 +1622,7 @@
 msgid "Please enter your logon"
 msgstr ""
 
-#: src/aim.c:165
-#: src/multi.c:1400
-#: src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "登入錯誤"
 
@@ -1735,19 +1638,15 @@
 msgid "Password: "
 msgstr "密  碼:"
 
-#: src/aim.c:318
-#: src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "退    出"
 
-#: src/aim.c:323
-#: src/aim.c:831
-#: src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "帳    號"
 
-#: src/aim.c:325
-#: src/multi.c:915
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "登    入"
 
@@ -1756,24 +1655,18 @@
 msgstr "關    於"
 
 #: src/aim.c:358
-#: src/prefs.c:1633
-#: src/prefs.c:1905
 msgid "Options"
 msgstr "選    項"
 
-#: src/aim.c:360
-#: src/aim.c:834
-#: src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "插    件"
 
-#: src/aim.c:828
-#: src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: src/aim.c:838
-#: src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 msgid "Auto-login"
 msgstr "自動登入"
 
@@ -1794,8 +1687,7 @@
 msgid "Away."
 msgstr "離開。"
 
-#: src/applet.c:200
-#: src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "新的離開訊息"
 
@@ -1815,9 +1707,7 @@
 msgid "I'm Back!"
 msgstr "我回來了!"
 
-#: src/away.c:266
-#: src/away.c:346
-#: src/away.c:520
+#: src/away.c:266 src/away.c:346 src/away.c:520
 msgid "Back"
 msgstr "返回"
 
@@ -1829,92 +1719,73 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/buddy.c:493
-#: src/buddy.c:2828
-#: src/dialogs.c:942
-#: src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "群組"
 
-#: src/buddy.c:499
-#: src/buddy.c:664
-#: src/buddy.c:834
-#: src/buddy.c:2579
-#: src/buddy_chat.c:861
-#: src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/buddy.c:500
-#: src/buddy.c:2580
-#: src/buddy_chat.c:877
-#: src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462
-#: src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "訊息內容"
 
-#. Put the buttons in the box
-#: src/buddy.c:669
-#: src/buddy.c:839
-#: src/dialogs.c:1081
-#: src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "別名"
 
-#: src/buddy.c:674
-#: src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
-#: src/buddy.c:681
-#: src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: src/buddy.c:821
-#: src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "重命名"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "取消別名"
 
-#: src/buddy.c:1645
-#: src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "好友狀態捕捉"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "移除好友狀態捕捉"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr "[ 編輯 ]"
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "登入:%s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "警告:%d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "通訊協定相容性:%s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1925,130 +1796,129 @@
 "帳號: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2286
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "閒置時間:"
 
-#: src/buddy.c:2359
-#: src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/buddy.c:2424
-#: src/buddy.c:2429
+#: src/buddy.c:2428 src/buddy.c:2433
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/buddy.c:2614
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "顯示被選取好友的資訊"
 
-#: src/buddy.c:2615
-#: src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "送出即時訊息"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "開始或加入好友的聊天"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "開啟離開訊息"
 
-#: src/buddy.c:2689
+#: src/buddy.c:2693
 msgid "File"
 msgstr "檔案"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "新增一個好友"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "加入聊天"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "新的即時訊息"
 
-#: src/buddy.c:2699
-#: src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "匯入好友清單"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "工具"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "Protocol 相關設定"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "隱私"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "觀看系統日誌"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl 插件"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "讀取命令稿"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "清除所有讀入的命令稿"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "列出命令稿"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "輔助說明"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 msgid "Online Help"
 msgstr "線上求助"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 msgid "Debug Window"
 msgstr "除錯視窗"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: src/buddy.c:2807
-#: src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "好友清單"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "新增一個好友"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "新增一個群組"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 msgid "Remove selected Buddy/Group"
 msgstr "移除被選取的好友或群組"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "修改好友清單"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - 好友清單"
 
@@ -2060,32 +1930,13 @@
 msgid "Join Chat As:"
 msgstr "加入聊天為:"
 
-#: src/buddy_chat.c:304
-#: src/buddy_chat.c:392
-#: src/dialogs.c:449
-#: src/dialogs.c:539
-#: src/dialogs.c:715
-#: src/dialogs.c:816
-#: src/dialogs.c:934
-#: src/dialogs.c:1110
-#: src/dialogs.c:1473
-#: src/dialogs.c:1678
-#: src/dialogs.c:1802
-#: src/dialogs.c:1862
-#: src/dialogs.c:2084
-#: src/dialogs.c:2266
-#: src/dialogs.c:2441
-#: src/dialogs.c:2512
-#: src/dialogs.c:3208
-#: src/dialogs.c:3460
-#: src/dialogs.c:3641
-#: src/dialogs.c:4012
-#: src/dialogs.c:4118
-#: src/dialogs.c:4777
-#: src/multi.c:781
-#: src/multi.c:911
-#: src/prpl.c:150
-#: src/prpl.c:224
+#: 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:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "取消"
 
@@ -2093,21 +1944,16 @@
 msgid "Join"
 msgstr "加入"
 
-#: src/buddy_chat.c:393
-#: src/buddy_chat.c:396
-#: src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "邀請"
 
-#: src/buddy_chat.c:412
-#: src/dialogs.c:1301
-#: src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "好友"
 
 #: src/buddy_chat.c:417
-#: src/prefs.c:2004
 msgid "Message"
 msgstr "訊息"
 
@@ -2115,77 +1961,72 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀請好友進入聊天室"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/buddy_chat.c:870
-#: src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "忽略使用者"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933
-#: src/buddy_chat.c:1045
-#: src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
-#, c-format
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
+#, fuzzy, c-format
 msgid "%d %s in room"
-msgstr "聊天室有 %d 家伙"
-
-#: src/buddy_chat.c:941
+msgstr "沒有人在這個房間"
+
+# #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+# #: src/buddy_chat.c:1544
+# #, c-format
+# msgid "%d %s in room"
+# msgstr "聊天室有 %d 家伙"
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim - 群組聊天"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "主題:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/buddy_chat.c:1333
-#: src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "悄悄話"
 
-#: src/buddy_chat.c:1338
-#: src/buddy_chat.c:1415
-#: src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "送出"
 
-#: src/buddy_chat.c:1458
-#: src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "堵住他的嘴!"
 
-#: src/buddy_chat.c:1460
-#: src/conversation.c:2891
-#: src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "警告"
 
@@ -2201,8 +2042,7 @@
 msgid "Unable to send message: too large"
 msgstr "無法送出訊息:太大了"
 
-#: src/conversation.c:1336
-#: src/conversation.c:1340
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "訊息錯誤"
 
@@ -2220,586 +2060,570 @@
 msgid "Setting position to %d\n"
 msgstr ""
 
-#: src/conversation.c:2170
-#: src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "粗體文字"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "粗體"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "斜體文字"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "斜體"
 
-#: src/conversation.c:2178
-#: src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "底線文字"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "底線"
 
-#: src/conversation.c:2183
-#: src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "刪除的文字"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "刪除"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "縮小字體"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "小"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "正常字體大小"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "正常"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "增大字體"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "大"
 
-#: src/conversation.c:2202
-#: src/dialogs.c:2883
-#: src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "字型"
 
-#: src/conversation.c:2206
-#: src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "文字顏色"
 
-#: src/conversation.c:2207
-#: src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "顏色"
 
-#: src/conversation.c:2211
-#: src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "背景顏色"
 
-#: src/conversation.c:2218
-#: src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "連結"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "加入一個笑臉"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "微笑"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Insert IM Image"
 msgstr "加入即時訊息影像"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 msgid "Image"
 msgstr "影像"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "開始記錄日誌"
 
-#: src/conversation.c:2233
-#: src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "登入中"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "儲存交談內容"
 
-#: src/conversation.c:2243
-#: src/dialogs.c:1682
-#: src/dialogs.c:1866
-#: src/dialogs.c:3220
-#: src/dialogs.c:3908
-#: src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "儲存"
 
-#: src/conversation.c:2247
-#: src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "音效"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - 交談"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "送出訊息為:"
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 儲存圖示"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr "關閉動畫"
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 msgid "Enable Animation"
 msgstr "開啟動畫"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 msgid "Save Icon As..."
 msgstr "儲存圖示為…"
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - 警告使用者?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "你真的想警告 %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "警告所有的匿名者?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr ""
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "由好友名單移除 '%s'。\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - 移除 %s?"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
-msgid "You are about to remove '%s' from\n"
+msgid ""
+"You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
-msgstr "您正試著將 '%s'  從您的好友清單\n"
+msgstr ""
+"您正試著將 '%s'  從您的好友清單\n"
 "中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:529
-#: src/prpl.c:154
-#: src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "接受"
 
-#. Build OK Button
-#: src/dialogs.c:635
-#: src/dialogs.c:720
-#: src/dialogs.c:821
-#: src/dialogs.c:1477
-#: src/dialogs.c:1806
-#: src/dialogs.c:1957
-#: src/dialogs.c:2265
-#: src/dialogs.c:2445
-#: src/dialogs.c:2511
-#: src/dialogs.c:4017
-#: src/dialogs.c:4123
-#: src/multi.c:786
+#: 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:1830
 msgid "OK"
 msgstr "確定"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - 即時訊息使用者"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "將即時訊息送給:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "使用者:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 msgid "Account:"
 msgstr "帳號:"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 取得使用者資訊"
 
-#: src/dialogs.c:940
+#: src/dialogs.c:965
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - 加入群組"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 新增好友"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 msgid "Contact"
 msgstr "連絡"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 msgid "Add To"
 msgstr "增加到"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - 離開!"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr ""
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "允許所有的使用者和我聯絡"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "允許下列的使用者和我聯絡"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "允許清單"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "拒絕所有使用者"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "拒絕以下的使用者"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "拒絕清單"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友來進行狀態捕捉。"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "好友狀態捕捉錯誤"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - 新增好友狀態捕捉"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr "要捕捉誰的狀態"
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 msgid "Account"
 msgstr "帳號"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "好友登入"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "好友暫離"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "好友回來"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 msgid "Pounce when buddy is typing to you"
 msgstr "當好友正在發訊息給你時"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 msgid "Pounce Action"
 msgstr "對應的動作"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 msgid "Open IM Window"
 msgstr "開啟即時訊息視窗"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr "跳出通知"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "執行指令"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "播放音效"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "儲存設定(這樣才能在每次事件發生時發生作用)"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 設定目錄資訊"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "目錄資訊"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允許在 Web 搜尋來檢視您的個人資訊"
 
-#. Line 1
-#: src/dialogs.c:1579
-#: src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "名"
 
-#. Line 2
-#: src/dialogs.c:1590
-#: src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr ""
 
-#. Line 3
-#: src/dialogs.c:1602
-#: src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "姓"
 
-#. Line 4
-#: src/dialogs.c:1613
-#: src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr ""
 
-#. Line 6
-#: src/dialogs.c:1635
-#: src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "省"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "新密碼並不相符"
 
-#: src/dialogs.c:1700
-#: src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - 修改密碼錯誤"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "把所有的表格都填了"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "舊密碼"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "新密碼"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 設定使用者資訊"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "以下是您所做查詢的結果:"
 
-#: src/dialogs.c:2074
-#: src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "許可"
 
-#: src/dialogs.c:2076
-#: src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "拒絕"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - 加入許可"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - 增加禁止人"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - 記錄交談"
 
-#: src/dialogs.c:2260
-#: src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "找尋好友"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 以資訊找尋好友"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - 以 Email 來找尋好友"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - 增加 URL"
 
-#: src/dialogs.c:2708
-#: src/dialogs.c:2729
-#: src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr "匯入到:"
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 匯入好友名單"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "您不能建立一個沒有原因的離開訊息"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - 新的離開訊息"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "使用"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 為好友加上別名"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - 儲存日誌檔"
 
-#: src/dialogs.c:3603
+#: src/dialogs.c:3981
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "無法刪除檔案 %s - %s"
 
-#: src/dialogs.c:3631
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "真的要清除日誌嗎?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "確定"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 msgid "Conversation"
 msgstr "交談"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - 修改群組名稱"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/dialogs.c:3998
-#: src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "新名字:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - 修改好友名稱"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "修改好友名稱"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - 選擇 Perl 命令稿"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
 msgstr "無法開啟設定檔 %s。"
 
-#: src/gaimrc.c:1137
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "偏好設定錯誤"
 
@@ -2812,9 +2636,7 @@
 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 src/module.c:122
 msgid "Plugin Error"
 msgstr "插件錯誤"
 
@@ -2830,8 +2652,7 @@
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/multi.c:513
-#: src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "重置"
 
@@ -2871,69 +2692,82 @@
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: src/multi.c:947
-msgid "You cannot log this account in; you do not have the protocol it uses loaded, or the protocol does not have a login function."
-msgstr "您無法使用這個帳號來登入;您可能沒有設定這個帳號所使用的 Protocol,或者這個 Protocol 並沒有提供登入的功能。"
-
-#: src/multi.c:949
+#: src/multi.c:948
+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:978
+#: src/multi.c:954
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
+msgstr ""
+"您無法使用這個帳號來登入;您可能沒有設定這個帳號所使用的 Protocol,或者這個 "
+"Protocol 並沒有提供登入的功能。"
+
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - 帳號管理"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "全部選取"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "選取自動登入"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "取消選取"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "修改"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "登入/登出"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "刪除"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
-msgid "%s\n"
+msgid ""
+"%s\n"
 "%s: %s"
-msgstr "%s\n"
+msgstr ""
+"%s\n"
 "%s: %s"
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s 無法登入"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 msgid "Notice"
 msgstr "通知"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s 已經登出"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 msgid "Connection Error"
 msgstr "連線錯誤"
 
@@ -2941,726 +2775,541 @@
 msgid "Perl Scripts"
 msgstr "Perl 命令稿"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - 插件列表"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - 插件"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "已載入的插件"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "全部選取"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "檔案路徑:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "讀取"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "由檔案讀取一個插件"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "設定"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "設定被選取的插件"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "重新讀取"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "重新讀取被選取的插件"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "移除"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "移除被選取的插件"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "關閉這個視窗"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "一般選項"
-
-#: src/prefs.c:200
-#: src/prefs.c:384
-#: src/prefs.c:552
-#: src/prefs.c:667
-#: src/prefs.c:921
-#: src/prefs.c:1071
-#: src/prefs.c:1296
-#: src/prefs.c:1629
-#: src/prefs.c:1901
-#: src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "所有的選項將在設定後馬上生效。"
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "雜項"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "使用沒有邊框的按鈕"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "顯示好友狀態走馬燈"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "顯示除錯視窗"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr "通知您的好友您正在發訊息給他們"
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "報告閒置時間"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "無"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Gaim 使用"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "X 使用"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "記錄所有的交談內容"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "將交談記錄中的 HTML 標籤去除"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "記錄好友的登入/登出"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "記錄好友的閒置/取消閒置"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "記錄好友離開/回來"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "記錄您自已登入/閒置/離開等狀態"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "使用個別的檔案來記錄每一個好友的登入"
+#, fuzzy
+msgid "Windows"
+msgstr "即時訊息視窗"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "瀏覽器"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "預設為彈出個一新的視窗"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME URL Handler"
-
-#: src/prefs.c:306
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr "使用者自定(%s for URL)"
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "代理伺服器選項"
-
-#: src/prefs.c:388
-msgid "Not all protocols can use these proxy options. Please see the README file for details."
-msgstr "並不是所有的通訊協定都可以使用這些代理伺服器的選項。\n"
-"請參考 README 來獲得更進一步的資訊。"
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "代理伺服器型態"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "代理伺服器"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "沒有代理伺服器"
-
-#: src/prefs.c:420
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgid "Show Buddy Ticker"
+msgstr "顯示好友狀態走馬燈"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "顯示除錯視窗"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "省"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "使用沒有邊框的按鈕"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "刪除的文字"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "取消"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "加入一個笑臉"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "選取"
+
+#: src/prefs.c:345
+msgid "Use custom size"
+msgstr ""
+
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "文字顏色"
+
+#: src/prefs.c:385
+#, fuzzy
+msgid "Background color"
+msgstr "背景顏色"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "顯示所有的笑臉圖示"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "顯示訊息時間"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "顯示 URL 為超連結"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "標示出錯誤的拼字"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "忽略顏色"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "忽略字型"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "忽略字體大小"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "主機位址"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "端口"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "使用者"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "密碼"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "好友名單選項"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "好友名單視窗"
-
-#: src/prefs.c:569
-msgid "Tab Placement:"
-msgstr "Tab 位置:"
-
-#: src/prefs.c:573
-#: src/prefs.c:1004
-#: src/prefs.c:1154
-msgid "Top"
-msgstr "視窗上方"
-
-#: src/prefs.c:574
-#: src/prefs.c:1006
-#: src/prefs.c:1156
-msgid "Bottom"
-msgstr "視窗下方"
-
-#: src/prefs.c:586
+msgid "Ignore TiK Automated Messages"
+msgstr "忽略 Tik 自動訊息"
+
+#: src/prefs.c:459
+msgid "Enter sends message"
+msgstr "按下 Enter 送出訊息"
+
+#: src/prefs.c:460
+msgid "Control-Enter sends message"
+msgstr "按下 Ctrl-Enter 送出訊息"
+
+#: src/prefs.c:469
+msgid "Escape closes window"
+msgstr "按下 Escape 關閉視窗"
+
+#: src/prefs.c:470
+msgid "Control-W closes window"
+msgstr "按下 Ctrl-W 關閉視窗"
+
+#: src/prefs.c:480
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "按下 Ctrl-{B/I/U/S} 加入 HTML 標籤"
+
+#: src/prefs.c:481
+msgid "Control-(number) inserts smileys"
+msgstr "按下 CTRL-(Number) 來加入一個笑臉"
+
+#: src/prefs.c:500
 msgid "Hide IM/Info/Chat buttons"
 msgstr "隱藏「即時訊息、資訊、聊天」按鍵"
 
-#: src/prefs.c:588
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "在按鍵上顯示圖示"
+
+#: src/prefs.c:511
 msgid "Automatically show buddy list on sign on"
 msgstr "在登入時自動顯示好友名單"
 
-#: src/prefs.c:590
+#: src/prefs.c:513
 msgid "Display Buddy List near applet"
 msgstr ""
 
-#: src/prefs.c:593
+#: src/prefs.c:516
 msgid "Save Window Size/Position"
 msgstr "保存視窗的大小和位置"
 
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "在按鍵上顯示圖示"
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "當事件發生時,將視窗提到最上方"
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "隱藏目前沒有線上好友的群組"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "顯示群組裡的好友數目"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "顯示好友類別圖示"
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "顯示警告等級"
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "顯示閒置時間"
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr "把閒置的好友設為灰色"
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "新視窗寬度:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "新視窗高度:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "輸入欄位的高度:"
+
+#: src/prefs.c:571 src/prefs.c:633
+msgid "Raise windows on events"
+msgstr "當事件發生時,將視窗提到最上方"
+
+#: src/prefs.c:572
+msgid "Hide window on send"
+msgstr "送出訊息後關閉視穿"
+
+#: src/prefs.c:581
+msgid "Hide Buddy Icons"
+msgstr "隱藏好友圖示"
+
+#: src/prefs.c:582
+msgid "Disable Buddy Icon Animation"
+msgstr "關閉好友圖示動畫"
+
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "在視窗中顯示登入訊息"
 
 #: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "群組顯示"
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "隱藏目前沒有線上好友的群組"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "顯示群組裡的好友數目"
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "好友顯示"
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "顯示好友類別圖示"
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "顯示警告等級"
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "顯示閒置時間"
+msgid "Notify buddies that you are typing to them"
+msgstr "通知您的好友您正在發訊息給他們"
 
 #: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr "把閒置的好友設為灰色"
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "交談選項"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "鍵盤選單"
-
-#: src/prefs.c:683
-msgid "Enter sends message"
-msgstr "按下 Enter 送出訊息"
-
-#: src/prefs.c:684
-msgid "Control-Enter sends message"
-msgstr "按下 Ctrl-Enter 送出訊息"
-
-#: src/prefs.c:685
-msgid "Escape closes window"
-msgstr "按下 Escape 關閉視窗"
-
-#: src/prefs.c:686
-msgid "Control-W closes window"
-msgstr "按下 Ctrl-W 關閉視窗"
-
-#: src/prefs.c:692
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "按下 Ctrl-{B/I/U/S} 加入 HTML 標籤"
-
-#: src/prefs.c:693
-msgid "Control-(number) inserts smileys"
-msgstr "按下 CTRL-(Number) 來加入一個笑臉"
+msgid "Tab-Complete Nicks"
+msgstr ""
+
+#: src/prefs.c:643
+msgid "Old-Style Tab Completion"
+msgstr ""
+
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "在視窗中顯示其他人進入或離開的事件"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
+
+#: src/prefs.c:679
+msgid "Show aliases in tabs/titles"
+msgstr ""
 
 #: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "按 F2 顯示時間戳記"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "顯示及一般選項"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "顯示所有的笑臉圖示"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "顯示訊息時間"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "顯示 URL 為超連結"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "標示出錯誤的拼字"
-
-#: src/prefs.c:712
-#: src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "送出訊息時取消離開狀態"
-
-#: src/prefs.c:713
-#: src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "在離開時,將所有的新訊息置入佇列中"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "忽略顏色"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "忽略字型"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "忽略字體大小"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "忽略 Tik 自動訊息"
-
-#: src/prefs.c:723
-#: src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "在離開時,忽略新的交談"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "即時訊息選項"
-
-#: src/prefs.c:925
-#: src/prefs.c:2921
-msgid "IM Window"
-msgstr "即時訊息視窗"
-
-#: src/prefs.c:941
-#: src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "顯示按鍵為:"
-
-#: src/prefs.c:945
-#: src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "圖形與文字"
-
-#: src/prefs.c:946
-#: src/prefs.c:1098
-msgid "Pictures"
-msgstr "圖形"
-
-#: src/prefs.c:947
-#: src/prefs.c:1099
-msgid "Text"
-msgstr "文字"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "將所有的交談顯示在同一個有標籤的視窗中"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
-
-#: src/prefs.c:967
-#: src/prefs.c:1119
-msgid "Raise windows on events"
-msgstr "當事件發生時,將視窗提到最上方"
-
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "在視窗中顯示登入訊息"
-
-#: src/prefs.c:969
-msgid "Show aliases in tabs/titles/ticker"
-msgstr ""
-
-#: src/prefs.c:970
-msgid "Hide window on send"
-msgstr "送出訊息後關閉視穿"
-
-#: src/prefs.c:972
-#: src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "視窗大小"
-
-#: src/prefs.c:980
-#: src/prefs.c:1130
-msgid "New window width:"
-msgstr "新視窗寬度:"
-
-#: src/prefs.c:981
-#: src/prefs.c:1131
-msgid "New window height:"
-msgstr "新視窗高度:"
-
-#: src/prefs.c:982
-#: src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "輸入欄位的高度:"
-
-#: src/prefs.c:984
-#: src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "Tab 位置"
-
-#: src/prefs.c:1013
-#: src/prefs.c:1163
-msgid "Left"
-msgstr "視窗左側"
-
-#: src/prefs.c:1015
-#: src/prefs.c:1165
-msgid "Right"
-msgstr "視窗右側"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "好友圖示"
-
-#: src/prefs.c:1031
-msgid "Hide Buddy Icons"
-msgstr "隱藏好友圖示"
-
-#: src/prefs.c:1037
-msgid "Disable Buddy Icon Animation"
-msgstr "關閉好友圖示動畫"
-
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "聊天選項"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "群組聊天視窗"
-
-#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
 
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "將所有的交談顯示在同一個有標籤的視窗中"
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "在視窗中顯示其他人進入或離開的事件"
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr ""
-
-#: src/prefs.c:1180
-msgid "Tab-Complete Nicks"
-msgstr ""
-
-#: src/prefs.c:1186
-msgid "Old-Style Tab Completion"
-msgstr ""
-
-#: src/prefs.c:1288
-#: src/prefs.c:2931
-msgid "Font Options"
-msgstr "字型選項"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "斜体文字"
-
-#: src/prefs.c:1358
-#: src/prefs.c:1376
-#: src/prefs.c:1398
-msgid "Select"
-msgstr "選取"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "文字的字型"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "文字的字體大小"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - 音效設定"
-
-#: src/prefs.c:1543
-msgid "Test"
-msgstr "測試"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "選擇…"
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "音效選項"
-
-#: src/prefs.c:1649
+#: src/prefs.c:704
+#, fuzzy
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "代理伺服器"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "主機位址"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "端口"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "使用者"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "密碼"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "預設為彈出個一新的視窗"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "記錄所有的交談內容"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "將交談記錄中的 HTML 標籤去除"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "記錄好友的登入/登出"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "記錄好友的閒置/取消閒置"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "記錄好友離開/回來"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "記錄您自已登入/閒置/離開等狀態"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "使用個別的檔案來記錄每一個好友的登入"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "當登入時不啟動音效"
 
-#: src/prefs.c:1655
-#: src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "離開時發出音效"
 
-#: src/prefs.c:1665
-msgid "Sound method"
-msgstr "聲音模式"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, c-format
-msgid "Sound command\n"
+msgid ""
+"Sound command\n"
 "(%s for filename)"
-msgstr "音效指令\n"
+msgstr ""
+"音效指令\n"
 "(%s for filename)"
 
-#: src/prefs.c:1751
-msgid "Sound played when:"
-msgstr "播放音效,當:"
-
-#: src/prefs.c:1893
-#: src/prefs.c:2953
-msgid "Away Messages"
-msgstr "離開訊息"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "送出訊息時取消離開狀態"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "在離開時,將所有的新訊息置入佇列中"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "在離開時,忽略新的交談"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "不要送出自動回應"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "送出自動回應的間隔時間(秒):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "自動離開,經過"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "使用的分鐘數"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "訊息"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - 音效設定"
+
+#: src/prefs.c:1338
+msgid "Test"
+msgstr "測試"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "選擇…"
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "編輯"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "編輯"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "設定為離開狀態"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "隱私選項"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
+#: src/prefs.c:1655
+msgid "Interface"
+msgstr ""
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "字型"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "訊息送出"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "允許所有的使用者和我聯絡"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "允許下列的使用者和我聯絡"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "允許清單"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "拒絕所有使用者"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "拒絕以下的使用者"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "拒絕清單"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "即時訊息視窗"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "群組聊天視窗"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "代理伺服器"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "瀏覽器"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "音效"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "音效"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "離開原因:"
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "離開訊息"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - 偏好設定"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim 除錯視窗"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "一般"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "代理伺服器"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "交談"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "音效"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "隱私"
-
 #: src/prpl.c:70
-msgid "You have attempted to load a protocol which was not compiled from the same version of the source as this application was. Unfortunately, because it is not the same version I cannot safely tell you which one it was. Needless to say, it was not successfully loaded."
+msgid ""
+"You have attempted to load a protocol which was not compiled from the same "
+"version of the source as this application was. Unfortunately, because it is "
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
 msgstr ""
 
 #: src/prpl.c:74
 msgid "Protocol Error"
 msgstr "通訊協定錯誤"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "Protocol 相關設定"
+
+#: src/prpl.c:101
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr ""
 
-#: src/prpl.c:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "中止連線"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "接受?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - 提示"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 msgid "Gaim - New Mail"
 msgstr "Gaim - 新郵件"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr "開啟郵件"
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/prpl.c:578
+#: src/prpl.c:586
 msgid ""
 "\n"
 "\n"
@@ -3670,19 +3319,21 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/prpl.c:621
-msgid "You do not currently have any protocols available that are able to register new accounts."
+#: src/prpl.c:629
+msgid ""
+"You do not currently have any protocols available that are able to register "
+"new accounts."
 msgstr "您的系統中並未存在任何可供您註冊一個新帳號的通訊協定。"
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 msgid "Gaim - Registration"
 msgstr "Gaim - 註冊"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr "註冊資訊"
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "註冊"
 
@@ -3690,28 +3341,28 @@
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d 個訊息)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:783
+#: src/server.c:808
 msgid "Warned"
 msgstr "警告"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Yes"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1076
+#: src/server.c:1101
 msgid "More Info"
 msgstr "更多資訊"
 
@@ -3755,3 +3406,186 @@
 msgid "Someone says your name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
+#~ msgid "General Options"
+#~ msgstr "一般選項"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr "所有的選項將在設定後馬上生效。"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "雜項"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "報告閒置時間"
+
+#~ msgid "None"
+#~ msgstr "無"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Gaim 使用"
+
+#~ msgid "X Use"
+#~ msgstr "X 使用"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URL Handler"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ 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."
+#~ msgstr ""
+#~ "並不是所有的通訊協定都可以使用這些代理伺服器的選項。\n"
+#~ "請參考 README 來獲得更進一步的資訊。"
+
+#~ msgid "Proxy Type"
+#~ msgstr "代理伺服器型態"
+
+#~ msgid "No Proxy"
+#~ msgstr "沒有代理伺服器"
+
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS 4"
+
+#~ msgid "SOCKS 5"
+#~ msgstr "SOCKS 5"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ 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 "交談選項"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "鍵盤選單"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "按 F2 顯示時間戳記"
+
+#~ msgid "Display and General Options"
+#~ msgstr "顯示及一般選項"
+
+#~ msgid "IM Options"
+#~ msgstr "即時訊息選項"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "顯示按鍵為:"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "圖形與文字"
+
+#~ msgid "Pictures"
+#~ msgstr "圖形"
+
+#~ msgid "Text"
+#~ msgstr "文字"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "將所有的交談顯示在同一個有標籤的視窗中"
+
+#~ msgid "Window Sizes"
+#~ msgstr "視窗大小"
+
+#~ msgid "Tab Placement"
+#~ msgstr "Tab 位置"
+
+#~ msgid "Left"
+#~ msgstr "視窗左側"
+
+#~ msgid "Right"
+#~ msgstr "視窗右側"
+
+#~ msgid "Buddy Icons"
+#~ msgstr "好友圖示"
+
+#~ msgid "Chat Options"
+#~ msgstr "聊天選項"
+
+#~ msgid "Show conversations in the same tabbed window"
+#~ msgstr "將所有的交談顯示在同一個有標籤的視窗中"
+
+#~ msgid "Font Options"
+#~ msgstr "字型選項"
+
+#~ msgid "Italic Text"
+#~ msgstr "斜体文字"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "文字的字型"
+
+#~ msgid "Font Size for Text"
+#~ msgstr "文字的字體大小"
+
+#~ msgid "Sound Options"
+#~ msgstr "音效選項"
+
+#~ msgid "Sound method"
+#~ msgstr "聲音模式"
+
+#~ msgid "Sound played when:"
+#~ msgstr "播放音效,當:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "送出自動回應的間隔時間(秒):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "自動離開,經過"
+
+#~ msgid "minutes using"
+#~ msgstr "使用的分鐘數"
+
+#~ msgid "Messages"
+#~ msgstr "訊息"
+
+#~ msgid "Make Away"
+#~ msgstr "設定為離開狀態"
+
+#~ msgid "Privacy Options"
+#~ msgstr "隱私選項"
+
+#~ msgid "General"
+#~ msgstr "一般"
+
+#~ msgid "Conversations"
+#~ msgstr "交談"