changeset 1783:950a3e2be27d

[gaim-migrate @ 1793] Who knows if it'll be called this or not. Might as well go ahead and change the version numbers anyway. committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Mon, 30 Apr 2001 18:52:47 +0000 (2001-04-30)
parents 40467268932e
children cf7806e63d0c
files ChangeLog NEWS configure.in po/de.po po/es.po po/fr.po po/ko.po po/zh_CN.po
diffstat 8 files changed, 3690 insertions(+), 3018 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Apr 30 17:57:16 2001 +0000
+++ b/ChangeLog	Mon Apr 30 18:52:47 2001 +0000
@@ -1,5 +1,7 @@
 GAIM: The Pimpin' Penguin IM Clone thats good for the soul! 
 
+version 0.11.0-pre12:
+
 version 0.11.0-pre11 (04/30/2001):
 	* Zephyr updates and additions, thanks Neil Sanchala (nsanch)
 	* Jabber can send/accept chat invites (due to mid)
--- a/NEWS	Mon Apr 30 17:57:16 2001 +0000
+++ b/NEWS	Mon Apr 30 18:52:47 2001 +0000
@@ -1,5 +1,7 @@
 -=[ GAIM ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
+version 0.11.0-pre12:
+
 0.11.0-pre11 (04/30/2001):
 	Rob: I bought a big carton of juice today.  It is now 50% empty.
 	A lot of the plugins got some new options and/or improvements. I
--- a/configure.in	Mon Apr 30 17:57:16 2001 +0000
+++ b/configure.in	Mon Apr 30 18:52:47 2001 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.11.0pre11])
+AM_INIT_AUTOMAKE([gaim], [0.11.0pre12])
 
 dnl Checks for programs.
 AC_ENABLE_STATIC(no)
--- a/po/de.po	Mon Apr 30 17:57:16 2001 +0000
+++ b/po/de.po	Mon Apr 30 18:52:47 2001 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2001-04-13 17:07-0700\n"
+"POT-Creation-Date: 2001-04-30 10:14-0700\n"
 "PO-Revision-Date: 2000-06-07 22:42+0000\n"
 "Last-Translator: Marcel Becker <MBeckerHH1@aol.com>\n"
 "Language-Team: German <de@li.org>\n"
@@ -14,35 +14,47 @@
 "Content-Type: text/plain; charset=iso-8859\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/icq/gaim_icq.c:401 src/oscar.c:2261 src/toc.c:918
+#: plugins/msn/msn.c:1222
+msgid "Gaim-MSN: New Mail"
+msgstr ""
+
+#. Build OK Button
+#: plugins/msn/msn.c:1236 src/dialogs.c:611 src/dialogs.c:701
+#: src/dialogs.c:761 src/dialogs.c:1281 src/dialogs.c:1619 src/dialogs.c:1732
+#: src/dialogs.c:2084 src/dialogs.c:2270 src/dialogs.c:2338 src/dialogs.c:3854
+#: src/dialogs.c:3942 src/multi.c:479
+msgid "OK"
+msgstr "OK"
+
+#: plugins/icq/gaim_icq.c:401 src/oscar.c:2362 src/toc.c:918
 #, fuzzy
 msgid "Get Info"
 msgstr "Benutzer-Info"
 
-#: plugins/yay/yay.c:172
+#: plugins/yay/yay.c:174
 msgid "Your message did not get sent."
 msgstr ""
 
-#: plugins/yay/yay.c:172 src/dialogs.c:3067 src/dialogs.c:3074
-#: src/oscar.c:1309 src/oscar.c:1314 src/oscar.c:1350 src/oscar.c:1369
-#: src/oscar.c:1405
+#: plugins/yay/yay.c:174 src/dialogs.c:3071 src/dialogs.c:3078
+#: src/oscar.c:1410 src/oscar.c:1415 src/oscar.c:1451 src/oscar.c:1470
+#: src/oscar.c:1506
 msgid "Gaim - Error"
 msgstr "gAIM - Fehler"
 
-#: plugins/yay/yay.c:190
+#: plugins/yay/yay.c:192
 #, c-format
 msgid "%s has made %s their buddy%s%s"
 msgstr ""
 
-#: plugins/yay/yay.c:192
+#: plugins/yay/yay.c:194
 #, fuzzy
 msgid "Gaim - Buddy"
 msgstr "gAIM - Buddy hinzuf�gen"
 
-#: plugins/yay/yay.c:236 src/about.c:179 src/aim.c:301 src/buddy.c:2387
-#: src/buddy_chat.c:910 src/buddy_chat.c:1046 src/buddy_chat.c:1073
-#: src/conversation.c:2077 src/dialogs.c:434 src/dialogs.c:3817
-#: src/multi.c:686 src/plugins.c:319 src/prefs.c:1971 src/prpl.c:355
+#: plugins/yay/yay.c:238 src/about.c:179 src/aim.c:303 src/buddy.c:2584
+#: src/buddy_chat.c:919 src/buddy_chat.c:1055 src/buddy_chat.c:1082
+#: src/conversation.c:2110 src/dialogs.c:440 src/dialogs.c:3719
+#: src/multi.c:686 src/plugins.c:321 src/prefs.c:2176 src/prpl.c:355
 msgid "Close"
 msgstr "Schlie�en"
 
@@ -66,61 +78,61 @@
 msgid "Web Site"
 msgstr ""
 
-#: src/aim.c:135 src/buddy.c:2380
+#: src/aim.c:137 src/buddy.c:2577
 msgid "Signoff"
 msgstr "Abmelden"
 
-#: src/aim.c:147
+#: src/aim.c:149
 msgid "Please enter your logon"
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:850
+#: src/aim.c:149 src/aim.c:154 src/multi.c:850
 #, fuzzy
 msgid "Signon Error"
 msgstr "Los"
 
-#: src/aim.c:152
+#: src/aim.c:154
 #, fuzzy
 msgid "Please enter your password"
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:246
+#: src/aim.c:248
 msgid "Gaim - Login"
 msgstr "Gaim - Anmeldung"
 
-#: src/aim.c:264
+#: src/aim.c:266
 msgid "Screen Name: "
 msgstr "Benutzername: "
 
-#: src/aim.c:278
+#: src/aim.c:280
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/aim.c:299 src/buddy.c:2384
+#: src/aim.c:301 src/buddy.c:2581
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/aim.c:304 src/aim.c:641 src/buddy.c:2443
+#: src/aim.c:306 src/aim.c:642 src/buddy.c:2640
 msgid "Accounts"
 msgstr ""
 
-#: src/aim.c:306 src/multi.c:590
+#: src/aim.c:308 src/multi.c:590
 msgid "Signon"
 msgstr "Los"
 
-#: src/aim.c:338 src/prpl.c:359
+#: src/aim.c:340 src/prpl.c:359
 msgid "Register"
 msgstr "Neu"
 
-#: src/aim.c:339
+#: src/aim.c:341 src/prefs.c:1382 src/prefs.c:1593
 msgid "Options"
 msgstr "Einstellungen"
 
-#: src/aim.c:341 src/aim.c:644 src/buddy.c:2460
+#: src/aim.c:343 src/aim.c:645 src/buddy.c:2657
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:638 src/buddy.c:2452
+#: src/aim.c:639 src/buddy.c:2649
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -137,11 +149,11 @@
 msgid "Offilne. Click to bring up login box."
 msgstr "Offline. Hier klicken, um das Anmeldefenster zu �ffnen."
 
-#: src/applet.c:169 src/buddy.c:2398
+#: src/applet.c:169 src/buddy.c:2595
 msgid "Away"
 msgstr "Abwesenheit"
 
-#: src/applet.c:172 src/away.c:266
+#: src/applet.c:172 src/away.c:342
 msgid "New Away Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
@@ -153,130 +165,135 @@
 msgid "About..."
 msgstr "�ber..."
 
-#: src/away.c:96
+#: src/away.c:157
 msgid "I'm Back!"
 msgstr "Ich bin zur�ck"
 
-#: src/away.c:133
+#: src/away.c:210
 msgid "Gaim - Away!"
 msgstr "Gaim - Abwesenheit!"
 
-#: src/away.c:147 src/away.c:228 src/away.c:393
+#: src/away.c:224 src/away.c:304 src/away.c:469
 msgid "Back"
 msgstr "Zur�ck"
 
-#: src/away.c:286
+#: src/away.c:362
 msgid "Remove Away Message"
 msgstr "Abwesenheits-Mitteilung l�schen"
 
-#: src/away.c:462
+#: src/away.c:538
 msgid "Set All Away"
 msgstr ""
 
 #. Put the buttons in the box
-#: src/buddy.c:266 src/buddy.c:2528 src/buddy_chat.c:1078
-#: src/conversation.c:1772 src/conversation.c:2092 src/dialogs.c:872
-#: src/dialogs.c:996 src/dialogs.c:1897 src/multi.c:670 src/prefs.c:798
-#: src/prefs.c:1460 src/prefs.c:1811 src/prefs.c:1845
+#: src/buddy.c:437 src/buddy.c:2725 src/buddy_chat.c:1087
+#: src/conversation.c:1793 src/conversation.c:2125 src/dialogs.c:878
+#: src/dialogs.c:1002 src/dialogs.c:1898 src/multi.c:670 src/prefs.c:971
+#: src/prefs.c:1705 src/prefs.c:2016 src/prefs.c:2050
 msgid "Add"
 msgstr "Hinzuf�gen"
 
-#: src/buddy.c:267 src/buddy.c:2529 src/dialogs.c:882 src/dialogs.c:978
+#: src/buddy.c:438 src/buddy.c:2726 src/dialogs.c:888 src/dialogs.c:984
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:268 src/buddy.c:2530 src/buddy_chat.c:1080
-#: src/conversation.c:1758 src/conversation.c:2089 src/prefs.c:799
-#: src/prefs.c:1474 src/prefs.c:1815 src/prefs.c:1849
+#: src/buddy.c:439 src/buddy.c:2727 src/buddy_chat.c:1089
+#: src/conversation.c:1779 src/conversation.c:2122 src/prefs.c:972
+#: src/prefs.c:1719 src/prefs.c:2020 src/prefs.c:2054
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/buddy.c:271 src/buddy.c:1912 src/buddy.c:2271
+#: src/buddy.c:442 src/buddy.c:2113 src/buddy.c:2468
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:272 src/buddy.c:464 src/buddy.c:2269 src/buddy_chat.c:478
-#: src/buddy_chat.c:863
+#: src/buddy.c:443 src/buddy.c:654 src/buddy.c:764 src/buddy.c:2466
+#: src/buddy_chat.c:475 src/buddy_chat.c:872
 msgid "IM"
 msgstr "Telegramm"
 
-#: src/buddy.c:273 src/buddy.c:2270 src/buddy_chat.c:491 src/buddy_chat.c:871
-#: src/buddy_chat.c:1086 src/conversation.c:2110
+#: src/buddy.c:444 src/buddy.c:2467 src/buddy_chat.c:488 src/buddy_chat.c:880
+#: src/buddy_chat.c:1095 src/conversation.c:2143
 msgid "Info"
 msgstr "Info"
 
 #. Put the buttons in the box
-#: src/buddy.c:470 src/buddy.c:575 src/dialogs.c:972 src/dialogs.c:3432
-#: src/dialogs.c:3447 src/dialogs.c:3524 src/dialogs.c:3539
+#: src/buddy.c:660 src/buddy.c:770 src/dialogs.c:978 src/dialogs.c:3426
+#: src/dialogs.c:3441
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:476 src/buddy.c:589
+#: src/buddy.c:666 src/buddy.c:790
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alert Hinzuf�gen"
 
-#: src/buddy.c:482 src/buddy.c:595
+#: src/buddy.c:672 src/buddy.c:796
 msgid "View Log"
 msgstr ""
 
-#: src/buddy.c:582
+#: src/buddy.c:752 src/buddy.c:784
+#, fuzzy
+msgid "Rename"
+msgstr "Entfernen"
+
+#: src/buddy.c:777
 msgid "Un-Alias"
 msgstr ""
 
-#: src/buddy.c:1590
+#: src/buddy.c:1791
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alert"
 
-#: src/buddy.c:1608
+#: src/buddy.c:1809
 msgid "Remove Buddy Pounce"
 msgstr "L�sche Buddy-Alert"
 
-#: src/buddy.c:1903
+#: src/buddy.c:2104
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "Buddy-Alert"
 
-#: src/buddy.c:1906
+#: src/buddy.c:2107
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1909
+#: src/buddy.c:2110
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1915
+#: src/buddy.c:2116
 #, fuzzy
 msgid "Get File"
 msgstr "Datei"
 
-#: src/buddy.c:1918
+#: src/buddy.c:2119
 #, fuzzy
 msgid "Send File"
 msgstr "Datei"
 
-#: src/buddy.c:1921
+#: src/buddy.c:2122
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:1924
+#: src/buddy.c:2125
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:1976
+#: src/buddy.c:2177
 #, fuzzy, c-format
 msgid "Logged in: %s\n"
 msgstr "Melde an %s\n"
 
-#: src/buddy.c:1987
+#: src/buddy.c:2188
 msgid "Warnings: %d%%\n"
 msgstr "Warnungen: %d%%\n"
 
-#: src/buddy.c:1999
+#: src/buddy.c:2200
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:2003
+#: src/buddy.c:2204
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -287,537 +304,537 @@
 "Angemeldet seit: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:2007
+#: src/buddy.c:2208
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-#: src/buddy.c:2076
+#: src/buddy.c:2277
+#, fuzzy, c-format
+msgid "%s logged in."
+msgstr "%s ist zur Zeit nicht online."
+
+#: src/buddy.c:2329
 #, c-format
-msgid "<B>%s logged in%s%s.</B>"
+msgid "%s logged out."
 msgstr ""
 
-#: src/buddy.c:2130
-#, c-format
-msgid "<B>%s logged out%s%s.</B>"
-msgstr ""
-
-#: src/buddy.c:2296
+#: src/buddy.c:2493
 msgid "Information on selected Buddy"
 msgstr "Info �ber gew�hlten Buddy"
 
-#: src/buddy.c:2297 src/dialogs.c:671
+#: src/buddy.c:2494 src/dialogs.c:677
 msgid "Send Instant Message"
 msgstr "Telegramm"
 
-#: src/buddy.c:2298
+#: src/buddy.c:2495
 msgid "Start/join a Buddy Chat"
 msgstr "Chat starten"
 
-#: src/buddy.c:2362
+#: src/buddy.c:2559
 msgid "File"
 msgstr "Datei"
 
-#: src/buddy.c:2366
+#: src/buddy.c:2563
 msgid "Add A Buddy"
 msgstr "Buddy Hinzuf�gen"
 
-#: src/buddy.c:2368
+#: src/buddy.c:2565
 msgid "Join A Chat"
 msgstr ""
 
-#: src/buddy.c:2370
+#: src/buddy.c:2567
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Telegramm"
 
-#: src/buddy.c:2375
+#: src/buddy.c:2572
 msgid "Import Buddy List"
 msgstr "Buddy-Liste importieren"
 
-#: src/buddy.c:2377
+#: src/buddy.c:2574
 msgid "Export Buddy List"
 msgstr "Buddy-Liste exportieren"
 
-#: src/buddy.c:2393
+#: src/buddy.c:2590
 msgid "Tools"
 msgstr "Tools"
 
-#: src/buddy.c:2403
+#: src/buddy.c:2600
 msgid "Buddy Pounce"
 msgstr "Buddy-Alert"
 
-#: src/buddy.c:2412 src/dialogs.c:2078 src/dialogs.c:2245
+#: src/buddy.c:2609 src/dialogs.c:2079 src/dialogs.c:2246
 msgid "Search for Buddy"
 msgstr "Buddies suchen"
 
-#: src/buddy.c:2415
+#: src/buddy.c:2612
 msgid "by Email"
 msgstr "nach Email"
 
-#: src/buddy.c:2419
+#: src/buddy.c:2616
 msgid "by Dir Info"
 msgstr "nach Profil"
 
-#: src/buddy.c:2426 src/buddy.c:2427
+#: src/buddy.c:2623 src/buddy.c:2624
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/buddy.c:2430
+#: src/buddy.c:2627
 msgid "User Info"
 msgstr "Benutzer-Info"
 
-#: src/buddy.c:2434 src/dialogs.c:1356
+#: src/buddy.c:2631 src/dialogs.c:1362
 msgid "Directory Info"
 msgstr "Profil"
 
-#: src/buddy.c:2438 src/dialogs.c:1547
+#: src/buddy.c:2635 src/dialogs.c:1553
 msgid "Change Password"
 msgstr ""
 
-#: src/buddy.c:2447
+#: src/buddy.c:2644
 #, fuzzy
 msgid "Protocol Actions"
 msgstr "Einstellungen"
 
-#: src/buddy.c:2454
+#: src/buddy.c:2651
 msgid "View System Log"
 msgstr ""
 
-#: src/buddy.c:2465
+#: src/buddy.c:2662
 #, fuzzy
 msgid "Perl"
 msgstr "Zulassen"
 
-#: src/buddy.c:2468
+#: src/buddy.c:2665
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2472
+#: src/buddy.c:2669
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2476
+#: src/buddy.c:2673
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2484
+#: src/buddy.c:2681
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/buddy.c:2489
+#: src/buddy.c:2686
 #, fuzzy
 msgid "About Gaim"
 msgstr "Info �ber"
 
-#: src/buddy.c:2508 src/prefs.c:2215
+#: src/buddy.c:2705 src/prefs.c:2425
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: src/buddy.c:2562
+#: src/buddy.c:2759
 msgid "Add a new Buddy"
 msgstr "Buddy Hinzuf�gen"
 
-#: src/buddy.c:2563
+#: src/buddy.c:2760
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Buddy Hinzuf�gen"
 
-#: src/buddy.c:2564
+#: src/buddy.c:2761
 msgid "Remove selected Buddy"
 msgstr "Gew�hlten Buddy entfernen"
 
-#: src/buddy.c:2589
+#: src/buddy.c:2786
 msgid "Online"
 msgstr "Online"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2788
 msgid "Edit Buddies"
 msgstr "Budies bearbeiten"
 
-#: src/buddy.c:2628
+#: src/buddy.c:2825
 msgid "Gaim - Buddy List"
 msgstr "gAIM - Buddy-Liste"
 
-#: src/buddy_chat.c:160
+#: src/buddy_chat.c:157
 msgid "Join Chat"
 msgstr ""
 
-#: src/buddy_chat.c:167 src/buddy_chat.c:978 src/buddy_chat.c:990
+#: src/buddy_chat.c:164 src/buddy_chat.c:987 src/buddy_chat.c:999
 msgid "Buddy Chat"
 msgstr "Buddy-Chat"
 
-#: src/buddy_chat.c:177
+#: src/buddy_chat.c:174
 msgid "Join what group:"
 msgstr "An wlecher Gruppe teinlnehmen:"
 
-#: src/buddy_chat.c:190
+#: src/buddy_chat.c:187
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "An wlecher Gruppe teinlnehmen:"
 
-#: src/buddy_chat.c:202
+#: src/buddy_chat.c:199
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:209
+#: src/buddy_chat.c:206
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:217 src/buddy_chat.c:262 src/dialogs.c:404
-#: src/dialogs.c:690 src/dialogs.c:750 src/dialogs.c:874 src/dialogs.c:991
-#: src/dialogs.c:1270 src/dialogs.c:1480 src/dialogs.c:1608 src/dialogs.c:1673
-#: src/dialogs.c:1886 src/dialogs.c:2084 src/dialogs.c:2264 src/dialogs.c:2338
-#: src/dialogs.c:3200 src/dialogs.c:3434 src/dialogs.c:3526 src/dialogs.c:3713
-#: src/multi.c:475 src/multi.c:586 src/multi.c:833 src/prpl.c:156
-#: src/prpl.c:227
+#: src/buddy_chat.c:214 src/buddy_chat.c:259 src/dialogs.c:410
+#: src/dialogs.c:696 src/dialogs.c:756 src/dialogs.c:880 src/dialogs.c:997
+#: src/dialogs.c:1276 src/dialogs.c:1486 src/dialogs.c:1614 src/dialogs.c:1679
+#: src/dialogs.c:1887 src/dialogs.c:2085 src/dialogs.c:2265 src/dialogs.c:2339
+#: src/dialogs.c:3204 src/dialogs.c:3428 src/dialogs.c:3619 src/dialogs.c:3849
+#: src/dialogs.c:3937 src/multi.c:475 src/multi.c:586 src/multi.c:833
+#: src/prpl.c:156 src/prpl.c:227
 msgid "Cancel"
 msgstr "Ende"
 
-#: src/buddy_chat.c:222
+#: src/buddy_chat.c:219
 msgid "Join"
 msgstr "Teilnehmen"
 
-#: src/buddy_chat.c:263 src/buddy_chat.c:916 src/buddy_chat.c:1045
+#: src/buddy_chat.c:260 src/buddy_chat.c:925 src/buddy_chat.c:1054
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/buddy_chat.c:279
+#: src/buddy_chat.c:276
 msgid "Invite who?"
 msgstr "Wen einladen"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:280
 msgid "With message:"
 msgstr "Mit Nachricht:"
 
-#: src/buddy_chat.c:307
+#: src/buddy_chat.c:304
 msgid "Invite to Buddy Chat"
 msgstr "Zum Buddy-Chat einladen"
 
-#: src/buddy_chat.c:484 src/buddy_chat.c:867
+#: src/buddy_chat.c:481 src/buddy_chat.c:876
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: src/buddy_chat.c:536 src/buddy_chat.c:642
+#: src/buddy_chat.c:533 src/buddy_chat.c:639
 #, c-format
 msgid "%d %s in room"
 msgstr ""
 
-#: src/buddy_chat.c:543
+#: src/buddy_chat.c:540
 #, c-format
-msgid "<B>%s entered the room.</B>"
+msgid "%s entered the room."
 msgstr ""
 
-#: src/buddy_chat.c:606
+#: src/buddy_chat.c:603
 #, c-format
-msgid "<B>%s is now known as %s</B>"
+msgid "%s is now known as %s"
 msgstr ""
 
-#: src/buddy_chat.c:649
+#: src/buddy_chat.c:646
 #, c-format
-msgid "<B>%s left the room.</B>"
+msgid "%s left the room."
 msgstr ""
 
-#: src/buddy_chat.c:776
+#: src/buddy_chat.c:773
 #, fuzzy
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Abwesenheit!"
 
-#: src/buddy_chat.c:844
+#: src/buddy_chat.c:853
 msgid "0 people in room"
 msgstr ""
 
-#: src/buddy_chat.c:921 src/buddy_chat.c:1044
+#: src/buddy_chat.c:930 src/buddy_chat.c:1053
 msgid "Whisper"
 msgstr "Fl�stern"
 
-#: src/buddy_chat.c:926 src/buddy_chat.c:1042 src/buddy_chat.c:1088
-#: src/conversation.c:2121
+#: src/buddy_chat.c:935 src/buddy_chat.c:1051 src/buddy_chat.c:1097
+#: src/conversation.c:2154
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:1082 src/conversation.c:2098
+#: src/buddy_chat.c:1091 src/conversation.c:2131
 msgid "Block"
 msgstr "Sperren"
 
-#: src/buddy_chat.c:1084 src/conversation.c:2104 src/dialogs.c:374
-#: src/dialogs.c:399
+#: src/buddy_chat.c:1093 src/conversation.c:2137 src/dialogs.c:380
+#: src/dialogs.c:405
 msgid "Warn"
 msgstr "Warnen"
 
-#: src/conversation.c:352
+#: src/conversation.c:365
 #, fuzzy
 msgid "Gaim - Save Conversation"
 msgstr "gAIM - Telegramm-Mitschnitt"
 
-#: src/conversation.c:503
+#: src/conversation.c:518
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr ""
 
-#: src/conversation.c:1068
+#: src/conversation.c:1083
 #, c-format
 msgid "Currently at %d, "
 msgstr ""
 
-#: src/conversation.c:1076
+#: src/conversation.c:1091
 #, c-format
 msgid "Setting position to %d\n"
 msgstr ""
 
-#: src/conversation.c:1602
+#: src/conversation.c:1623
 msgid "Bold"
 msgstr "Fetter"
 
-#: src/conversation.c:1602 src/prefs.c:974
+#: src/conversation.c:1623 src/prefs.c:1147
 msgid "Bold Text"
 msgstr "Fetter Text"
 
-#: src/conversation.c:1606 src/conversation.c:1607
+#: src/conversation.c:1627 src/conversation.c:1628
 msgid "Italics"
 msgstr "Kursiver"
 
-#: src/conversation.c:1606 src/prefs.c:975
+#: src/conversation.c:1627 src/prefs.c:1148
 msgid "Italics Text"
 msgstr "Kursiver Text"
 
-#: src/conversation.c:1610 src/conversation.c:1611
+#: src/conversation.c:1631 src/conversation.c:1632
 msgid "Underline"
 msgstr "Unterstrichener"
 
-#: src/conversation.c:1610
+#: src/conversation.c:1631
 msgid "Underline Text"
 msgstr "Unterstrichener Text"
 
-#: src/conversation.c:1615
+#: src/conversation.c:1636
 msgid "Strike"
 msgstr "Durchgestrichener through"
 
-#: src/conversation.c:1615
+#: src/conversation.c:1636
 msgid "Strike through Text"
 msgstr "Durchgestrichener through Text"
 
-#: src/conversation.c:1621
+#: src/conversation.c:1642
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:1621
+#: src/conversation.c:1642
 msgid "Decrease font size"
 msgstr "Schrift kleiner"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1645
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1645
 msgid "Normal font size"
 msgstr "Schrift normal"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1648
 msgid "Big"
 msgstr "Gro�"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1648
 msgid "Increase font size"
 msgstr "Schrift gr�er"
 
-#: src/conversation.c:1634 src/conversation.c:1635
+#: src/conversation.c:1655 src/conversation.c:1656
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/conversation.c:1634 src/dialogs.c:2687 src/dialogs.c:2703
+#: src/conversation.c:1655 src/dialogs.c:2691 src/dialogs.c:2707
 msgid "Select Font"
 msgstr "Schriftart w�hlen "
 
-#: src/conversation.c:1638 src/conversation.c:1639 src/conversation.c:1643
+#: src/conversation.c:1659 src/conversation.c:1660 src/conversation.c:1664
 msgid "Color"
 msgstr "Farbe"
 
-#: src/conversation.c:1638 src/prefs.c:988
+#: src/conversation.c:1659 src/prefs.c:1161
 msgid "Text Color"
 msgstr "Text-Farbe"
 
-#: src/conversation.c:1643 src/prefs.c:1006
+#: src/conversation.c:1664 src/prefs.c:1179
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1650 src/conversation.c:1651
+#: src/conversation.c:1671 src/conversation.c:1672
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:1650 src/dialogs.c:2332
+#: src/conversation.c:1671 src/dialogs.c:2333
 msgid "Insert Link"
 msgstr "Link einf�gen"
 
-#: src/conversation.c:1654
+#: src/conversation.c:1675
 #, fuzzy
 msgid "Smiley"
 msgstr "Datei"
 
-#: src/conversation.c:1654
+#: src/conversation.c:1675
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1661 src/conversation.c:1662 src/prefs.c:2202
+#: src/conversation.c:1682 src/conversation.c:1683 src/prefs.c:245
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: src/conversation.c:1661
+#: src/conversation.c:1682
 msgid "Enable logging"
 msgstr "Mitschnitt ein"
 
-#: src/conversation.c:1671 src/conversation.c:1672 src/dialogs.c:1485
-#: src/dialogs.c:1678 src/dialogs.c:3212 src/dialogs.c:3826
+#: src/conversation.c:1692 src/conversation.c:1693 src/dialogs.c:1491
+#: src/dialogs.c:1684 src/dialogs.c:3216 src/dialogs.c:3728
 msgid "Save"
 msgstr "Speichern"
 
-#: src/conversation.c:1671
+#: src/conversation.c:1692
 #, fuzzy
 msgid "Save Conversation"
 msgstr "Alles Mitschneiten"
 
-#: src/conversation.c:1676 src/conversation.c:1677
+#: src/conversation.c:1697 src/conversation.c:1698
 msgid "Sound"
 msgstr "Kl�nge"
 
-#: src/conversation.c:1676
+#: src/conversation.c:1697
 msgid "Enable sounds"
 msgstr "Kl�nge aktivieren"
 
-#: src/conversation.c:1964
+#: src/conversation.c:1985
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "gAIM - Telegramm-Mitschnitt"
 
-#: src/conversation.c:2039
+#: src/conversation.c:2072
 #, fuzzy
 msgid "Send message as: "
 msgstr "Enter verschickt Nachricht"
 
-#: src/dialogs.c:361
+#: src/dialogs.c:367
 msgid "Gaim - Warn user?"
 msgstr "gAIM - Benutzer warnen?"
 
-#: src/dialogs.c:382
+#: src/dialogs.c:388
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Wollen Sie %s wirklich verwarnen?"
 
-#: src/dialogs.c:387
+#: src/dialogs.c:393
 msgid "Warn anonymously?"
 msgstr "Anonym warnen?"
 
-#: src/dialogs.c:391
+#: src/dialogs.c:397
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyme Warnungen sind weniger wirkungsvoll"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:473
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Konnte Datei %s nicht schrieben."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:476
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Konnte Datei %s nicht lesen."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:479
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Nachricht zu lange, letzten %s Bytes abgeschnitten."
 
-#: src/dialogs.c:476
+#: src/dialogs.c:482
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ist zur Zeit nicht online."
 
-#: src/dialogs.c:479
+#: src/dialogs.c:485
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Verwarnung von %s nicht erlaubt."
 
-#: src/dialogs.c:482
+#: src/dialogs.c:488
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Eine Nachricht ging verloren. Sie �berschreiten die Geschwindigkeit des "
 "Servers."
 
-#: src/dialogs.c:485
+#: src/dialogs.c:491
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s ist nicht verf�gbar."
 
-#: src/dialogs.c:488
+#: src/dialogs.c:494
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: src/dialogs.c:491
+#: src/dialogs.c:497
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu gro� war."
 
-#: src/dialogs.c:494
+#: src/dialogs.c:500
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu schnell gesendet "
 "wurde."
 
-#: src/dialogs.c:497
+#: src/dialogs.c:503
 msgid "Failure."
 msgstr "Fehler."
 
-#: src/dialogs.c:500
+#: src/dialogs.c:506
 msgid "Too many matches."
 msgstr "Zu viele �bereinstimmungen."
 
-#: src/dialogs.c:503
+#: src/dialogs.c:509
 msgid "Need more qualifiers."
 msgstr "Ben�tige mehr Angaben."
 
-#: src/dialogs.c:506
+#: src/dialogs.c:512
 msgid "Dir service temporarily unavailable."
 msgstr "Profil-Service ist zur Zeit nicht verf�gbar."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:515
 msgid "Email lookup restricted."
 msgstr "eMail-Suche eingeschr�nkt."
 
-#: src/dialogs.c:512
+#: src/dialogs.c:518
 msgid "Keyword ignored."
 msgstr "Stichwort ignoriert."
 
-#: src/dialogs.c:515
+#: src/dialogs.c:521
 msgid "No keywords."
 msgstr "Keine Stichw�rter."
 
-#: src/dialogs.c:518
+#: src/dialogs.c:524
 msgid "User has no directory information."
 msgstr "Der Benutzer hat kein Profil."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:528
 msgid "Country not supported."
 msgstr "Land nicht unterst�tzt."
 
-#: src/dialogs.c:525
+#: src/dialogs.c:531
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Unbekannter Fehler: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:528 src/oscar.c:524
+#: src/dialogs.c:534 src/oscar.c:525
 msgid "Incorrect nickname or password."
 msgstr "Ung�lter Benutzername oder Passwort."
 
-#: src/dialogs.c:531
+#: src/dialogs.c:537
 msgid "The service is temporarily unavailable."
 msgstr "Der Service ist zur Zeit nicht erreichbar."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:540
 msgid "Your warning level is currently too high to log in."
 msgstr "Ihr Warnlevel ist zur Zeit zu hoch, um sich anzumelden."
 
-#: src/dialogs.c:537
+#: src/dialogs.c:543
 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."
@@ -825,380 +842,397 @@
 "Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
 "versuchen Sie es noch einmal."
 
-#: src/dialogs.c:540
+#: src/dialogs.c:546
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Unbekannter Anmeldungsfehler: %s."
 
-#: src/dialogs.c:543
+#: src/dialogs.c:549
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Unbekannter Fehler: %d. Info: %s"
 
-#: src/dialogs.c:546
+#: src/dialogs.c:552
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "gAIM - Fehler %d"
 
-#. Build OK Button
-#: src/dialogs.c:605 src/dialogs.c:695 src/dialogs.c:755 src/dialogs.c:1275
-#: src/dialogs.c:1613 src/dialogs.c:1726 src/dialogs.c:2083 src/dialogs.c:2269
-#: src/dialogs.c:2337 src/multi.c:479
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:661
+#: src/dialogs.c:667
 msgid "Gaim - IM user"
 msgstr "gAIM - Telegramm"
 
-#: src/dialogs.c:678
+#: src/dialogs.c:684
 #, fuzzy
 msgid "IM who:"
 msgstr "Telegramm an:"
 
-#: src/dialogs.c:726
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "Benutzer-Info"
 
-#: src/dialogs.c:733
+#: src/dialogs.c:739
 msgid "User:"
 msgstr ""
 
 #. Finish up
-#: src/dialogs.c:761
+#: src/dialogs.c:767
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "gAIM - Mitgliederinfo"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:833
 msgid "Buddies"
 msgstr "Buddies"
 
-#: src/dialogs.c:880
+#: src/dialogs.c:886
 #, fuzzy
 msgid "Add Group"
 msgstr "Gruppe"
 
-#: src/dialogs.c:910
+#: src/dialogs.c:916
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "gAIM - Buddy hinzuf�gen"
 
-#: src/dialogs.c:937
+#: src/dialogs.c:943
 msgid "Gaim - Add Buddy"
 msgstr "gAIM - Buddy hinzuf�gen"
 
-#: src/dialogs.c:951
+#: src/dialogs.c:957
 msgid "Add Buddy"
 msgstr "Buddy hinzuf�gen"
 
-#: src/dialogs.c:961 src/dialogs.c:3442 src/dialogs.c:3534
+#: src/dialogs.c:967 src/dialogs.c:3436
 msgid "Buddy"
 msgstr "Buddy"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:1021
 #, fuzzy
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:1021
 #, fuzzy
 msgid "Buddy Pounce Error"
 msgstr "Buddy-Alert"
 
-#: src/dialogs.c:1084
+#: src/dialogs.c:1090
 msgid "Pounce buddy as:"
 msgstr ""
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1140
 msgid "Gaim - New Buddy Pounce"
 msgstr "gAIM - Neuer Buddy-Alert"
 
-#: src/dialogs.c:1151
+#: src/dialogs.c:1157
 #, fuzzy
 msgid "Buddy:"
 msgstr "Buddy"
 
-#: src/dialogs.c:1166
+#: src/dialogs.c:1172
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1171
+#: src/dialogs.c:1177
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1175
+#: src/dialogs.c:1181
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1183
+#: src/dialogs.c:1189
 #, fuzzy
 msgid "Open IM window on pounce"
 msgstr "�ffne Telegrammfenster wenn Buddy sich anmeldet"
 
-#: src/dialogs.c:1188
+#: src/dialogs.c:1194
 #, fuzzy
 msgid "Send IM on pounce"
 msgstr "Schicke Telegramm wenn Buddy sich anmeldet"
 
-#: src/dialogs.c:1197
+#: src/dialogs.c:1203
 #, fuzzy
 msgid "Message:"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:1209
+#: src/dialogs.c:1215
 #, fuzzy
 msgid "Execute command on pounce"
 msgstr "Schicke Telegramm wenn Buddy sich anmeldet"
 
-#: src/dialogs.c:1218
+#: src/dialogs.c:1224
 msgid "Command:"
 msgstr ""
 
-#: src/dialogs.c:1231
+#: src/dialogs.c:1237
 #, fuzzy
 msgid "Play sound on pounce"
 msgstr "Schicke Telegramm wenn Buddy sich anmeldet"
 
-#: src/dialogs.c:1240
+#: src/dialogs.c:1246
 #, fuzzy
 msgid "Sound:"
 msgstr "Kl�nge"
 
-#: src/dialogs.c:1257
+#: src/dialogs.c:1263
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1352
 msgid "Gaim - Set Dir Info"
 msgstr "gAIM - Profil anlegen"
 
-#: src/dialogs.c:1378
+#: src/dialogs.c:1384
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Erm�glicht Personen Ihr Profil im Web zu finden"
 
 #. Line 1
-#: src/dialogs.c:1381 src/dialogs.c:2102
+#: src/dialogs.c:1387 src/dialogs.c:2103
 msgid "First Name"
 msgstr "Vorname"
 
 #. Line 2
-#: src/dialogs.c:1392 src/dialogs.c:2114
+#: src/dialogs.c:1398 src/dialogs.c:2115
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
 #. Line 3
-#: src/dialogs.c:1404 src/dialogs.c:2126
+#: src/dialogs.c:1410 src/dialogs.c:2127
 msgid "Last Name"
 msgstr "Nachname"
 
 #. Line 4
-#: src/dialogs.c:1415 src/dialogs.c:2138
+#: src/dialogs.c:1421 src/dialogs.c:2139
 msgid "Maiden Name"
 msgstr "M�dchenname"
 
 #. Line 5
-#: src/dialogs.c:1426 src/dialogs.c:2150
+#: src/dialogs.c:1432 src/dialogs.c:2151
 msgid "City"
 msgstr "Stadt"
 
 #. Line 6
-#: src/dialogs.c:1437 src/dialogs.c:2161
+#: src/dialogs.c:1443 src/dialogs.c:2162
 msgid "State"
 msgstr "Provinz/Bundesland"
 
 #. Line 7
-#: src/dialogs.c:1448 src/dialogs.c:2172
+#: src/dialogs.c:1454 src/dialogs.c:2173
 msgid "Country"
 msgstr "Land"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1509
 msgid "New Passwords Do Not Match"
 msgstr "Die neuen Passw�rter stimmen nicht �berein"
 
-#: src/dialogs.c:1503 src/dialogs.c:1508
+#: src/dialogs.c:1509 src/dialogs.c:1514
 msgid "Gaim - Change Password Error"
 msgstr "gAIM - Fehler Passwort �ndern"
 
-#: src/dialogs.c:1508
+#: src/dialogs.c:1514
 msgid "Fill out all fields completely"
 msgstr "Bitte alle Felder komplett ausf�llen"
 
-#: src/dialogs.c:1535 src/toc.c:561
+#: src/dialogs.c:1541 src/toc.c:561
 msgid "Gaim - Password Change"
 msgstr "gAIM - Password �nderung"
 
-#: src/dialogs.c:1566
+#: src/dialogs.c:1572
 msgid "Original Password"
 msgstr "Altes Passwort"
 
-#: src/dialogs.c:1580
+#: src/dialogs.c:1586
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: src/dialogs.c:1594
+#: src/dialogs.c:1600
 msgid "New Password (again)"
 msgstr "Neues Passwort (Wiederholen)"
 
-#: src/dialogs.c:1639
+#: src/dialogs.c:1645
 msgid "Gaim - Set User Info"
 msgstr "gAIM - Mitgliederinfo"
 
-#: src/dialogs.c:1737
+#: src/dialogs.c:1743
 msgid "Below are the results of your search: "
 msgstr "Das Resultat Ihrer Suche:"
 
-#: src/dialogs.c:1876 src/dialogs.c:1883
+#: src/dialogs.c:1877 src/dialogs.c:1884
 msgid "Permit"
 msgstr "Zulassen"
 
-#: src/dialogs.c:1878 src/dialogs.c:1885
+#: src/dialogs.c:1879 src/dialogs.c:1886
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: src/dialogs.c:1926
+#: src/dialogs.c:1927
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "gAIM - Sperren/Zulassen hinzuf�gen"
 
-#: src/dialogs.c:1928
+#: src/dialogs.c:1929
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "gAIM - Sperren/Zulassen hinzuf�gen"
 
-#: src/dialogs.c:1999
+#: src/dialogs.c:2000
 msgid "Gaim - Log Conversation"
 msgstr "gAIM - Telegramm-Mitschnitt"
 
-#: src/dialogs.c:2209
+#: src/dialogs.c:2210
 msgid "Gaim - Find Buddy By Info"
 msgstr "gAIM - Buddy nach Profil finden"
 
-#: src/dialogs.c:2239
+#: src/dialogs.c:2240
 msgid "Gaim - Find Buddy By Email"
 msgstr "gAIM - Buddy nach eMail-Adresse suchen"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2253
 msgid "Email"
 msgstr "eMail"
 
-#: src/dialogs.c:2351
+#: src/dialogs.c:2352
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2359
+#: src/dialogs.c:2360
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2386
 msgid "GAIM - Add URL"
 msgstr "gAIM - Url hinzuf�gen"
 
-#: src/dialogs.c:2526 src/dialogs.c:2539 src/dialogs.c:2576
+#: src/dialogs.c:2529 src/dialogs.c:2542 src/dialogs.c:2579
 msgid "Select Text Color"
 msgstr "Textfarbe w�hlen"
 
-#: src/dialogs.c:2563
+#: src/dialogs.c:2566
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Textfarbe w�hlen"
 
-#: src/dialogs.c:2808
+#: src/dialogs.c:2812
 #, c-format
 msgid "Error writing file %s"
 msgstr "Fehler beim Schreiben von %s"
 
-#: src/dialogs.c:2809 src/dialogs.c:2931 src/dialogs.c:3674 src/oscar.c:1824
-#: src/oscar.c:2241 src/toc.c:1398 src/toc.c:1415 src/toc.c:1503
+#: src/dialogs.c:2813 src/dialogs.c:2935 src/dialogs.c:3580 src/oscar.c:1923
+#: src/oscar.c:2342 src/toc.c:1398 src/toc.c:1415 src/toc.c:1503
 #: src/toc.c:1680 src/toc.c:1710
 msgid "Error"
 msgstr "Fehler"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2866
 msgid "Gaim - Export Buddy List"
 msgstr "gAIM - Buddy-Liste speichern"
 
-#: src/dialogs.c:2930
+#: src/dialogs.c:2934
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: src/dialogs.c:3004
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "gAIM - Buddy-Liste laden"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3067
+#: src/dialogs.c:3071
 msgid "You cannot create an away message with a blank title"
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3074
+#: src/dialogs.c:3078
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:3141
+#: src/dialogs.c:3145
 msgid "Gaim - New away message"
 msgstr "gAIM - Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3155
 #, fuzzy
 msgid "New away message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3164
+#: src/dialogs.c:3168
 msgid "Away title: "
 msgstr "Abwesenheits-Titel:"
 
-#: src/dialogs.c:3204
+#: src/dialogs.c:3208
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3208
+#: src/dialogs.c:3212
 msgid "Save & Use"
 msgstr ""
 
 #. show everything
-#: src/dialogs.c:3377
+#: src/dialogs.c:3381
 #, fuzzy
 msgid "Smile!"
 msgstr "Datei"
 
-#: src/dialogs.c:3440 src/dialogs.c:3532
+#: src/dialogs.c:3434
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Buddy hinzuf�gen"
 
-#: src/dialogs.c:3477 src/dialogs.c:3569
+#: src/dialogs.c:3471
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "gAIM - Buddy hinzuf�gen"
 
-#: src/dialogs.c:3641
+#: src/dialogs.c:3545
 #, fuzzy
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Anmeldung"
 
-#: src/dialogs.c:3672
+#: src/dialogs.c:3578
 #, fuzzy, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Konnte Datei %s nicht lesen."
 
-#: src/dialogs.c:3703
+#: src/dialogs.c:3609
 msgid "Really clear log?"
 msgstr ""
 
-#: src/dialogs.c:3721
+#: src/dialogs.c:3627
 #, fuzzy
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3821
+#: src/dialogs.c:3723
 #, fuzzy
 msgid "Clear"
 msgstr "Schlie�en"
 
+#: src/dialogs.c:3818
+#, fuzzy
+msgid "Gaim - Rename Group"
+msgstr "gAIM - Buddy hinzuf�gen"
+
+#: src/dialogs.c:3828
+msgid "Rename Group"
+msgstr ""
+
+#: src/dialogs.c:3835 src/dialogs.c:3923
+#, fuzzy
+msgid "New name:"
+msgstr "Benutzername: "
+
+#: src/dialogs.c:3906
+#, fuzzy
+msgid "Gaim - Rename Buddy"
+msgstr "gAIM - Buddy hinzuf�gen"
+
+#: src/dialogs.c:3916
+#, fuzzy
+msgid "Rename Buddy"
+msgstr "gAIM - Buddy hinzuf�gen"
+
 #: src/gaimrc.c:880
 #, c-format
 msgid "Could not open config file %s."
@@ -1227,7 +1261,7 @@
 msgid "Receieved: '%s'\n"
 msgstr "Empfangen: '%s'\n"
 
-#: src/multi.c:357 src/prefs.c:114
+#: src/multi.c:357 src/prefs.c:188
 #, fuzzy
 msgid "General Options"
 msgstr "Einstellungen"
@@ -1254,10 +1288,6 @@
 msgid "Auto-Login"
 msgstr ""
 
-#: src/multi.c:389
-msgid "Send KeepAlive packet (6 bytes/second)"
-msgstr ""
-
 #: src/multi.c:454
 #, fuzzy
 msgid "Gaim - Modify Account"
@@ -1294,78 +1324,78 @@
 "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
+#: src/oscar.c:295 src/oscar.c:312 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "Verbindung unterbrochen"
 
-#: src/oscar.c:302
+#: src/oscar.c:303
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/oscar.c:310
+#: src/oscar.c:311
 #, fuzzy
 msgid "major connection error\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/oscar.c:323 src/toc.c:545
+#: src/oscar.c:324 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:324
+#: src/oscar.c:325
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Fehler"
 
-#: src/oscar.c:334
+#: src/oscar.c:335
 #, fuzzy
 msgid "Chat is currently unavailable"
 msgstr "Chat in %s ist nicht verf�gbar."
 
-#: src/oscar.c:335
+#: src/oscar.c:336
 #, fuzzy
 msgid "Gaim - Chat"
 msgstr "Gaim - Abwesenheit!"
 
-#: src/oscar.c:382
+#: src/oscar.c:383
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Melde an %s\n"
 
-#: src/oscar.c:420
+#: src/oscar.c:421
 msgid "internal connection error\n"
 msgstr "Interner Verbindungsfehler\n"
 
-#: src/oscar.c:421
+#: src/oscar.c:422
 msgid "Unable to login to AIM"
 msgstr "Anmeldung nicht m�glich"
 
-#: src/oscar.c:426
+#: src/oscar.c:427
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "Konnte Server nicht finden\n"
 
-#: src/oscar.c:430
+#: src/oscar.c:431
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "Keine Verbindung zum Server\n"
 
-#: src/oscar.c:437
+#: src/oscar.c:438
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: src/oscar.c:447
+#: src/oscar.c:448
 msgid "Password sent, waiting for response\n"
 msgstr "Passwort �bertragen, warte auf Antwort\n"
 
-#: src/oscar.c:475
+#: src/oscar.c:476
 msgid "Signed off.\n"
 msgstr "Abgemeldet.\n"
 
 #. connecting too frequently
-#: src/oscar.c:519
+#: src/oscar.c:520
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1375,65 +1405,65 @@
 "versuchen Sie es noch einmal."
 
 #. client too old
-#: src/oscar.c:529
+#: src/oscar.c:530
 #, fuzzy
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 "Ihre AIM-Software ist zu alt. Aktuelle Software finden Sie auf "
 "http://www.aim.de"
 
-#: src/oscar.c:533 src/toc.c:341
+#: src/oscar.c:534 src/toc.c:341
 msgid "Authentication Failed"
 msgstr ""
 
-#: src/oscar.c:563
+#: src/oscar.c:564
 msgid "Internal Error"
 msgstr ""
 
-#: src/oscar.c:567
+#: src/oscar.c:568
 msgid "Could Not Connect"
 msgstr ""
 
-#: src/oscar.c:601
+#: src/oscar.c:603
 msgid "Connection established, cookie sent"
 msgstr ""
 
-#: src/oscar.c:858 src/oscar.c:2125
+#: src/oscar.c:959 src/oscar.c:2226
 #, c-format
-msgid "<B>Direct IM with %s established</B>"
+msgid "Direct IM with %s established"
 msgstr ""
 
 #. message too large
-#: src/oscar.c:1308
+#: src/oscar.c:1409
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu gro� war."
 
-#: src/oscar.c:1313
+#: src/oscar.c:1414
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1348
+#: src/oscar.c:1449
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1349 src/oscar.c:1368
+#: src/oscar.c:1450 src/oscar.c:1469
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1367
+#: src/oscar.c:1468
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1403
+#: src/oscar.c:1504
 #, c-format
 msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1410
+#: src/oscar.c:1511
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1447,25 +1477,25 @@
 "SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1448
+#: src/oscar.c:1549
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1449
+#: src/oscar.c:1550
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:2182
+#: src/oscar.c:2283
 #, c-format
-msgid "<B>Direct IM with %s closed</B>"
+msgid "Direct IM with %s closed"
 msgstr ""
 
-#: src/oscar.c:2241
+#: src/oscar.c:2342
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "Anmeldung nicht m�glich"
 
-#: src/oscar.c:2251
+#: src/oscar.c:2352
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1473,17 +1503,17 @@
 "continue?"
 msgstr ""
 
-#: src/oscar.c:2268
+#: src/oscar.c:2369
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Abwesenht."
 
-#: src/oscar.c:2276
+#: src/oscar.c:2377
 #, fuzzy
 msgid "Direct IM"
 msgstr "Profil"
 
-#: src/oscar.c:2468
+#: src/oscar.c:2569
 msgid ""
 "Unfortunately, currently Oscar only allows new user registration by going to "
 "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
@@ -1491,545 +1521,606 @@
 msgstr ""
 
 #. Below is basically stolen from plugins.c
-#: src/perl.c:638
+#: src/perl.c:647
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "gAIM - Mitgliederinfo"
 
-#: src/perl.c:686
+#: src/perl.c:695
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:105
+#: src/plugins.c:107
 msgid "Gaim - Plugin List"
 msgstr ""
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:216
+#: src/plugins.c:188 src/plugins.c:194 src/plugins.c:218
 msgid "Plugin Error"
 msgstr ""
 
-#: src/plugins.c:272
+#: src/plugins.c:274
 msgid "Gaim - Plugins"
 msgstr ""
 
 #. Build the bottom button bar
-#: src/plugins.c:301
+#: src/plugins.c:303
 msgid "Load Plugin"
 msgstr ""
 
-#: src/plugins.c:307
+#: src/plugins.c:309
 msgid "Configure Plugin"
 msgstr ""
 
-#: src/plugins.c:313
+#: src/plugins.c:315
 msgid "Unload Plugin"
 msgstr ""
 
-#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
-#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
-#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1762
+#: src/prefs.c:196 src/prefs.c:338 src/prefs.c:437 src/prefs.c:638
+#: src/prefs.c:1143 src/prefs.c:1378 src/prefs.c:1589 src/prefs.c:1967
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:126
-msgid "Use borderless buttons (requires restart for some buttons)"
+#: src/prefs.c:208
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/prefs.c:216
+msgid "Use borderless buttons"
 msgstr ""
 
-#: src/prefs.c:128
-msgid "Show Buddy Ticker after restart"
-msgstr ""
-
-#: src/prefs.c:132
+#: src/prefs.c:221
+#, fuzzy
+msgid "Show Buddy Ticker"
+msgstr "Neuer Buddy-Alert"
+
+#: src/prefs.c:227
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:144
-msgid "Report Idle Times:"
+#: src/prefs.c:231
+msgid "Report Idle Times"
 msgstr ""
 
-#: src/prefs.c:147
+#: src/prefs.c:239
 msgid "None"
 msgstr ""
 
-#: src/prefs.c:148
+#: src/prefs.c:240
 #, fuzzy
 msgid "GAIM Use"
 msgstr "gAIM"
 
-#: src/prefs.c:150
+#: src/prefs.c:242
 msgid "X Use"
 msgstr ""
 
-#: src/prefs.c:224
+#: src/prefs.c:253
+#, fuzzy
+msgid "Log all conversations"
+msgstr "Alles Mitschneiten"
+
+#: src/prefs.c:254
 #, fuzzy
-msgid "Browser Options"
-msgstr "Einstellungen"
-
-#: src/prefs.c:236
-msgid "Netscape"
+msgid "Strip HTML from logs"
+msgstr "HTML aus Mitschnitt entfernen"
+
+#: src/prefs.c:260
+msgid "Log when buddies sign on/sign off"
 msgstr ""
 
-#: src/prefs.c:237
-msgid "KFM"
+#: src/prefs.c:261
+msgid "Log when buddies become idle/un-idle"
 msgstr ""
 
-#: src/prefs.c:239
-msgid "GNOME URL Handler"
+#: src/prefs.c:262
+msgid "Log when buddies go away/come back"
+msgstr ""
+
+#: src/prefs.c:263
+msgid "Log your own signons/idleness/awayness"
 msgstr ""
 
-#: src/prefs.c:241
-msgid "Manual"
+#: src/prefs.c:264
+msgid "Individual log file for each buddy's signons"
 msgstr ""
 
-#: src/prefs.c:252
-msgid "Pop up new window by default"
+#: src/prefs.c:266
+msgid "Browser"
+msgstr ""
+
+#: src/prefs.c:278
+msgid "KFM"
 msgstr ""
 
 #: src/prefs.c:279
-#, fuzzy
-msgid "Logging Options"
-msgstr "Melde an %s\n"
+msgid "Netscape"
+msgstr ""
+
+#: src/prefs.c:282
+msgid "Pop up new window by default"
+msgstr ""
+
+#: src/prefs.c:289
+msgid "GNOME URL Handler"
+msgstr ""
 
 #: src/prefs.c:291
-#, fuzzy
-msgid "Log all conversations"
-msgstr "Alles Mitschneiten"
-
-#: src/prefs.c:292
-#, fuzzy
-msgid "Strip HTML from logs"
-msgstr "HTML aus Mitschnitt entfernen"
-
-#: src/prefs.c:298
-msgid "Log when buddies sign on/sign off"
+msgid "Manual"
 msgstr ""
 
-#: src/prefs.c:299
-msgid "Log when buddies become idle/un-idle"
-msgstr ""
-
-#: src/prefs.c:300
-msgid "Log when buddies go away/come back"
-msgstr ""
-
-#: src/prefs.c:301
-msgid "Log your own signons/idleness/awayness (as set by options above)"
-msgstr ""
-
-#: src/prefs.c:302
-msgid "Individual log file for each buddy's signons"
-msgstr ""
-
-#: src/prefs.c:317
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Buddy-Liste"
 
-#: src/prefs.c:329
+#: src/prefs.c:342
 #, fuzzy
-msgid "Save Window Size/Position"
-msgstr "Fensterposition und -gr�e speichern"
-
-#: src/prefs.c:331
-msgid "Automatically show buddy list on sign on"
-msgstr ""
-
-#: src/prefs.c:333
-msgid "Display Buddy List near applet"
-msgstr ""
-
-#: src/prefs.c:340
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:341
-msgid "Show numbers in groups"
-msgstr ""
-
-#: src/prefs.c:347
-msgid "Show buddy type icons"
-msgstr ""
-
-#: src/prefs.c:348
-msgid "Show warning levels"
-msgstr ""
-
-#: src/prefs.c:349
-msgid "Show idle times"
-msgstr ""
-
-#: src/prefs.c:355
+msgid "Buddy List Window"
+msgstr "Buddy-Liste"
+
+#: src/prefs.c:354
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
 #: src/prefs.c:356
+msgid "Automatically show buddy list on sign on"
+msgstr ""
+
+#: src/prefs.c:359
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "Fensterposition und -gr�e speichern"
+
+#: src/prefs.c:365
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:371
-msgid "Conversation Window Options"
+#: src/prefs.c:370
+msgid "Display Buddy List near applet"
+msgstr ""
+
+#: src/prefs.c:373
+msgid "Group Displays"
+msgstr ""
+
+#: src/prefs.c:385
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:391
+msgid "Show numbers in groups"
 msgstr ""
 
-#: src/prefs.c:383
+#: src/prefs.c:393
+#, fuzzy
+msgid "Buddy Displays"
+msgstr "Buddy-Liste"
+
+#: src/prefs.c:405
+msgid "Show buddy type icons"
+msgstr ""
+
+#: src/prefs.c:406
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:412
+msgid "Show idle times"
+msgstr ""
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Conversation Options"
+msgstr "Alles Mitschneiten"
+
+#: src/prefs.c:441
+#, fuzzy
+msgid "Keyboard Options"
+msgstr "Einstellungen"
+
+#: src/prefs.c:453
 msgid "Enter sends message"
 msgstr "Enter verschickt Nachricht"
 
-#: src/prefs.c:384
+#: src/prefs.c:454
 #, fuzzy
 msgid "Control-Enter sends message"
 msgstr "Enter verschickt Nachricht"
 
-#: src/prefs.c:385
+#: src/prefs.c:455
 msgid "Escape closes window"
 msgstr ""
 
-#: src/prefs.c:386
+#: src/prefs.c:461
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:387
+#: src/prefs.c:462
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:388
+#: src/prefs.c:463
 msgid "F2 toggles timestamp display"
 msgstr ""
 
-#: src/prefs.c:394
+#: src/prefs.c:465
+#, fuzzy
+msgid "Display and General Options"
+msgstr "Einstellungen"
+
+#: src/prefs.c:477
 msgid "Show graphical smileys"
 msgstr ""
 
-#: src/prefs.c:395
+#: src/prefs.c:478
 msgid "Show timestamp on messages"
 msgstr ""
 
-#: src/prefs.c:396
+#: src/prefs.c:479
+#, fuzzy
+msgid "Show URLs as links"
+msgstr "URLs als Link verschicken"
+
+#: src/prefs.c:480
+msgid "Highlight misspelled words"
+msgstr ""
+
+#: src/prefs.c:481 src/prefs.c:1611
+#, fuzzy
+msgid "Sending messages removes away status"
+msgstr "Sie verschicken die Nachrichten an %s zu schnell."
+
+#: src/prefs.c:482 src/prefs.c:1618
+#, fuzzy
+msgid "Queue new messages when away"
+msgstr "Neue Telegramme bei Abwesenheit ignorieren"
+
+#: src/prefs.c:488
 #, fuzzy
 msgid "Ignore colors"
 msgstr "Ignorieren"
 
-#: src/prefs.c:397
+#: src/prefs.c:489
 #, fuzzy
 msgid "Ignore font faces"
 msgstr "Schrift gr�er"
 
-#: src/prefs.c:398
+#: src/prefs.c:490
 #, fuzzy
 msgid "Ignore font sizes"
 msgstr "Schrift gr�er"
 
-#: src/prefs.c:404
-msgid "Highlight misspelled words"
+#: src/prefs.c:491
+msgid "Ignore TiK Automated Messages"
 msgstr ""
 
-#: src/prefs.c:405
-#, fuzzy
-msgid "Show URLs as links"
-msgstr "URLs als Link verschicken"
-
-#: src/prefs.c:406
-#, fuzzy
-msgid "Sending messages removes away status"
-msgstr "Sie verschicken die Nachrichten an %s zu schnell."
-
-#: src/prefs.c:447 src/prefs.c:540
-msgid "Pictures and Text"
-msgstr ""
-
-#: src/prefs.c:453 src/prefs.c:546
-msgid "Pictures Only"
-msgstr ""
-
-#: src/prefs.c:459 src/prefs.c:552
-#, fuzzy
-msgid "Text Only"
-msgstr "Text-Farbe"
-
-#: src/prefs.c:483
+#: src/prefs.c:492 src/prefs.c:1609
+msgid "Ignore new conversations when away"
+msgstr "Neue Telegramme bei Abwesenheit ignorieren"
+
+#: src/prefs.c:630
 #, fuzzy
 msgid "IM Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:495
+#: src/prefs.c:642
+msgid "IM Window"
+msgstr ""
+
+#: src/prefs.c:654 src/prefs.c:687
+msgid "Show buttons as "
+msgstr ""
+
+#: src/prefs.c:658 src/prefs.c:691
+msgid "Pictures And Text"
+msgstr ""
+
+#: src/prefs.c:659 src/prefs.c:692
+msgid "Pictures"
+msgstr ""
+
+#: src/prefs.c:660 src/prefs.c:693
+#, fuzzy
+msgid "Text"
+msgstr "Fetter Text"
+
+#: src/prefs.c:670
 msgid "Show all conversations in one tabbed window"
 msgstr ""
 
-#: src/prefs.c:496
-msgid "Show logins in window"
-msgstr ""
-
-#: src/prefs.c:502 src/prefs.c:593
-msgid "Show buttons as "
-msgstr ""
-
-#: src/prefs.c:511 src/prefs.c:603
-msgid "Show larger entry box on new windows"
-msgstr ""
-
-#: src/prefs.c:513 src/prefs.c:605
+#: src/prefs.c:671 src/prefs.c:704
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:514 src/prefs.c:1509
-msgid "Ignore new conversations when away"
-msgstr "Neue Telegramme bei Abwesenheit ignorieren"
-
-#: src/prefs.c:516
-msgid "Ignore TiK Automated Messages"
+#: src/prefs.c:672
+msgid "Show logins in window"
+msgstr ""
+
+#: src/prefs.c:673 src/prefs.c:706
+msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:574
-#, fuzzy
-msgid "Chat Options"
-msgstr "Einstellungen"
-
-#: src/prefs.c:586
+#: src/prefs.c:675
+msgid "Group Chat Window"
+msgstr ""
+
+#: src/prefs.c:703
 msgid "Show all chats in one tabbed window"
 msgstr ""
 
-#: src/prefs.c:587
+#: src/prefs.c:705
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
+#: src/prefs.c:708
+#, fuzzy
+msgid "Tabbed Window Options"
+msgstr "Fensterposition und -gr�e speichern"
+
+#: src/prefs.c:720
+msgid "IM Tab Placement:"
+msgstr ""
+
+#: src/prefs.c:732 src/prefs.c:766
+msgid "Top"
+msgstr ""
+
+#: src/prefs.c:734 src/prefs.c:768
+msgid "Bottom"
+msgstr ""
+
+#: src/prefs.c:741 src/prefs.c:775
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:743 src/prefs.c:777
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:754
+msgid "Chat Tab Placement:"
+msgstr ""
+
+#: src/prefs.c:809 src/prefs.c:811 src/prefs.c:1014 src/prefs.c:1016
 msgid "Gaim Chat"
 msgstr ""
 
-#: src/prefs.c:779 src/prefs.c:2241
+#: src/prefs.c:952 src/prefs.c:2458
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:797
+#: src/prefs.c:970
 msgid "Refresh"
 msgstr ""
 
-#: src/prefs.c:822
+#: src/prefs.c:995
 msgid "List of available chats"
 msgstr ""
 
-#: src/prefs.c:832
+#: src/prefs.c:1005
 msgid "List of subscribed chats"
 msgstr ""
 
-#: src/prefs.c:962 src/prefs.c:2246
+#.
+#. text[0] = _("Chat Window");
+#. node = gtk_ctree_insert_node(GTK_CTREE(preftree), parent, NULL,
+#. text, 5, NULL, NULL, NULL, NULL, 0, 1);
+#. gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node, chat_page);
+#.
+#: src/prefs.c:1135 src/prefs.c:2453
 #, fuzzy
 msgid "Font Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:976
+#: src/prefs.c:1149
 msgid "Underlined Text"
 msgstr ""
 
-#: src/prefs.c:977
+#: src/prefs.c:1150
 msgid "Strike Text"
 msgstr ""
 
-#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
+#: src/prefs.c:1163 src/prefs.c:1181 src/prefs.c:1202
 #, fuzzy
 msgid "Select"
 msgstr "Schriftart w�hlen "
 
-#: src/prefs.c:1027
+#: src/prefs.c:1200
 msgid "Font Face for Text"
 msgstr ""
 
-#: src/prefs.c:1042
+#: src/prefs.c:1215
 #, fuzzy
 msgid "Font Size for Text"
 msgstr "Schriftart existiert nicht"
 
-#: src/prefs.c:1067
+#: src/prefs.c:1291
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "gAIM - Telegramm-Mitschnitt"
+
+#: src/prefs.c:1326
+#, fuzzy
+msgid "Reset"
+msgstr "Neu"
+
+#: src/prefs.c:1331
+#, fuzzy
+msgid "Choose..."
+msgstr "Schlie�en"
+
+#: src/prefs.c:1370
 #, fuzzy
 msgid "Sound Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:1079
+#: src/prefs.c:1398
 msgid "No sounds when you log in"
 msgstr ""
 
-#: src/prefs.c:1080 src/prefs.c:1511
+#: src/prefs.c:1399 src/prefs.c:1610
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1081
+#: src/prefs.c:1405
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1146
-#, fuzzy
-msgid "Gaim - Sound Configuration"
-msgstr "gAIM - Telegramm-Mitschnitt"
-
-#: src/prefs.c:1181
-#, fuzzy
-msgid "Reset"
-msgstr "Neu"
-
-#: src/prefs.c:1186
-#, fuzzy
-msgid "Choose..."
-msgstr "Schlie�en"
-
-#: src/prefs.c:1222
-msgid "Sound Events"
+#: src/prefs.c:1415
+#, c-format
+msgid ""
+"Command to play sound files\n"
+"(%s for filename; internal if empty)"
 msgstr ""
 
-#: src/prefs.c:1234
+#: src/prefs.c:1426
+msgid "Events"
+msgstr ""
+
+#: src/prefs.c:1434
 msgid "Sound when buddy logs in"
 msgstr ""
 
-#: src/prefs.c:1235
+#: src/prefs.c:1435
 msgid "Sound when buddy logs out"
 msgstr ""
 
-#: src/prefs.c:1241
+#: src/prefs.c:1441
+#, fuzzy
+msgid "Sound when received message begins conversation"
+msgstr "Fenster nach Oben, bei neuer Nachricht"
+
+#: src/prefs.c:1442
 msgid "Sound when message is received"
 msgstr ""
 
-#: src/prefs.c:1242
-#, fuzzy
-msgid "Sound when message is first received"
-msgstr "Fenster nach Oben, bei neuer Nachricht"
-
-#: src/prefs.c:1243
+#: src/prefs.c:1443
 msgid "Sound when message is sent"
 msgstr ""
 
-#: src/prefs.c:1249
+#: src/prefs.c:1449
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1250
+#: src/prefs.c:1450
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1251
+#: src/prefs.c:1451
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1252
+#: src/prefs.c:1452
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1262
-#, c-format
-msgid "Command to play sound files (%s for filename; internal if empty)"
-msgstr ""
-
-#: src/prefs.c:1408 src/prefs.c:2273
+#: src/prefs.c:1581 src/prefs.c:2480
 #, fuzzy
 msgid "Away Messages"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/prefs.c:1420
+#: src/prefs.c:1617
+msgid "Don't send auto-response"
+msgstr ""
+
+#: src/prefs.c:1628
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1641
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1654
+#, fuzzy
+msgid "Messages"
+msgstr "Neue Abwesenheits-Mitteilung"
+
+#: src/prefs.c:1666
 #, fuzzy
 msgid "Title"
 msgstr "Datei"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1670
 #, fuzzy
 msgid "Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/prefs.c:1464
+#: src/prefs.c:1709
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1468
+#: src/prefs.c:1713
 #, fuzzy
 msgid "Make Away"
 msgstr "Jetzt abwesend"
 
-#: src/prefs.c:1512
-msgid "Don't send auto-response"
-msgstr ""
-
-#: src/prefs.c:1522
-msgid "Auto Away after"
-msgstr ""
-
-#: src/prefs.c:1535
-msgid "minutes using"
-msgstr ""
-
-#: src/prefs.c:1754
+#: src/prefs.c:1959
 #, fuzzy
 msgid "Privacy Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:1770
+#: src/prefs.c:1975
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1789
+#: src/prefs.c:1994
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1790
+#: src/prefs.c:1995
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1792
+#: src/prefs.c:1997
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1823
+#: src/prefs.c:2028
 #, fuzzy
 msgid "Deny all users"
 msgstr "Bestimmte sperren"
 
-#: src/prefs.c:1824
+#: src/prefs.c:2029
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1826
+#: src/prefs.c:2031
 #, fuzzy
 msgid "Block List"
 msgstr "Sperren"
 
-#: src/prefs.c:1921
+#: src/prefs.c:2126
 msgid "Gaim - Preferences"
 msgstr ""
 
-#: src/prefs.c:2001
+#: src/prefs.c:2206
 msgid "GAIM debug output window"
 msgstr ""
 
-#: src/prefs.c:2192
+#: src/prefs.c:2400
 msgid "General"
 msgstr ""
 
-#: src/prefs.c:2197
-msgid "Browser"
-msgstr ""
-
-#: src/prefs.c:2226
+#: src/prefs.c:2436
 #, fuzzy
 msgid "Conversations"
 msgstr "Alles Mitschneiten"
 
-#: src/prefs.c:2231
-msgid "IM Window"
+#: src/prefs.c:2441
+msgid "Windows"
 msgstr ""
 
-#: src/prefs.c:2236
-msgid "Chat Window"
-msgstr ""
-
-#: src/prefs.c:2257
+#: src/prefs.c:2469
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:2262
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2284
+#: src/prefs.c:2491
 msgid "Privacy"
 msgstr ""
 
@@ -2081,11 +2172,32 @@
 msgid "Register new user for"
 msgstr ""
 
-#: src/server.c:608
+#: src/server.c:56
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
+msgstr ""
+
+#: src/server.c:58
+#, fuzzy
+msgid "Login Error"
+msgstr "Los"
+
+#: src/server.c:463
+#, fuzzy, c-format
+msgid "(%d messages)"
+msgstr "Enter verschickt Nachricht"
+
+#: src/server.c:469
+#, fuzzy
+msgid "(1 message)"
+msgstr "Mit Nachricht:"
+
+#: src/server.c:763
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:609
+#: src/server.c:764
 msgid "No"
 msgstr ""
 
@@ -2162,6 +2274,22 @@
 msgid "%s requests you to send them a file"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Browser Options"
+#~ msgstr "Einstellungen"
+
+#, fuzzy
+#~ msgid "Logging Options"
+#~ msgstr "Melde an %s\n"
+
+#, fuzzy
+#~ msgid "Text Only"
+#~ msgstr "Text-Farbe"
+
+#, fuzzy
+#~ msgid "Chat Options"
+#~ msgstr "Einstellungen"
+
 #~ msgid "Offline"
 #~ msgstr "Offline"
 
--- a/po/es.po	Mon Apr 30 17:57:16 2001 +0000
+++ b/po/es.po	Mon Apr 30 18:52:47 2001 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-04-13 17:07-0700\n"
+"POT-Creation-Date: 2001-04-30 10:14-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,37 +14,49 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: plugins/icq/gaim_icq.c:401 src/oscar.c:2261 src/toc.c:918
+#: plugins/msn/msn.c:1222
+msgid "Gaim-MSN: New Mail"
+msgstr ""
+
+#. Build OK Button
+#: plugins/msn/msn.c:1236 src/dialogs.c:611 src/dialogs.c:701
+#: src/dialogs.c:761 src/dialogs.c:1281 src/dialogs.c:1619 src/dialogs.c:1732
+#: src/dialogs.c:2084 src/dialogs.c:2270 src/dialogs.c:2338 src/dialogs.c:3854
+#: src/dialogs.c:3942 src/multi.c:479
+msgid "OK"
+msgstr "OK"
+
+#: plugins/icq/gaim_icq.c:401 src/oscar.c:2362 src/toc.c:918
 #, fuzzy
 msgid "Get Info"
 msgstr "Informaci�n de Usuario"
 
-#: plugins/yay/yay.c:172
+#: plugins/yay/yay.c:174
 #, fuzzy
 msgid "Your message did not get sent."
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: plugins/yay/yay.c:172 src/dialogs.c:3067 src/dialogs.c:3074
-#: src/oscar.c:1309 src/oscar.c:1314 src/oscar.c:1350 src/oscar.c:1369
-#: src/oscar.c:1405
+#: plugins/yay/yay.c:174 src/dialogs.c:3071 src/dialogs.c:3078
+#: src/oscar.c:1410 src/oscar.c:1415 src/oscar.c:1451 src/oscar.c:1470
+#: src/oscar.c:1506
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - Error %d"
 
-#: plugins/yay/yay.c:190
+#: plugins/yay/yay.c:192
 #, c-format
 msgid "%s has made %s their buddy%s%s"
 msgstr ""
 
-#: plugins/yay/yay.c:192
+#: plugins/yay/yay.c:194
 #, fuzzy
 msgid "Gaim - Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#: plugins/yay/yay.c:236 src/about.c:179 src/aim.c:301 src/buddy.c:2387
-#: src/buddy_chat.c:910 src/buddy_chat.c:1046 src/buddy_chat.c:1073
-#: src/conversation.c:2077 src/dialogs.c:434 src/dialogs.c:3817
-#: src/multi.c:686 src/plugins.c:319 src/prefs.c:1971 src/prpl.c:355
+#: plugins/yay/yay.c:238 src/about.c:179 src/aim.c:303 src/buddy.c:2584
+#: src/buddy_chat.c:919 src/buddy_chat.c:1055 src/buddy_chat.c:1082
+#: src/conversation.c:2110 src/dialogs.c:440 src/dialogs.c:3719
+#: src/multi.c:686 src/plugins.c:321 src/prefs.c:2176 src/prpl.c:355
 msgid "Close"
 msgstr "Cerrar"
 
@@ -68,61 +80,61 @@
 msgid "Web Site"
 msgstr ""
 
-#: src/aim.c:135 src/buddy.c:2380
+#: src/aim.c:137 src/buddy.c:2577
 msgid "Signoff"
 msgstr "Desconectar"
 
-#: src/aim.c:147
+#: src/aim.c:149
 msgid "Please enter your logon"
 msgstr "Porfavor introduzca su nombre de cuenta"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:850
+#: src/aim.c:149 src/aim.c:154 src/multi.c:850
 #, fuzzy
 msgid "Signon Error"
 msgstr "Conectar"
 
-#: src/aim.c:152
+#: src/aim.c:154
 #, fuzzy
 msgid "Please enter your password"
 msgstr "Porfavor introduzca su nombre de cuenta"
 
-#: src/aim.c:246
+#: src/aim.c:248
 msgid "Gaim - Login"
 msgstr "Conectaci�n - Gaim"
 
-#: src/aim.c:264
+#: src/aim.c:266
 msgid "Screen Name: "
 msgstr "Nomre de Usuario:"
 
-#: src/aim.c:278
+#: src/aim.c:280
 msgid "Password: "
 msgstr "Contrase�a: "
 
-#: src/aim.c:299 src/buddy.c:2384
+#: src/aim.c:301 src/buddy.c:2581
 msgid "Quit"
 msgstr "Salir"
 
-#: src/aim.c:304 src/aim.c:641 src/buddy.c:2443
+#: src/aim.c:306 src/aim.c:642 src/buddy.c:2640
 msgid "Accounts"
 msgstr ""
 
-#: src/aim.c:306 src/multi.c:590
+#: src/aim.c:308 src/multi.c:590
 msgid "Signon"
 msgstr "Conectar"
 
-#: src/aim.c:338 src/prpl.c:359
+#: src/aim.c:340 src/prpl.c:359
 msgid "Register"
 msgstr "Registrar"
 
-#: src/aim.c:339
+#: src/aim.c:341 src/prefs.c:1382 src/prefs.c:1593
 msgid "Options"
 msgstr "Opciones"
 
-#: src/aim.c:341 src/aim.c:644 src/buddy.c:2460
+#: src/aim.c:343 src/aim.c:645 src/buddy.c:2657
 msgid "Plugins"
 msgstr "Aditivos"
 
-#: src/aim.c:638 src/buddy.c:2452
+#: src/aim.c:639 src/buddy.c:2649
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -139,11 +151,11 @@
 msgid "Offilne. Click to bring up login box."
 msgstr "Desconectado.  Oprima para abrir ventana para conectarse."
 
-#: src/applet.c:169 src/buddy.c:2398
+#: src/applet.c:169 src/buddy.c:2595
 msgid "Away"
 msgstr "Ausente"
 
-#: src/applet.c:172 src/away.c:266
+#: src/applet.c:172 src/away.c:342
 msgid "New Away Message"
 msgstr "Nuevo Mensaje de Ausencia"
 
@@ -155,130 +167,135 @@
 msgid "About..."
 msgstr "Sobre..."
 
-#: src/away.c:96
+#: src/away.c:157
 msgid "I'm Back!"
 msgstr "Ya regrese"
 
-#: src/away.c:133
+#: src/away.c:210
 msgid "Gaim - Away!"
 msgstr "Gaim - Ausente!"
 
-#: src/away.c:147 src/away.c:228 src/away.c:393
+#: src/away.c:224 src/away.c:304 src/away.c:469
 msgid "Back"
 msgstr "Retroceder"
 
-#: src/away.c:286
+#: src/away.c:362
 msgid "Remove Away Message"
 msgstr "Quitar Mensaje de Ausencia"
 
-#: src/away.c:462
+#: src/away.c:538
 msgid "Set All Away"
 msgstr ""
 
 #. Put the buttons in the box
-#: src/buddy.c:266 src/buddy.c:2528 src/buddy_chat.c:1078
-#: src/conversation.c:1772 src/conversation.c:2092 src/dialogs.c:872
-#: src/dialogs.c:996 src/dialogs.c:1897 src/multi.c:670 src/prefs.c:798
-#: src/prefs.c:1460 src/prefs.c:1811 src/prefs.c:1845
+#: src/buddy.c:437 src/buddy.c:2725 src/buddy_chat.c:1087
+#: src/conversation.c:1793 src/conversation.c:2125 src/dialogs.c:878
+#: src/dialogs.c:1002 src/dialogs.c:1898 src/multi.c:670 src/prefs.c:971
+#: src/prefs.c:1705 src/prefs.c:2016 src/prefs.c:2050
 msgid "Add"
 msgstr "Agregar"
 
-#: src/buddy.c:267 src/buddy.c:2529 src/dialogs.c:882 src/dialogs.c:978
+#: src/buddy.c:438 src/buddy.c:2726 src/dialogs.c:888 src/dialogs.c:984
 msgid "Group"
 msgstr "Grupo"
 
-#: src/buddy.c:268 src/buddy.c:2530 src/buddy_chat.c:1080
-#: src/conversation.c:1758 src/conversation.c:2089 src/prefs.c:799
-#: src/prefs.c:1474 src/prefs.c:1815 src/prefs.c:1849
+#: src/buddy.c:439 src/buddy.c:2727 src/buddy_chat.c:1089
+#: src/conversation.c:1779 src/conversation.c:2122 src/prefs.c:972
+#: src/prefs.c:1719 src/prefs.c:2020 src/prefs.c:2054
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/buddy.c:271 src/buddy.c:1912 src/buddy.c:2271
+#: src/buddy.c:442 src/buddy.c:2113 src/buddy.c:2468
 msgid "Chat"
 msgstr "Hablar"
 
-#: src/buddy.c:272 src/buddy.c:464 src/buddy.c:2269 src/buddy_chat.c:478
-#: src/buddy_chat.c:863
+#: src/buddy.c:443 src/buddy.c:654 src/buddy.c:764 src/buddy.c:2466
+#: src/buddy_chat.c:475 src/buddy_chat.c:872
 msgid "IM"
 msgstr "Mensaje"
 
-#: src/buddy.c:273 src/buddy.c:2270 src/buddy_chat.c:491 src/buddy_chat.c:871
-#: src/buddy_chat.c:1086 src/conversation.c:2110
+#: src/buddy.c:444 src/buddy.c:2467 src/buddy_chat.c:488 src/buddy_chat.c:880
+#: src/buddy_chat.c:1095 src/conversation.c:2143
 msgid "Info"
 msgstr "Informaci�n"
 
 #. Put the buttons in the box
-#: src/buddy.c:470 src/buddy.c:575 src/dialogs.c:972 src/dialogs.c:3432
-#: src/dialogs.c:3447 src/dialogs.c:3524 src/dialogs.c:3539
+#: src/buddy.c:660 src/buddy.c:770 src/dialogs.c:978 src/dialogs.c:3426
+#: src/dialogs.c:3441
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:476 src/buddy.c:589
+#: src/buddy.c:666 src/buddy.c:790
 msgid "Add Buddy Pounce"
 msgstr "Agregar Calada de Amigo"
 
-#: src/buddy.c:482 src/buddy.c:595
+#: src/buddy.c:672 src/buddy.c:796
 msgid "View Log"
 msgstr ""
 
-#: src/buddy.c:582
+#: src/buddy.c:752 src/buddy.c:784
+#, fuzzy
+msgid "Rename"
+msgstr "Quitar"
+
+#: src/buddy.c:777
 msgid "Un-Alias"
 msgstr ""
 
-#: src/buddy.c:1590
+#: src/buddy.c:1791
 msgid "New Buddy Pounce"
 msgstr "Nueva Calada de Amigo"
 
-#: src/buddy.c:1608
+#: src/buddy.c:1809
 msgid "Remove Buddy Pounce"
 msgstr "Quitar Calada de Amigo"
 
-#: src/buddy.c:1903
+#: src/buddy.c:2104
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "Calada de Amigo"
 
-#: src/buddy.c:1906
+#: src/buddy.c:2107
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1909
+#: src/buddy.c:2110
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1915
+#: src/buddy.c:2116
 #, fuzzy
 msgid "Get File"
 msgstr "Archivo"
 
-#: src/buddy.c:1918
+#: src/buddy.c:2119
 #, fuzzy
 msgid "Send File"
 msgstr "Archivo"
 
-#: src/buddy.c:1921
+#: src/buddy.c:2122
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:1924
+#: src/buddy.c:2125
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:1976
+#: src/buddy.c:2177
 #, fuzzy, c-format
 msgid "Logged in: %s\n"
 msgstr "Connectando %s\n"
 
-#: src/buddy.c:1987
+#: src/buddy.c:2188
 msgid "Warnings: %d%%\n"
 msgstr "Advertencias: %d%%\n"
 
-#: src/buddy.c:1999
+#: src/buddy.c:2200
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:2003
+#: src/buddy.c:2204
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -289,536 +306,536 @@
 "Connectado en: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:2007
+#: src/buddy.c:2208
 msgid "Idle: "
 msgstr "Inactivo: "
 
-#: src/buddy.c:2076
+#: src/buddy.c:2277
 #, fuzzy, c-format
-msgid "<B>%s logged in%s%s.</B>"
+msgid "%s logged in."
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
-#: src/buddy.c:2130
+#: src/buddy.c:2329
 #, fuzzy, c-format
-msgid "<B>%s logged out%s%s.</B>"
+msgid "%s logged out."
 msgstr "<HR><B>%s desconectado%s%s.</B><BR><HR>"
 
-#: src/buddy.c:2296
+#: src/buddy.c:2493
 msgid "Information on selected Buddy"
 msgstr "Informacion sobre Amigo Escogido"
 
-#: src/buddy.c:2297 src/dialogs.c:671
+#: src/buddy.c:2494 src/dialogs.c:677
 msgid "Send Instant Message"
 msgstr "Mandar Mensaje Instantaneo"
 
-#: src/buddy.c:2298
+#: src/buddy.c:2495
 msgid "Start/join a Buddy Chat"
 msgstr "Empezar/Unirse a Conversaci�n de Amigos"
 
-#: src/buddy.c:2362
+#: src/buddy.c:2559
 msgid "File"
 msgstr "Archivo"
 
-#: src/buddy.c:2366
+#: src/buddy.c:2563
 msgid "Add A Buddy"
 msgstr "Agregar Amigo"
 
-#: src/buddy.c:2368
+#: src/buddy.c:2565
 #, fuzzy
 msgid "Join A Chat"
 msgstr "Unirse a conversaci�n"
 
-#: src/buddy.c:2370
+#: src/buddy.c:2567
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Mandar Mensaje Instantaneo"
 
-#: src/buddy.c:2375
+#: src/buddy.c:2572
 msgid "Import Buddy List"
 msgstr "Importar Lista de Amigos"
 
-#: src/buddy.c:2377
+#: src/buddy.c:2574
 msgid "Export Buddy List"
 msgstr "Exportar Lista de Amigos"
 
-#: src/buddy.c:2393
+#: src/buddy.c:2590
 msgid "Tools"
 msgstr "Herramientas"
 
-#: src/buddy.c:2403
+#: src/buddy.c:2600
 msgid "Buddy Pounce"
 msgstr "Calada de Amigo"
 
-#: src/buddy.c:2412 src/dialogs.c:2078 src/dialogs.c:2245
+#: src/buddy.c:2609 src/dialogs.c:2079 src/dialogs.c:2246
 msgid "Search for Buddy"
 msgstr "Buscar un Amigo"
 
-#: src/buddy.c:2415
+#: src/buddy.c:2612
 msgid "by Email"
 msgstr "por Correo Electronico"
 
-#: src/buddy.c:2419
+#: src/buddy.c:2616
 msgid "by Dir Info"
 msgstr "por Informaci�n de Directorio"
 
-#: src/buddy.c:2426 src/buddy.c:2427
+#: src/buddy.c:2623 src/buddy.c:2624
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/buddy.c:2430
+#: src/buddy.c:2627
 msgid "User Info"
 msgstr "Informaci�n de Usuario"
 
-#: src/buddy.c:2434 src/dialogs.c:1356
+#: src/buddy.c:2631 src/dialogs.c:1362
 msgid "Directory Info"
 msgstr "Informaci�n del Directorio"
 
-#: src/buddy.c:2438 src/dialogs.c:1547
+#: src/buddy.c:2635 src/dialogs.c:1553
 msgid "Change Password"
 msgstr "Cambiar Contrase�a"
 
-#: src/buddy.c:2447
+#: src/buddy.c:2644
 #, fuzzy
 msgid "Protocol Actions"
 msgstr "Opciones"
 
-#: src/buddy.c:2454
+#: src/buddy.c:2651
 msgid "View System Log"
 msgstr ""
 
-#: src/buddy.c:2465
+#: src/buddy.c:2662
 #, fuzzy
 msgid "Perl"
 msgstr "Permitir"
 
-#: src/buddy.c:2468
+#: src/buddy.c:2665
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2472
+#: src/buddy.c:2669
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2476
+#: src/buddy.c:2673
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2484
+#: src/buddy.c:2681
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/buddy.c:2489
+#: src/buddy.c:2686
 #, fuzzy
 msgid "About Gaim"
 msgstr "Sobre"
 
-#: src/buddy.c:2508 src/prefs.c:2215
+#: src/buddy.c:2705 src/prefs.c:2425
 msgid "Buddy List"
 msgstr "Lista de Amigos"
 
-#: src/buddy.c:2562
+#: src/buddy.c:2759
 msgid "Add a new Buddy"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:2563
+#: src/buddy.c:2760
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:2564
+#: src/buddy.c:2761
 msgid "Remove selected Buddy"
 msgstr "Quitar Amigo Escogido"
 
-#: src/buddy.c:2589
+#: src/buddy.c:2786
 msgid "Online"
 msgstr "En Linea"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2788
 msgid "Edit Buddies"
 msgstr "Corregir Amigos["
 
-#: src/buddy.c:2628
+#: src/buddy.c:2825
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista de Amigos"
 
-#: src/buddy_chat.c:160
+#: src/buddy_chat.c:157
 msgid "Join Chat"
 msgstr "Unirse a conversaci�n"
 
-#: src/buddy_chat.c:167 src/buddy_chat.c:978 src/buddy_chat.c:990
+#: src/buddy_chat.c:164 src/buddy_chat.c:987 src/buddy_chat.c:999
 msgid "Buddy Chat"
 msgstr "Conversaci�n de Amigos"
 
-#: src/buddy_chat.c:177
+#: src/buddy_chat.c:174
 msgid "Join what group:"
 msgstr "Unirse a que grupo:"
 
-#: src/buddy_chat.c:190
+#: src/buddy_chat.c:187
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "Unirse a conversaci�n"
 
-#: src/buddy_chat.c:202
+#: src/buddy_chat.c:199
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:209
+#: src/buddy_chat.c:206
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:217 src/buddy_chat.c:262 src/dialogs.c:404
-#: src/dialogs.c:690 src/dialogs.c:750 src/dialogs.c:874 src/dialogs.c:991
-#: src/dialogs.c:1270 src/dialogs.c:1480 src/dialogs.c:1608 src/dialogs.c:1673
-#: src/dialogs.c:1886 src/dialogs.c:2084 src/dialogs.c:2264 src/dialogs.c:2338
-#: src/dialogs.c:3200 src/dialogs.c:3434 src/dialogs.c:3526 src/dialogs.c:3713
-#: src/multi.c:475 src/multi.c:586 src/multi.c:833 src/prpl.c:156
-#: src/prpl.c:227
+#: src/buddy_chat.c:214 src/buddy_chat.c:259 src/dialogs.c:410
+#: src/dialogs.c:696 src/dialogs.c:756 src/dialogs.c:880 src/dialogs.c:997
+#: src/dialogs.c:1276 src/dialogs.c:1486 src/dialogs.c:1614 src/dialogs.c:1679
+#: src/dialogs.c:1887 src/dialogs.c:2085 src/dialogs.c:2265 src/dialogs.c:2339
+#: src/dialogs.c:3204 src/dialogs.c:3428 src/dialogs.c:3619 src/dialogs.c:3849
+#: src/dialogs.c:3937 src/multi.c:475 src/multi.c:586 src/multi.c:833
+#: src/prpl.c:156 src/prpl.c:227
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/buddy_chat.c:222
+#: src/buddy_chat.c:219
 msgid "Join"
 msgstr "Unirse"
 
-#: src/buddy_chat.c:263 src/buddy_chat.c:916 src/buddy_chat.c:1045
+#: src/buddy_chat.c:260 src/buddy_chat.c:925 src/buddy_chat.c:1054
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/buddy_chat.c:279
+#: src/buddy_chat.c:276
 msgid "Invite who?"
 msgstr "Invitar a quien?"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:280
 msgid "With message:"
 msgstr "Con el mensaje:"
 
-#: src/buddy_chat.c:307
+#: src/buddy_chat.c:304
 msgid "Invite to Buddy Chat"
 msgstr "Invitar un Amigo a la conversaci�n"
 
-#: src/buddy_chat.c:484 src/buddy_chat.c:867
+#: src/buddy_chat.c:481 src/buddy_chat.c:876
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: src/buddy_chat.c:536 src/buddy_chat.c:642
+#: src/buddy_chat.c:533 src/buddy_chat.c:639
 #, c-format
 msgid "%d %s in room"
 msgstr ""
 
-#: src/buddy_chat.c:543
+#: src/buddy_chat.c:540
 #, c-format
-msgid "<B>%s entered the room.</B>"
+msgid "%s entered the room."
 msgstr ""
 
-#: src/buddy_chat.c:606
+#: src/buddy_chat.c:603
 #, c-format
-msgid "<B>%s is now known as %s</B>"
+msgid "%s is now known as %s"
 msgstr ""
 
-#: src/buddy_chat.c:649
+#: src/buddy_chat.c:646
 #, c-format
-msgid "<B>%s left the room.</B>"
+msgid "%s left the room."
 msgstr ""
 
-#: src/buddy_chat.c:776
+#: src/buddy_chat.c:773
 #, fuzzy
 msgid "Gaim - Group Chats"
 msgstr "Gaim Conversaciones"
 
-#: src/buddy_chat.c:844
+#: src/buddy_chat.c:853
 msgid "0 people in room"
 msgstr ""
 
-#: src/buddy_chat.c:921 src/buddy_chat.c:1044
+#: src/buddy_chat.c:930 src/buddy_chat.c:1053
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/buddy_chat.c:926 src/buddy_chat.c:1042 src/buddy_chat.c:1088
-#: src/conversation.c:2121
+#: src/buddy_chat.c:935 src/buddy_chat.c:1051 src/buddy_chat.c:1097
+#: src/conversation.c:2154
 msgid "Send"
 msgstr "Mandar"
 
-#: src/buddy_chat.c:1082 src/conversation.c:2098
+#: src/buddy_chat.c:1091 src/conversation.c:2131
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/buddy_chat.c:1084 src/conversation.c:2104 src/dialogs.c:374
-#: src/dialogs.c:399
+#: src/buddy_chat.c:1093 src/conversation.c:2137 src/dialogs.c:380
+#: src/dialogs.c:405
 msgid "Warn"
 msgstr "Advertir"
 
-#: src/conversation.c:352
+#: src/conversation.c:365
 #, fuzzy
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Guardar Conversaci�n"
 
-#: src/conversation.c:503
+#: src/conversation.c:518
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Quitando '%s' de la lista.\n"
 
-#: src/conversation.c:1068
+#: src/conversation.c:1083
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Presentemente en %d\n"
 
-#: src/conversation.c:1076
+#: src/conversation.c:1091
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Moviendo posici�n a %d\n"
 
-#: src/conversation.c:1602
+#: src/conversation.c:1623
 msgid "Bold"
 msgstr "Negritas"
 
-#: src/conversation.c:1602 src/prefs.c:974
+#: src/conversation.c:1623 src/prefs.c:1147
 msgid "Bold Text"
 msgstr "Texto en Negritas"
 
-#: src/conversation.c:1606 src/conversation.c:1607
+#: src/conversation.c:1627 src/conversation.c:1628
 msgid "Italics"
 msgstr "Inclinados"
 
-#: src/conversation.c:1606 src/prefs.c:975
+#: src/conversation.c:1627 src/prefs.c:1148
 msgid "Italics Text"
 msgstr "Texto Inclinado"
 
-#: src/conversation.c:1610 src/conversation.c:1611
+#: src/conversation.c:1631 src/conversation.c:1632
 msgid "Underline"
 msgstr "Subrayar"
 
-#: src/conversation.c:1610
+#: src/conversation.c:1631
 msgid "Underline Text"
 msgstr "Subrayar Texto"
 
-#: src/conversation.c:1615
+#: src/conversation.c:1636
 msgid "Strike"
 msgstr "Cruzar"
 
-#: src/conversation.c:1615
+#: src/conversation.c:1636
 msgid "Strike through Text"
 msgstr "Cruzar el Texto"
 
-#: src/conversation.c:1621
+#: src/conversation.c:1642
 msgid "Small"
 msgstr "Peque�o"
 
-#: src/conversation.c:1621
+#: src/conversation.c:1642
 msgid "Decrease font size"
 msgstr "Hacer texto mas peque�o"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1645
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1645
 msgid "Normal font size"
 msgstr "Texto normal"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1648
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1648
 msgid "Increase font size"
 msgstr "Hacer el texto mas grande "
 
-#: src/conversation.c:1634 src/conversation.c:1635
+#: src/conversation.c:1655 src/conversation.c:1656
 msgid "Font"
 msgstr "Texto"
 
-#: src/conversation.c:1634 src/dialogs.c:2687 src/dialogs.c:2703
+#: src/conversation.c:1655 src/dialogs.c:2691 src/dialogs.c:2707
 msgid "Select Font"
 msgstr "Seleccionar un Texto"
 
-#: src/conversation.c:1638 src/conversation.c:1639 src/conversation.c:1643
+#: src/conversation.c:1659 src/conversation.c:1660 src/conversation.c:1664
 msgid "Color"
 msgstr "Color"
 
-#: src/conversation.c:1638 src/prefs.c:988
+#: src/conversation.c:1659 src/prefs.c:1161
 msgid "Text Color"
 msgstr "Color del texto"
 
-#: src/conversation.c:1643 src/prefs.c:1006
+#: src/conversation.c:1664 src/prefs.c:1179
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1650 src/conversation.c:1651
+#: src/conversation.c:1671 src/conversation.c:1672
 msgid "Link"
 msgstr "Direcci�n"
 
-#: src/conversation.c:1650 src/dialogs.c:2332
+#: src/conversation.c:1671 src/dialogs.c:2333
 msgid "Insert Link"
 msgstr "Insertar una Direcci�n"
 
-#: src/conversation.c:1654
+#: src/conversation.c:1675
 #, fuzzy
 msgid "Smiley"
 msgstr "Archivo"
 
-#: src/conversation.c:1654
+#: src/conversation.c:1675
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1661 src/conversation.c:1662 src/prefs.c:2202
+#: src/conversation.c:1682 src/conversation.c:1683 src/prefs.c:245
 msgid "Logging"
 msgstr "Diario"
 
-#: src/conversation.c:1661
+#: src/conversation.c:1682
 msgid "Enable logging"
 msgstr "Usar Diario"
 
-#: src/conversation.c:1671 src/conversation.c:1672 src/dialogs.c:1485
-#: src/dialogs.c:1678 src/dialogs.c:3212 src/dialogs.c:3826
+#: src/conversation.c:1692 src/conversation.c:1693 src/dialogs.c:1491
+#: src/dialogs.c:1684 src/dialogs.c:3216 src/dialogs.c:3728
 msgid "Save"
 msgstr "Guardar"
 
-#: src/conversation.c:1671
+#: src/conversation.c:1692
 #, fuzzy
 msgid "Save Conversation"
 msgstr "Guarde todas las conversaciones"
 
-#: src/conversation.c:1676 src/conversation.c:1677
+#: src/conversation.c:1697 src/conversation.c:1698
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/conversation.c:1676
+#: src/conversation.c:1697
 msgid "Enable sounds"
 msgstr "Usar Sonidos"
 
-#: src/conversation.c:1964
+#: src/conversation.c:1985
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - Guardar Conversaci�n"
 
-#: src/conversation.c:2039
+#: src/conversation.c:2072
 #, fuzzy
 msgid "Send message as: "
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/dialogs.c:361
+#: src/dialogs.c:367
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Advertir usuario?"
 
-#: src/dialogs.c:382
+#: src/dialogs.c:388
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "�Deveras quiere advertirle a %s?"
 
-#: src/dialogs.c:387
+#: src/dialogs.c:393
 msgid "Warn anonymously?"
 msgstr "�Advertirle anonimamente?"
 
-#: src/dialogs.c:391
+#: src/dialogs.c:397
 msgid "Anonymous warnings are less harsh."
 msgstr "Las advertencias anonimas son menos duras."
 
-#: src/dialogs.c:467
+#: src/dialogs.c:473
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No se pudo escribir archivo %s."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:476
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No se pudo leer archivo %s."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:479
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensaje demasiado largo, ultimos %s bytes fueron borrados."
 
-#: src/dialogs.c:476
+#: src/dialogs.c:482
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s no esta en linea ahorita."
 
-#: src/dialogs.c:479
+#: src/dialogs.c:485
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Advertencias para %s estan prohibidas."
 
-#: src/dialogs.c:482
+#: src/dialogs.c:488
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "El mensaje ha sido borrado, usted esta excediendo el limite de velocidad del "
 "servidor."
 
-#: src/dialogs.c:485
+#: src/dialogs.c:491
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Conversaci�n en %s no esta disponible."
 
-#: src/dialogs.c:488
+#: src/dialogs.c:494
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esta mandando los mensajes demasiado rapido a %s."
 
-#: src/dialogs.c:491
+#: src/dialogs.c:497
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Usted perdi� un mensaje de %s porque fue demasiado largo."
 
-#: src/dialogs.c:494
+#: src/dialogs.c:500
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Usted perdio un mensaje %s porque fue mandado demasiado rapidamente."
 
-#: src/dialogs.c:497
+#: src/dialogs.c:503
 msgid "Failure."
 msgstr "Falla"
 
-#: src/dialogs.c:500
+#: src/dialogs.c:506
 msgid "Too many matches."
 msgstr "Demasiados resultados"
 
-#: src/dialogs.c:503
+#: src/dialogs.c:509
 msgid "Need more qualifiers."
 msgstr "Necesito mas calificadores"
 
-#: src/dialogs.c:506
+#: src/dialogs.c:512
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio no esta disponible ahorita."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:515
 msgid "Email lookup restricted."
 msgstr "Busqueda de correos electronicos es restringida."
 
-#: src/dialogs.c:512
+#: src/dialogs.c:518
 msgid "Keyword ignored."
 msgstr "Palabra ignorada"
 
-#: src/dialogs.c:515
+#: src/dialogs.c:521
 msgid "No keywords."
 msgstr "Sin palabras"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:524
 msgid "User has no directory information."
 msgstr "El usuario no tiene informaci�n en el directorio."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:528
 msgid "Country not supported."
 msgstr "Pa�s no apoyado"
 
-#: src/dialogs.c:525
+#: src/dialogs.c:531
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Falla desconocida: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:528 src/oscar.c:524
+#: src/dialogs.c:534 src/oscar.c:525
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contrase�a incorrecta."
 
-#: src/dialogs.c:531
+#: src/dialogs.c:537
 msgid "The service is temporarily unavailable."
 msgstr "Este servicio no esta disponible en este momento."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:540
 msgid "Your warning level is currently too high to log in."
 msgstr "Su nivel de advertencias es demasiado alto para conectarse."
 
-#: src/dialogs.c:537
+#: src/dialogs.c:543
 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."
@@ -826,382 +843,399 @@
 "Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
 "intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
 
-#: src/dialogs.c:540
+#: src/dialogs.c:546
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Un error al conectarse ha ocurrido: %s."
 
-#: src/dialogs.c:543
+#: src/dialogs.c:549
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Un error desconocido, %d, ha ocurrido.  Informacion: %s"
 
-#: src/dialogs.c:546
+#: src/dialogs.c:552
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - Error %d"
 
-#. Build OK Button
-#: src/dialogs.c:605 src/dialogs.c:695 src/dialogs.c:755 src/dialogs.c:1275
-#: src/dialogs.c:1613 src/dialogs.c:1726 src/dialogs.c:2083 src/dialogs.c:2269
-#: src/dialogs.c:2337 src/multi.c:479
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:661
+#: src/dialogs.c:667
 msgid "Gaim - IM user"
 msgstr "Gaim - Usuario"
 
-#: src/dialogs.c:678
+#: src/dialogs.c:684
 #, fuzzy
 msgid "IM who:"
 msgstr "Quien: "
 
-#: src/dialogs.c:726
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "Informaci�n de Usuario"
 
-#: src/dialogs.c:733
+#: src/dialogs.c:739
 msgid "User:"
 msgstr ""
 
 #. Finish up
-#: src/dialogs.c:761
+#: src/dialogs.c:767
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Crear Informaci�n del Usuario"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:833
 msgid "Buddies"
 msgstr "Amigos"
 
-#: src/dialogs.c:880
+#: src/dialogs.c:886
 #, fuzzy
 msgid "Add Group"
 msgstr "Grupo"
 
-#: src/dialogs.c:910
+#: src/dialogs.c:916
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:937
+#: src/dialogs.c:943
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:951
+#: src/dialogs.c:957
 msgid "Add Buddy"
 msgstr "Agregar Amigo"
 
-#: src/dialogs.c:961 src/dialogs.c:3442 src/dialogs.c:3534
+#: src/dialogs.c:967 src/dialogs.c:3436
 msgid "Buddy"
 msgstr "Amigo"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:1021
 #, fuzzy
 msgid "Please enter a buddy to pounce."
 msgstr "Porfavor introduzca su nombre de cuenta"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:1021
 #, fuzzy
 msgid "Buddy Pounce Error"
 msgstr "Calada de Amigo"
 
-#: src/dialogs.c:1084
+#: src/dialogs.c:1090
 #, fuzzy
 msgid "Pounce buddy as:"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1140
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuevo amigo a calar"
 
-#: src/dialogs.c:1151
+#: src/dialogs.c:1157
 #, fuzzy
 msgid "Buddy:"
 msgstr "Amigo"
 
-#: src/dialogs.c:1166
+#: src/dialogs.c:1172
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1171
+#: src/dialogs.c:1177
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1175
+#: src/dialogs.c:1181
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1183
+#: src/dialogs.c:1189
 #, fuzzy
 msgid "Open IM window on pounce"
 msgstr "Abrir Ventana de Mensage cuando se conecte este amigo"
 
-#: src/dialogs.c:1188
+#: src/dialogs.c:1194
 #, fuzzy
 msgid "Send IM on pounce"
 msgstr "Mandar un mensaje cuando se conecte este amigo"
 
-#: src/dialogs.c:1197
+#: src/dialogs.c:1203
 #, fuzzy
 msgid "Message:"
 msgstr "Crear Mensaje"
 
-#: src/dialogs.c:1209
+#: src/dialogs.c:1215
 #, fuzzy
 msgid "Execute command on pounce"
 msgstr "Mandar un mensaje cuando se conecte este amigo"
 
-#: src/dialogs.c:1218
+#: src/dialogs.c:1224
 msgid "Command:"
 msgstr ""
 
-#: src/dialogs.c:1231
+#: src/dialogs.c:1237
 #, fuzzy
 msgid "Play sound on pounce"
 msgstr "Mandar un mensaje cuando se conecte este amigo"
 
-#: src/dialogs.c:1240
+#: src/dialogs.c:1246
 #, fuzzy
 msgid "Sound:"
 msgstr "Sonido"
 
-#: src/dialogs.c:1257
+#: src/dialogs.c:1263
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1352
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Crear Informaci�n del directorio"
 
-#: src/dialogs.c:1378
+#: src/dialogs.c:1384
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dejar que busquedas en el Web encuentren su informacion"
 
 #. Line 1
-#: src/dialogs.c:1381 src/dialogs.c:2102
+#: src/dialogs.c:1387 src/dialogs.c:2103
 msgid "First Name"
 msgstr "Nombre"
 
 #. Line 2
-#: src/dialogs.c:1392 src/dialogs.c:2114
+#: src/dialogs.c:1398 src/dialogs.c:2115
 msgid "Middle Name"
 msgstr "Segundo Nombre"
 
 #. Line 3
-#: src/dialogs.c:1404 src/dialogs.c:2126
+#: src/dialogs.c:1410 src/dialogs.c:2127
 msgid "Last Name"
 msgstr "Apellido"
 
 #. Line 4
-#: src/dialogs.c:1415 src/dialogs.c:2138
+#: src/dialogs.c:1421 src/dialogs.c:2139
 msgid "Maiden Name"
 msgstr "Apellido Materno"
 
 #. Line 5
-#: src/dialogs.c:1426 src/dialogs.c:2150
+#: src/dialogs.c:1432 src/dialogs.c:2151
 msgid "City"
 msgstr "Ciudad"
 
 #. Line 6
-#: src/dialogs.c:1437 src/dialogs.c:2161
+#: src/dialogs.c:1443 src/dialogs.c:2162
 msgid "State"
 msgstr "Estado"
 
 #. Line 7
-#: src/dialogs.c:1448 src/dialogs.c:2172
+#: src/dialogs.c:1454 src/dialogs.c:2173
 msgid "Country"
 msgstr "Pa�s"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1509
 msgid "New Passwords Do Not Match"
 msgstr "Las contrase�as nuevas no son iguales"
 
-#: src/dialogs.c:1503 src/dialogs.c:1508
+#: src/dialogs.c:1509 src/dialogs.c:1514
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Error sobre el cambio de contrase�a"
 
-#: src/dialogs.c:1508
+#: src/dialogs.c:1514
 msgid "Fill out all fields completely"
 msgstr "Llene todos los campos completamente"
 
-#: src/dialogs.c:1535 src/toc.c:561
+#: src/dialogs.c:1541 src/toc.c:561
 msgid "Gaim - Password Change"
 msgstr "Gaim - Cambiar Contrase�a"
 
-#: src/dialogs.c:1566
+#: src/dialogs.c:1572
 msgid "Original Password"
 msgstr "Contrase�a Original"
 
-#: src/dialogs.c:1580
+#: src/dialogs.c:1586
 msgid "New Password"
 msgstr "Contrase�a Nueva"
 
-#: src/dialogs.c:1594
+#: src/dialogs.c:1600
 msgid "New Password (again)"
 msgstr "Contrase�a Nueva (de nuevo)"
 
-#: src/dialogs.c:1639
+#: src/dialogs.c:1645
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Crear Informaci�n del Usuario"
 
-#: src/dialogs.c:1737
+#: src/dialogs.c:1743
 msgid "Below are the results of your search: "
 msgstr "Siguientemente estan los resultados de su b�squeda: "
 
-#: src/dialogs.c:1876 src/dialogs.c:1883
+#: src/dialogs.c:1877 src/dialogs.c:1884
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/dialogs.c:1878 src/dialogs.c:1885
+#: src/dialogs.c:1879 src/dialogs.c:1886
 msgid "Deny"
 msgstr "Negar"
 
-#: src/dialogs.c:1926
+#: src/dialogs.c:1927
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Agregar Autorizar/Negar"
 
-#: src/dialogs.c:1928
+#: src/dialogs.c:1929
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Agregar Autorizar/Negar"
 
-#: src/dialogs.c:1999
+#: src/dialogs.c:2000
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Guardar Conversaci�n"
 
-#: src/dialogs.c:2209
+#: src/dialogs.c:2210
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Encontrar amgio por informaci�n"
 
-#: src/dialogs.c:2239
+#: src/dialogs.c:2240
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electr�nico"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2253
 msgid "Email"
 msgstr "Correo Electr�nico"
 
-#: src/dialogs.c:2351
+#: src/dialogs.c:2352
 msgid "URL"
 msgstr "Direcci�n"
 
-#: src/dialogs.c:2359
+#: src/dialogs.c:2360
 msgid "Description"
 msgstr "Descripci�n"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2386
 msgid "GAIM - Add URL"
 msgstr "GAIM - Agregar direcci�n"
 
-#: src/dialogs.c:2526 src/dialogs.c:2539 src/dialogs.c:2576
+#: src/dialogs.c:2529 src/dialogs.c:2542 src/dialogs.c:2579
 msgid "Select Text Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2563
+#: src/dialogs.c:2566
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2808
+#: src/dialogs.c:2812
 #, c-format
 msgid "Error writing file %s"
 msgstr "Error creando el archivo %s"
 
-#: src/dialogs.c:2809 src/dialogs.c:2931 src/dialogs.c:3674 src/oscar.c:1824
-#: src/oscar.c:2241 src/toc.c:1398 src/toc.c:1415 src/toc.c:1503
+#: src/dialogs.c:2813 src/dialogs.c:2935 src/dialogs.c:3580 src/oscar.c:1923
+#: src/oscar.c:2342 src/toc.c:1398 src/toc.c:1415 src/toc.c:1503
 #: src/toc.c:1680 src/toc.c:1710
 msgid "Error"
 msgstr "Error"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2866
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Exportar lista de amigos"
 
-#: src/dialogs.c:2930
+#: src/dialogs.c:2934
 #, c-format
 msgid "Error reading file %s"
 msgstr "Error leyendo el archivo %s"
 
-#: src/dialogs.c:3004
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar lista de amigos"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3067
+#: src/dialogs.c:3071
 msgid "You cannot create an away message with a blank title"
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3074
+#: src/dialogs.c:3078
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:3141
+#: src/dialogs.c:3145
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo mensaje de ausencia"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3155
 #, fuzzy
 msgid "New away message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3164
+#: src/dialogs.c:3168
 msgid "Away title: "
 msgstr "Titulo del mensaje: "
 
-#: src/dialogs.c:3204
+#: src/dialogs.c:3208
 #, fuzzy
 msgid "Use"
 msgstr "GAIM Usar"
 
-#: src/dialogs.c:3208
+#: src/dialogs.c:3212
 msgid "Save & Use"
 msgstr ""
 
 #. show everything
-#: src/dialogs.c:3377
+#: src/dialogs.c:3381
 #, fuzzy
 msgid "Smile!"
 msgstr "Archivo"
 
-#: src/dialogs.c:3440 src/dialogs.c:3532
+#: src/dialogs.c:3434
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Agregar Amigo"
 
-#: src/dialogs.c:3477 src/dialogs.c:3569
+#: src/dialogs.c:3471
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:3641
+#: src/dialogs.c:3545
 #, fuzzy
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Guardar Como..."
 
-#: src/dialogs.c:3672
+#: src/dialogs.c:3578
 #, fuzzy, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "No se pudo leer archivo %s."
 
-#: src/dialogs.c:3703
+#: src/dialogs.c:3609
 msgid "Really clear log?"
 msgstr ""
 
-#: src/dialogs.c:3721
+#: src/dialogs.c:3627
 #, fuzzy
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3821
+#: src/dialogs.c:3723
 #, fuzzy
 msgid "Clear"
 msgstr "Cerrar"
 
+#: src/dialogs.c:3818
+#, fuzzy
+msgid "Gaim - Rename Group"
+msgstr "Gaim - Agregar Amigo"
+
+#: src/dialogs.c:3828
+msgid "Rename Group"
+msgstr ""
+
+#: src/dialogs.c:3835 src/dialogs.c:3923
+#, fuzzy
+msgid "New name:"
+msgstr "Nomre de Usuario:"
+
+#: src/dialogs.c:3906
+#, fuzzy
+msgid "Gaim - Rename Buddy"
+msgstr "Gaim - Agregar Amigo"
+
+#: src/dialogs.c:3916
+#, fuzzy
+msgid "Rename Buddy"
+msgstr "Gaim - Agregar Amigo"
+
 #: src/gaimrc.c:880
 #, c-format
 msgid "Could not open config file %s."
@@ -1230,7 +1264,7 @@
 msgid "Receieved: '%s'\n"
 msgstr "Recibido: '%s'\n"
 
-#: src/multi.c:357 src/prefs.c:114
+#: src/multi.c:357 src/prefs.c:188
 #, fuzzy
 msgid "General Options"
 msgstr "Opciones"
@@ -1258,10 +1292,6 @@
 msgid "Auto-Login"
 msgstr "Auto-conectar"
 
-#: src/multi.c:389
-msgid "Send KeepAlive packet (6 bytes/second)"
-msgstr ""
-
 #: src/multi.c:454
 #, fuzzy
 msgid "Gaim - Modify Account"
@@ -1298,78 +1328,78 @@
 "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
+#: src/oscar.c:295 src/oscar.c:312 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: src/oscar.c:302
+#: src/oscar.c:303
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "error de conecci�n!\n"
 
-#: src/oscar.c:310
+#: src/oscar.c:311
 #, fuzzy
 msgid "major connection error\n"
 msgstr "error de conecci�n!\n"
 
-#: src/oscar.c:323 src/toc.c:545
+#: src/oscar.c:324 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:324
+#: src/oscar.c:325
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Error"
 
-#: src/oscar.c:334
+#: src/oscar.c:335
 #, fuzzy
 msgid "Chat is currently unavailable"
 msgstr "Conversaci�n en %s no esta disponible."
 
-#: src/oscar.c:335
+#: src/oscar.c:336
 #, fuzzy
 msgid "Gaim - Chat"
 msgstr "Gaim Conversaciones"
 
-#: src/oscar.c:382
+#: src/oscar.c:383
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Connectando %s\n"
 
-#: src/oscar.c:420
+#: src/oscar.c:421
 msgid "internal connection error\n"
 msgstr "error interno de conecci�n\n"
 
-#: src/oscar.c:421
+#: src/oscar.c:422
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/oscar.c:426
+#: src/oscar.c:427
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "no se pudo resolver patr�n\n"
 
-#: src/oscar.c:430
+#: src/oscar.c:431
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "no se pudo conectar al patr�n\n"
 
-#: src/oscar.c:437
+#: src/oscar.c:438
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/oscar.c:447
+#: src/oscar.c:448
 msgid "Password sent, waiting for response\n"
 msgstr "Contrase�a mandada, esperando respuesta\n"
 
-#: src/oscar.c:475
+#: src/oscar.c:476
 msgid "Signed off.\n"
 msgstr "Desconectado.\n"
 
 #. connecting too frequently
-#: src/oscar.c:519
+#: src/oscar.c:520
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1379,62 +1409,62 @@
 "intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
 
 #. client too old
-#: src/oscar.c:529
+#: src/oscar.c:530
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 
-#: src/oscar.c:533 src/toc.c:341
+#: src/oscar.c:534 src/toc.c:341
 msgid "Authentication Failed"
 msgstr "Autorizaci�n no optenida"
 
-#: src/oscar.c:563
+#: src/oscar.c:564
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/oscar.c:567
+#: src/oscar.c:568
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/oscar.c:601
+#: src/oscar.c:603
 msgid "Connection established, cookie sent"
 msgstr "Conecci�n establesida, cookie enviado"
 
-#: src/oscar.c:858 src/oscar.c:2125
+#: src/oscar.c:959 src/oscar.c:2226
 #, fuzzy, c-format
-msgid "<B>Direct IM with %s established</B>"
+msgid "Direct IM with %s established"
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
 #. message too large
-#: src/oscar.c:1308
+#: src/oscar.c:1409
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "Usted perdi� un mensaje de %s porque fue demasiado largo."
 
-#: src/oscar.c:1313
+#: src/oscar.c:1414
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1348
+#: src/oscar.c:1449
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1349 src/oscar.c:1368
+#: src/oscar.c:1450 src/oscar.c:1469
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1367
+#: src/oscar.c:1468
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1403
+#: src/oscar.c:1504
 #, c-format
 msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1410
+#: src/oscar.c:1511
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1448,25 +1478,25 @@
 "SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1448
+#: src/oscar.c:1549
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1449
+#: src/oscar.c:1550
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:2182
+#: src/oscar.c:2283
 #, fuzzy, c-format
-msgid "<B>Direct IM with %s closed</B>"
+msgid "Direct IM with %s closed"
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
-#: src/oscar.c:2241
+#: src/oscar.c:2342
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/oscar.c:2251
+#: src/oscar.c:2352
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1474,17 +1504,17 @@
 "continue?"
 msgstr ""
 
-#: src/oscar.c:2268
+#: src/oscar.c:2369
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Mensaje de ausencia"
 
-#: src/oscar.c:2276
+#: src/oscar.c:2377
 #, fuzzy
 msgid "Direct IM"
 msgstr "Informaci�n del Directorio"
 
-#: src/oscar.c:2468
+#: src/oscar.c:2569
 msgid ""
 "Unfortunately, currently Oscar only allows new user registration by going to "
 "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
@@ -1492,564 +1522,624 @@
 msgstr ""
 
 #. Below is basically stolen from plugins.c
-#: src/perl.c:638
+#: src/perl.c:647
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Crear Informaci�n del Usuario"
 
-#: src/perl.c:686
+#: src/perl.c:695
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:105
+#: src/plugins.c:107
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista de aditivos"
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:216
+#: src/plugins.c:188 src/plugins.c:194 src/plugins.c:218
 msgid "Plugin Error"
 msgstr "Error de aditivo"
 
-#: src/plugins.c:272
+#: src/plugins.c:274
 msgid "Gaim - Plugins"
 msgstr "Gaim - Aditivos"
 
 #. Build the bottom button bar
-#: src/plugins.c:301
+#: src/plugins.c:303
 msgid "Load Plugin"
 msgstr "Usar Aditivo"
 
-#: src/plugins.c:307
+#: src/plugins.c:309
 msgid "Configure Plugin"
 msgstr "Configurar Aditivo"
 
-#: src/plugins.c:313
+#: src/plugins.c:315
 msgid "Unload Plugin"
 msgstr "Desocupar Aditivo"
 
-#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
-#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
-#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1762
+#: src/prefs.c:196 src/prefs.c:338 src/prefs.c:437 src/prefs.c:638
+#: src/prefs.c:1143 src/prefs.c:1378 src/prefs.c:1589 src/prefs.c:1967
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:126
-msgid "Use borderless buttons (requires restart for some buttons)"
+#: src/prefs.c:208
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/prefs.c:216
+msgid "Use borderless buttons"
 msgstr ""
 
-#: src/prefs.c:128
-msgid "Show Buddy Ticker after restart"
-msgstr ""
-
-#: src/prefs.c:132
+#: src/prefs.c:221
+#, fuzzy
+msgid "Show Buddy Ticker"
+msgstr "Demostrar dibujos de los tipos de amigos"
+
+#: src/prefs.c:227
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:144
+#: src/prefs.c:231
 #, fuzzy
-msgid "Report Idle Times:"
+msgid "Report Idle Times"
 msgstr "Demostrar el tiempo de inactividad de los amigos"
 
-#: src/prefs.c:147
+#: src/prefs.c:239
 msgid "None"
 msgstr ""
 
-#: src/prefs.c:148
+#: src/prefs.c:240
 msgid "GAIM Use"
 msgstr "GAIM Usar"
 
-#: src/prefs.c:150
+#: src/prefs.c:242
 #, fuzzy
 msgid "X Use"
 msgstr "GAIM Usar"
 
-#: src/prefs.c:224
-#, fuzzy
-msgid "Browser Options"
-msgstr "Opciones"
-
-#: src/prefs.c:236
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:237
-msgid "KFM"
-msgstr ""
-
-#: src/prefs.c:239
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:241
-msgid "Manual"
-msgstr "Manual"
-
-#: src/prefs.c:252
-msgid "Pop up new window by default"
-msgstr "Crear una nueva ventana por omisi�n"
-
-#: src/prefs.c:279
-#, fuzzy
-msgid "Logging Options"
-msgstr "Connectando %s\n"
-
-#: src/prefs.c:291
+#: src/prefs.c:253
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:292
+#: src/prefs.c:254
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "Quitar HTML de todas las conversaciones guardadas"
 
-#: src/prefs.c:298
+#: src/prefs.c:260
 msgid "Log when buddies sign on/sign off"
 msgstr ""
 
-#: src/prefs.c:299
+#: src/prefs.c:261
 msgid "Log when buddies become idle/un-idle"
 msgstr ""
 
-#: src/prefs.c:300
+#: src/prefs.c:262
 msgid "Log when buddies go away/come back"
 msgstr ""
 
-#: src/prefs.c:301
-msgid "Log your own signons/idleness/awayness (as set by options above)"
+#: src/prefs.c:263
+msgid "Log your own signons/idleness/awayness"
 msgstr ""
 
-#: src/prefs.c:302
+#: src/prefs.c:264
 msgid "Individual log file for each buddy's signons"
 msgstr ""
 
-#: src/prefs.c:317
+#: src/prefs.c:266
+msgid "Browser"
+msgstr "Navegador"
+
+#: src/prefs.c:278
+msgid "KFM"
+msgstr ""
+
+#: src/prefs.c:279
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/prefs.c:282
+msgid "Pop up new window by default"
+msgstr "Crear una nueva ventana por omisi�n"
+
+#: src/prefs.c:289
+msgid "GNOME URL Handler"
+msgstr ""
+
+#: src/prefs.c:291
+msgid "Manual"
+msgstr "Manual"
+
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Lista de Amigos"
 
-#: src/prefs.c:329
-#, fuzzy
-msgid "Save Window Size/Position"
-msgstr "Guardar algunas configuraciones de tama�o/posicion de ventanas"
-
-#: src/prefs.c:331
-#, fuzzy
-msgid "Automatically show buddy list on sign on"
-msgstr "Automaticamente demuestre la lista de amigos"
-
-#: src/prefs.c:333
+#: src/prefs.c:342
 #, fuzzy
-msgid "Display Buddy List near applet"
-msgstr "Lista de amigos se demuestra cerca del applet"
-
-#: src/prefs.c:340
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:341
-msgid "Show numbers in groups"
-msgstr "Demostrar los numeros en grupos"
-
-#: src/prefs.c:347
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "Demostrar dibujos de los tipos de amigos"
-
-#: src/prefs.c:348
-msgid "Show warning levels"
-msgstr ""
-
-#: src/prefs.c:349
-msgid "Show idle times"
-msgstr "Demostrar el tiempo de inactividad de los amigos"
-
-#: src/prefs.c:355
+msgid "Buddy List Window"
+msgstr "Lista de Amigos"
+
+#: src/prefs.c:354
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
 #: src/prefs.c:356
+#, fuzzy
+msgid "Automatically show buddy list on sign on"
+msgstr "Automaticamente demuestre la lista de amigos"
+
+#: src/prefs.c:359
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "Guardar algunas configuraciones de tama�o/posicion de ventanas"
+
+#: src/prefs.c:365
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:371
-msgid "Conversation Window Options"
+#: src/prefs.c:370
+#, fuzzy
+msgid "Display Buddy List near applet"
+msgstr "Lista de amigos se demuestra cerca del applet"
+
+#: src/prefs.c:373
+msgid "Group Displays"
+msgstr ""
+
+#: src/prefs.c:385
+msgid "Hide groups with no online buddies"
 msgstr ""
 
-#: src/prefs.c:383
+#: src/prefs.c:391
+msgid "Show numbers in groups"
+msgstr "Demostrar los numeros en grupos"
+
+#: src/prefs.c:393
+#, fuzzy
+msgid "Buddy Displays"
+msgstr "Lista de Amigos"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Show buddy type icons"
+msgstr "Demostrar dibujos de los tipos de amigos"
+
+#: src/prefs.c:406
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:412
+msgid "Show idle times"
+msgstr "Demostrar el tiempo de inactividad de los amigos"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Conversation Options"
+msgstr "Guarde todas las conversaciones"
+
+#: src/prefs.c:441
+#, fuzzy
+msgid "Keyboard Options"
+msgstr "Opciones"
+
+#: src/prefs.c:453
 msgid "Enter sends message"
 msgstr "Enter manda el mensaje"
 
-#: src/prefs.c:384
+#: src/prefs.c:454
 #, fuzzy
 msgid "Control-Enter sends message"
 msgstr "Enter manda el mensaje"
 
-#: src/prefs.c:385
+#: src/prefs.c:455
 msgid "Escape closes window"
 msgstr ""
 
-#: src/prefs.c:386
+#: src/prefs.c:461
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:387
+#: src/prefs.c:462
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:388
+#: src/prefs.c:463
 msgid "F2 toggles timestamp display"
 msgstr ""
 
-#: src/prefs.c:394
+#: src/prefs.c:465
+#, fuzzy
+msgid "Display and General Options"
+msgstr "Opciones"
+
+#: src/prefs.c:477
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "Demostrar caritas gr�ficas (experimental)"
 
-#: src/prefs.c:395
+#: src/prefs.c:478
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "Demostrar la hora de los mensajes"
 
-#: src/prefs.c:396
-#, fuzzy
-msgid "Ignore colors"
-msgstr "Ignorar los colores de los amigos"
-
-#: src/prefs.c:397
-#, fuzzy
-msgid "Ignore font faces"
-msgstr "Hacer el texto mas grande "
-
-#: src/prefs.c:398
-#, fuzzy
-msgid "Ignore font sizes"
-msgstr "Hacer el texto mas grande "
-
-#: src/prefs.c:404
-#, fuzzy
-msgid "Highlight misspelled words"
-msgstr "Automagicamente destaque las faltas de ortograf�a"
-
-#: src/prefs.c:405
+#: src/prefs.c:479
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "Mandar direcciones como enlaze"
 
-#: src/prefs.c:406
+#: src/prefs.c:480
+#, fuzzy
+msgid "Highlight misspelled words"
+msgstr "Automagicamente destaque las faltas de ortograf�a"
+
+#: src/prefs.c:481 src/prefs.c:1611
 msgid "Sending messages removes away status"
 msgstr "Mandando un mensaje quita el estado de ausente"
 
-#: src/prefs.c:447 src/prefs.c:540
-msgid "Pictures and Text"
-msgstr ""
-
-#: src/prefs.c:453 src/prefs.c:546
-msgid "Pictures Only"
-msgstr ""
-
-#: src/prefs.c:459 src/prefs.c:552
+#: src/prefs.c:482 src/prefs.c:1618
+#, fuzzy
+msgid "Queue new messages when away"
+msgstr "Ignorar nuevas conversaciones mientras este ausente"
+
+#: src/prefs.c:488
+#, fuzzy
+msgid "Ignore colors"
+msgstr "Ignorar los colores de los amigos"
+
+#: src/prefs.c:489
 #, fuzzy
-msgid "Text Only"
-msgstr "Color del texto"
-
-#: src/prefs.c:483
+msgid "Ignore font faces"
+msgstr "Hacer el texto mas grande "
+
+#: src/prefs.c:490
+#, fuzzy
+msgid "Ignore font sizes"
+msgstr "Hacer el texto mas grande "
+
+#: src/prefs.c:491
+#, fuzzy
+msgid "Ignore TiK Automated Messages"
+msgstr "Crear Mensaje"
+
+#: src/prefs.c:492 src/prefs.c:1609
+msgid "Ignore new conversations when away"
+msgstr "Ignorar nuevas conversaciones mientras este ausente"
+
+#: src/prefs.c:630
 #, fuzzy
 msgid "IM Options"
 msgstr "Opciones"
 
-#: src/prefs.c:495
+#: src/prefs.c:642
+msgid "IM Window"
+msgstr ""
+
+#: src/prefs.c:654 src/prefs.c:687
+#, fuzzy
+msgid "Show buttons as "
+msgstr "Demostrar los dibujos en los botonoes"
+
+#: src/prefs.c:658 src/prefs.c:691
+msgid "Pictures And Text"
+msgstr ""
+
+#: src/prefs.c:659 src/prefs.c:692
+msgid "Pictures"
+msgstr ""
+
+#: src/prefs.c:660 src/prefs.c:693
+#, fuzzy
+msgid "Text"
+msgstr "Texto en Negritas"
+
+#: src/prefs.c:670
 #, fuzzy
 msgid "Show all conversations in one tabbed window"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:496
+#: src/prefs.c:671 src/prefs.c:704
+#, fuzzy
+msgid "Raise windows on events"
+msgstr "Alzar ventanas cuando un mensaje sea recibido"
+
+#: src/prefs.c:672
 #, fuzzy
 msgid "Show logins in window"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:502 src/prefs.c:593
-#, fuzzy
-msgid "Show buttons as "
-msgstr "Demostrar los dibujos en los botonoes"
-
-#: src/prefs.c:511 src/prefs.c:603
+#: src/prefs.c:673 src/prefs.c:706
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:513 src/prefs.c:605
-#, fuzzy
-msgid "Raise windows on events"
-msgstr "Alzar ventanas cuando un mensaje sea recibido"
-
-#: src/prefs.c:514 src/prefs.c:1509
-msgid "Ignore new conversations when away"
-msgstr "Ignorar nuevas conversaciones mientras este ausente"
-
-#: src/prefs.c:516
-#, fuzzy
-msgid "Ignore TiK Automated Messages"
-msgstr "Crear Mensaje"
-
-#: src/prefs.c:574
-#, fuzzy
-msgid "Chat Options"
-msgstr "Opciones"
-
-#: src/prefs.c:586
+#: src/prefs.c:675
+msgid "Group Chat Window"
+msgstr ""
+
+#: src/prefs.c:703
 #, fuzzy
 msgid "Show all chats in one tabbed window"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:587
+#: src/prefs.c:705
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
+#: src/prefs.c:708
+#, fuzzy
+msgid "Tabbed Window Options"
+msgstr "Guardar algunas configuraciones de tama�o/posicion de ventanas"
+
+#: src/prefs.c:720
+msgid "IM Tab Placement:"
+msgstr ""
+
+#: src/prefs.c:732 src/prefs.c:766
+msgid "Top"
+msgstr ""
+
+#: src/prefs.c:734 src/prefs.c:768
+msgid "Bottom"
+msgstr ""
+
+#: src/prefs.c:741 src/prefs.c:775
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:743 src/prefs.c:777
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:754
+msgid "Chat Tab Placement:"
+msgstr ""
+
+#: src/prefs.c:809 src/prefs.c:811 src/prefs.c:1014 src/prefs.c:1016
 msgid "Gaim Chat"
 msgstr "Gaim Conversaciones"
 
-#: src/prefs.c:779 src/prefs.c:2241
+#: src/prefs.c:952 src/prefs.c:2458
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:797
+#: src/prefs.c:970
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/prefs.c:822
+#: src/prefs.c:995
 msgid "List of available chats"
 msgstr "Lista de conversaciones disponibles"
 
-#: src/prefs.c:832
+#: src/prefs.c:1005
 msgid "List of subscribed chats"
 msgstr "Lista de conversaciones subscritas"
 
-#: src/prefs.c:962 src/prefs.c:2246
+#.
+#. text[0] = _("Chat Window");
+#. node = gtk_ctree_insert_node(GTK_CTREE(preftree), parent, NULL,
+#. text, 5, NULL, NULL, NULL, NULL, 0, 1);
+#. gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node, chat_page);
+#.
+#: src/prefs.c:1135 src/prefs.c:2453
 #, fuzzy
 msgid "Font Options"
 msgstr "Opciones"
 
-#: src/prefs.c:976
+#: src/prefs.c:1149
 msgid "Underlined Text"
 msgstr "Texto Subrayado"
 
-#: src/prefs.c:977
+#: src/prefs.c:1150
 msgid "Strike Text"
 msgstr "Texto cruzado por una linea"
 
-#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
+#: src/prefs.c:1163 src/prefs.c:1181 src/prefs.c:1202
 #, fuzzy
 msgid "Select"
 msgstr "Seleccionar un Texto"
 
-#: src/prefs.c:1027
+#: src/prefs.c:1200
 msgid "Font Face for Text"
 msgstr "Tipo de texto"
 
-#: src/prefs.c:1042
+#: src/prefs.c:1215
 #, fuzzy
 msgid "Font Size for Text"
 msgstr "Tipo de texto"
 
-#: src/prefs.c:1067
+#: src/prefs.c:1291
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Guardar Conversaci�n"
+
+#: src/prefs.c:1326
+#, fuzzy
+msgid "Reset"
+msgstr "Registrar"
+
+#: src/prefs.c:1331
+#, fuzzy
+msgid "Choose..."
+msgstr "Cerrar"
+
+#: src/prefs.c:1370
 #, fuzzy
 msgid "Sound Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1079
+#: src/prefs.c:1398
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:1080 src/prefs.c:1511
+#: src/prefs.c:1399 src/prefs.c:1610
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1081
+#: src/prefs.c:1405
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1146
-#, fuzzy
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Guardar Conversaci�n"
-
-#: src/prefs.c:1181
-#, fuzzy
-msgid "Reset"
-msgstr "Registrar"
-
-#: src/prefs.c:1186
-#, fuzzy
-msgid "Choose..."
-msgstr "Cerrar"
-
-#: src/prefs.c:1222
-#, fuzzy
-msgid "Sound Events"
-msgstr "Sonidos"
-
-#: src/prefs.c:1234
+#: src/prefs.c:1415
+#, c-format
+msgid ""
+"Command to play sound files\n"
+"(%s for filename; internal if empty)"
+msgstr ""
+
+#: src/prefs.c:1426
+msgid "Events"
+msgstr ""
+
+#: src/prefs.c:1434
 msgid "Sound when buddy logs in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:1235
+#: src/prefs.c:1435
 msgid "Sound when buddy logs out"
 msgstr "Sonido cuando un amigo se desconecte"
 
-#: src/prefs.c:1241
+#: src/prefs.c:1441
+#, fuzzy
+msgid "Sound when received message begins conversation"
+msgstr "Sonido cuando un mensaje es enviado"
+
+#: src/prefs.c:1442
 msgid "Sound when message is received"
 msgstr "Sonido cuando un mensaje es recibido"
 
-#: src/prefs.c:1242
-#, fuzzy
-msgid "Sound when message is first received"
-msgstr "Sonido cuando un mensaje es recibido"
-
-#: src/prefs.c:1243
+#: src/prefs.c:1443
 msgid "Sound when message is sent"
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/prefs.c:1249
+#: src/prefs.c:1449
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "Sonidos en conversaciones cuando gente entra o sale"
 
-#: src/prefs.c:1250
+#: src/prefs.c:1450
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "Sonidos en conversaciones cuando gente entra o sale"
 
-#: src/prefs.c:1251
+#: src/prefs.c:1451
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "Sonidos en conversaciones cuando getne habla"
 
-#: src/prefs.c:1252
+#: src/prefs.c:1452
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "Sonidos en conversaciones cuando getne habla"
 
-#: src/prefs.c:1262
-#, c-format
-msgid "Command to play sound files (%s for filename; internal if empty)"
-msgstr ""
-
-#: src/prefs.c:1408 src/prefs.c:2273
+#: src/prefs.c:1581 src/prefs.c:2480
 #, fuzzy
 msgid "Away Messages"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/prefs.c:1420
+#: src/prefs.c:1617
+msgid "Don't send auto-response"
+msgstr ""
+
+#: src/prefs.c:1628
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1641
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1654
+#, fuzzy
+msgid "Messages"
+msgstr "Crear Mensaje"
+
+#: src/prefs.c:1666
 #, fuzzy
 msgid "Title"
 msgstr "Archivo"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1670
 #, fuzzy
 msgid "Message"
 msgstr "Crear Mensaje"
 
-#: src/prefs.c:1464
+#: src/prefs.c:1709
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1468
+#: src/prefs.c:1713
 #, fuzzy
 msgid "Make Away"
 msgstr "Hacerme ausente ahora"
 
-#: src/prefs.c:1512
-msgid "Don't send auto-response"
-msgstr ""
-
-#: src/prefs.c:1522
-msgid "Auto Away after"
-msgstr ""
-
-#: src/prefs.c:1535
-msgid "minutes using"
-msgstr ""
-
-#: src/prefs.c:1754
+#: src/prefs.c:1959
 #, fuzzy
 msgid "Privacy Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1770
+#: src/prefs.c:1975
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1789
+#: src/prefs.c:1994
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1790
+#: src/prefs.c:1995
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1792
+#: src/prefs.c:1997
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1823
+#: src/prefs.c:2028
 #, fuzzy
 msgid "Deny all users"
 msgstr "Negar algunos"
 
-#: src/prefs.c:1824
+#: src/prefs.c:2029
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1826
+#: src/prefs.c:2031
 #, fuzzy
 msgid "Block List"
 msgstr "Bloquear"
 
-#: src/prefs.c:1921
+#: src/prefs.c:2126
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
-#: src/prefs.c:2001
+#: src/prefs.c:2206
 msgid "GAIM debug output window"
 msgstr "GAIM ventana de respuestas del programa"
 
-#: src/prefs.c:2192
+#: src/prefs.c:2400
 msgid "General"
 msgstr "General"
 
-#: src/prefs.c:2197
-msgid "Browser"
-msgstr "Navegador"
-
-#: src/prefs.c:2226
+#: src/prefs.c:2436
 #, fuzzy
 msgid "Conversations"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:2231
-msgid "IM Window"
+#: src/prefs.c:2441
+msgid "Windows"
 msgstr ""
 
-#: src/prefs.c:2236
-msgid "Chat Window"
-msgstr ""
-
-#: src/prefs.c:2257
+#: src/prefs.c:2469
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/prefs.c:2262
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2284
+#: src/prefs.c:2491
 msgid "Privacy"
 msgstr ""
 
@@ -2103,11 +2193,32 @@
 msgid "Register new user for"
 msgstr ""
 
-#: src/server.c:608
+#: src/server.c:56
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
+msgstr ""
+
+#: src/server.c:58
+#, fuzzy
+msgid "Login Error"
+msgstr "Error de aditivo"
+
+#: src/server.c:463
+#, fuzzy, c-format
+msgid "(%d messages)"
+msgstr "Sonido cuando un mensaje es enviado"
+
+#: src/server.c:469
+#, fuzzy
+msgid "(1 message)"
+msgstr "Con el mensaje:"
+
+#: src/server.c:763
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:609
+#: src/server.c:764
 msgid "No"
 msgstr ""
 
@@ -2184,6 +2295,30 @@
 msgid "%s requests you to send them a file"
 msgstr "%s le pide que les mande un archivo"
 
+#, fuzzy
+#~ msgid "Browser Options"
+#~ msgstr "Opciones"
+
+#, fuzzy
+#~ msgid "Logging Options"
+#~ msgstr "Connectando %s\n"
+
+#, fuzzy
+#~ msgid "Text Only"
+#~ msgstr "Color del texto"
+
+#, fuzzy
+#~ msgid "Chat Options"
+#~ msgstr "Opciones"
+
+#, fuzzy
+#~ msgid "Sound Events"
+#~ msgstr "Sonidos"
+
+#, fuzzy
+#~ msgid "Sound when message is first received"
+#~ msgstr "Sonido cuando un mensaje es recibido"
+
 #~ msgid "Offline"
 #~ msgstr "Desconectado"
 
--- a/po/fr.po	Mon Apr 30 17:57:16 2001 +0000
+++ b/po/fr.po	Mon Apr 30 18:52:47 2001 +0000
@@ -6,44 +6,56 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2001-04-13 17:07-0700\n"
+"POT-Creation-Date: 2001-04-30 10:14-0700\n"
 "PO-Revision-Date: 2000-06-13 22:26-0700\n"
 "Last-Translator: Seb Carpe\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: plugins/icq/gaim_icq.c:401 src/oscar.c:2261 src/toc.c:918
+#: plugins/msn/msn.c:1222
+msgid "Gaim-MSN: New Mail"
+msgstr ""
+
+#. Build OK Button
+#: plugins/msn/msn.c:1236 src/dialogs.c:611 src/dialogs.c:701
+#: src/dialogs.c:761 src/dialogs.c:1281 src/dialogs.c:1619 src/dialogs.c:1732
+#: src/dialogs.c:2084 src/dialogs.c:2270 src/dialogs.c:2338 src/dialogs.c:3854
+#: src/dialogs.c:3942 src/multi.c:479
+msgid "OK"
+msgstr "OK"
+
+#: plugins/icq/gaim_icq.c:401 src/oscar.c:2362 src/toc.c:918
 #, fuzzy
 msgid "Get Info"
 msgstr "Message d'Information"
 
-#: plugins/yay/yay.c:172
+#: plugins/yay/yay.c:174
 #, fuzzy
 msgid "Your message did not get sent."
 msgstr "Son � l'envoi d'un message"
 
-#: plugins/yay/yay.c:172 src/dialogs.c:3067 src/dialogs.c:3074
-#: src/oscar.c:1309 src/oscar.c:1314 src/oscar.c:1350 src/oscar.c:1369
-#: src/oscar.c:1405
+#: plugins/yay/yay.c:174 src/dialogs.c:3071 src/dialogs.c:3078
+#: src/oscar.c:1410 src/oscar.c:1415 src/oscar.c:1451 src/oscar.c:1470
+#: src/oscar.c:1506
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - Erreur %d"
 
-#: plugins/yay/yay.c:190
+#: plugins/yay/yay.c:192
 #, c-format
 msgid "%s has made %s their buddy%s%s"
 msgstr ""
 
-#: plugins/yay/yay.c:192
+#: plugins/yay/yay.c:194
 #, fuzzy
 msgid "Gaim - Buddy"
 msgstr "GAIM - Ajouter un Pote"
 
-#: plugins/yay/yay.c:236 src/about.c:179 src/aim.c:301 src/buddy.c:2387
-#: src/buddy_chat.c:910 src/buddy_chat.c:1046 src/buddy_chat.c:1073
-#: src/conversation.c:2077 src/dialogs.c:434 src/dialogs.c:3817
-#: src/multi.c:686 src/plugins.c:319 src/prefs.c:1971 src/prpl.c:355
+#: plugins/yay/yay.c:238 src/about.c:179 src/aim.c:303 src/buddy.c:2584
+#: src/buddy_chat.c:919 src/buddy_chat.c:1055 src/buddy_chat.c:1082
+#: src/conversation.c:2110 src/dialogs.c:440 src/dialogs.c:3719
+#: src/multi.c:686 src/plugins.c:321 src/prefs.c:2176 src/prpl.c:355
 msgid "Close"
 msgstr "Fermer"
 
@@ -67,61 +79,61 @@
 msgid "Web Site"
 msgstr ""
 
-#: src/aim.c:135 src/buddy.c:2380
+#: src/aim.c:137 src/buddy.c:2577
 msgid "Signoff"
 msgstr "Deconnection"
 
-#: src/aim.c:147
+#: src/aim.c:149
 msgid "Please enter your logon"
 msgstr "Entrez votre login"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:850
+#: src/aim.c:149 src/aim.c:154 src/multi.c:850
 #, fuzzy
 msgid "Signon Error"
 msgstr "Connection"
 
-#: src/aim.c:152
+#: src/aim.c:154
 #, fuzzy
 msgid "Please enter your password"
 msgstr "Entrez votre login"
 
-#: src/aim.c:246
+#: src/aim.c:248
 msgid "Gaim - Login"
 msgstr "Gaim - Connection"
 
-#: src/aim.c:264
+#: src/aim.c:266
 msgid "Screen Name: "
 msgstr "Pseudonyme: "
 
-#: src/aim.c:278
+#: src/aim.c:280
 msgid "Password: "
 msgstr "Mot de Passe: "
 
-#: src/aim.c:299 src/buddy.c:2384
+#: src/aim.c:301 src/buddy.c:2581
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/aim.c:304 src/aim.c:641 src/buddy.c:2443
+#: src/aim.c:306 src/aim.c:642 src/buddy.c:2640
 msgid "Accounts"
 msgstr ""
 
-#: src/aim.c:306 src/multi.c:590
+#: src/aim.c:308 src/multi.c:590
 msgid "Signon"
 msgstr "Connection"
 
-#: src/aim.c:338 src/prpl.c:359
+#: src/aim.c:340 src/prpl.c:359
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: src/aim.c:339
+#: src/aim.c:341 src/prefs.c:1382 src/prefs.c:1593
 msgid "Options"
 msgstr "Options"
 
-#: src/aim.c:341 src/aim.c:644 src/buddy.c:2460
+#: src/aim.c:343 src/aim.c:645 src/buddy.c:2657
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:638 src/buddy.c:2452
+#: src/aim.c:639 src/buddy.c:2649
 msgid "Preferences"
 msgstr "Pr�f�rences"
 
@@ -138,11 +150,11 @@
 msgid "Offilne. Click to bring up login box."
 msgstr "D�connect�. Cliquer pour obtenir la fen�tre de connection."
 
-#: src/applet.c:169 src/buddy.c:2398
+#: src/applet.c:169 src/buddy.c:2595
 msgid "Away"
 msgstr "Absent"
 
-#: src/applet.c:172 src/away.c:266
+#: src/applet.c:172 src/away.c:342
 msgid "New Away Message"
 msgstr "Nouveau Message d'absence"
 
@@ -154,130 +166,135 @@
 msgid "About..."
 msgstr "A Propos..."
 
-#: src/away.c:96
+#: src/away.c:157
 msgid "I'm Back!"
 msgstr "Je suis de Retour!!"
 
-#: src/away.c:133
+#: src/away.c:210
 msgid "Gaim - Away!"
 msgstr "Gaim - Absent!"
 
-#: src/away.c:147 src/away.c:228 src/away.c:393
+#: src/away.c:224 src/away.c:304 src/away.c:469
 msgid "Back"
 msgstr "De retour"
 
-#: src/away.c:286
+#: src/away.c:362
 msgid "Remove Away Message"
 msgstr "Enlever le message d'absence"
 
-#: src/away.c:462
+#: src/away.c:538
 msgid "Set All Away"
 msgstr ""
 
 #. Put the buttons in the box
-#: src/buddy.c:266 src/buddy.c:2528 src/buddy_chat.c:1078
-#: src/conversation.c:1772 src/conversation.c:2092 src/dialogs.c:872
-#: src/dialogs.c:996 src/dialogs.c:1897 src/multi.c:670 src/prefs.c:798
-#: src/prefs.c:1460 src/prefs.c:1811 src/prefs.c:1845
+#: src/buddy.c:437 src/buddy.c:2725 src/buddy_chat.c:1087
+#: src/conversation.c:1793 src/conversation.c:2125 src/dialogs.c:878
+#: src/dialogs.c:1002 src/dialogs.c:1898 src/multi.c:670 src/prefs.c:971
+#: src/prefs.c:1705 src/prefs.c:2016 src/prefs.c:2050
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/buddy.c:267 src/buddy.c:2529 src/dialogs.c:882 src/dialogs.c:978
+#: src/buddy.c:438 src/buddy.c:2726 src/dialogs.c:888 src/dialogs.c:984
 msgid "Group"
 msgstr "Groupe"
 
-#: src/buddy.c:268 src/buddy.c:2530 src/buddy_chat.c:1080
-#: src/conversation.c:1758 src/conversation.c:2089 src/prefs.c:799
-#: src/prefs.c:1474 src/prefs.c:1815 src/prefs.c:1849
+#: src/buddy.c:439 src/buddy.c:2727 src/buddy_chat.c:1089
+#: src/conversation.c:1779 src/conversation.c:2122 src/prefs.c:972
+#: src/prefs.c:1719 src/prefs.c:2020 src/prefs.c:2054
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/buddy.c:271 src/buddy.c:1912 src/buddy.c:2271
+#: src/buddy.c:442 src/buddy.c:2113 src/buddy.c:2468
 msgid "Chat"
 msgstr "Forum"
 
-#: src/buddy.c:272 src/buddy.c:464 src/buddy.c:2269 src/buddy_chat.c:478
-#: src/buddy_chat.c:863
+#: src/buddy.c:443 src/buddy.c:654 src/buddy.c:764 src/buddy.c:2466
+#: src/buddy_chat.c:475 src/buddy_chat.c:872
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:273 src/buddy.c:2270 src/buddy_chat.c:491 src/buddy_chat.c:871
-#: src/buddy_chat.c:1086 src/conversation.c:2110
+#: src/buddy.c:444 src/buddy.c:2467 src/buddy_chat.c:488 src/buddy_chat.c:880
+#: src/buddy_chat.c:1095 src/conversation.c:2143
 msgid "Info"
 msgstr "Info"
 
 #. Put the buttons in the box
-#: src/buddy.c:470 src/buddy.c:575 src/dialogs.c:972 src/dialogs.c:3432
-#: src/dialogs.c:3447 src/dialogs.c:3524 src/dialogs.c:3539
+#: src/buddy.c:660 src/buddy.c:770 src/dialogs.c:978 src/dialogs.c:3426
+#: src/dialogs.c:3441
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:476 src/buddy.c:589
+#: src/buddy.c:666 src/buddy.c:790
 msgid "Add Buddy Pounce"
 msgstr "Ajouter une Alerte"
 
-#: src/buddy.c:482 src/buddy.c:595
+#: src/buddy.c:672 src/buddy.c:796
 msgid "View Log"
 msgstr ""
 
-#: src/buddy.c:582
+#: src/buddy.c:752 src/buddy.c:784
+#, fuzzy
+msgid "Rename"
+msgstr "Enlever"
+
+#: src/buddy.c:777
 msgid "Un-Alias"
 msgstr ""
 
-#: src/buddy.c:1590
+#: src/buddy.c:1791
 msgid "New Buddy Pounce"
 msgstr "Nouvelle Alerte"
 
-#: src/buddy.c:1608
+#: src/buddy.c:1809
 msgid "Remove Buddy Pounce"
 msgstr "Enlever une Alerte"
 
-#: src/buddy.c:1903
+#: src/buddy.c:2104
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "Alerte"
 
-#: src/buddy.c:1906
+#: src/buddy.c:2107
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1909
+#: src/buddy.c:2110
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1915
+#: src/buddy.c:2116
 #, fuzzy
 msgid "Get File"
 msgstr "Fichier"
 
-#: src/buddy.c:1918
+#: src/buddy.c:2119
 #, fuzzy
 msgid "Send File"
 msgstr "Fichier"
 
-#: src/buddy.c:1921
+#: src/buddy.c:2122
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:1924
+#: src/buddy.c:2125
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:1976
+#: src/buddy.c:2177
 #, fuzzy, c-format
 msgid "Logged in: %s\n"
 msgstr "Connection de %s.\n"
 
-#: src/buddy.c:1987
+#: src/buddy.c:2188
 msgid "Warnings: %d%%\n"
 msgstr "Attention: %d%%\n"
 
-#: src/buddy.c:1999
+#: src/buddy.c:2200
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:2003
+#: src/buddy.c:2204
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -288,537 +305,537 @@
 "Connect� depuis: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:2007
+#: src/buddy.c:2208
 msgid "Idle: "
 msgstr "Inactif: "
 
-#: src/buddy.c:2076
+#: src/buddy.c:2277
 #, fuzzy, c-format
-msgid "<B>%s logged in%s%s.</B>"
+msgid "%s logged in."
 msgstr "<HR><B>%s s'est connect�%s%s.</B><BR><HR>"
 
-#: src/buddy.c:2130
+#: src/buddy.c:2329
 #, fuzzy, c-format
-msgid "<B>%s logged out%s%s.</B>"
+msgid "%s logged out."
 msgstr "HR><B>%s s'est d�connect�%s%s.</B><BR><HR>"
 
-#: src/buddy.c:2296
+#: src/buddy.c:2493
 msgid "Information on selected Buddy"
 msgstr "Information sur le pote s�lectionn�"
 
-#: src/buddy.c:2297 src/dialogs.c:671
+#: src/buddy.c:2494 src/dialogs.c:677
 msgid "Send Instant Message"
 msgstr "Envoyer un message"
 
-#: src/buddy.c:2298
+#: src/buddy.c:2495
 msgid "Start/join a Buddy Chat"
 msgstr "Ouvrir/Rallier un Forum"
 
-#: src/buddy.c:2362
+#: src/buddy.c:2559
 msgid "File"
 msgstr "Fichier"
 
-#: src/buddy.c:2366
+#: src/buddy.c:2563
 msgid "Add A Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/buddy.c:2368
+#: src/buddy.c:2565
 #, fuzzy
 msgid "Join A Chat"
 msgstr "Rallier le forum"
 
-#: src/buddy.c:2370
+#: src/buddy.c:2567
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Envoyer un message"
 
-#: src/buddy.c:2375
+#: src/buddy.c:2572
 msgid "Import Buddy List"
 msgstr "Importer une Liste de Potes"
 
-#: src/buddy.c:2377
+#: src/buddy.c:2574
 msgid "Export Buddy List"
 msgstr "Exporter une Liste de Potes"
 
-#: src/buddy.c:2393
+#: src/buddy.c:2590
 msgid "Tools"
 msgstr "Outils"
 
-#: src/buddy.c:2403
+#: src/buddy.c:2600
 msgid "Buddy Pounce"
 msgstr "Alerte"
 
-#: src/buddy.c:2412 src/dialogs.c:2078 src/dialogs.c:2245
+#: src/buddy.c:2609 src/dialogs.c:2079 src/dialogs.c:2246
 msgid "Search for Buddy"
 msgstr "Rechercher un Pote"
 
-#: src/buddy.c:2415
+#: src/buddy.c:2612
 msgid "by Email"
 msgstr "Par son Email"
 
-#: src/buddy.c:2419
+#: src/buddy.c:2616
 msgid "by Dir Info"
 msgstr "Par ses Informations Personnelles"
 
-#: src/buddy.c:2426 src/buddy.c:2427
+#: src/buddy.c:2623 src/buddy.c:2624
 msgid "Settings"
 msgstr "Pr�f�rences"
 
-#: src/buddy.c:2430
+#: src/buddy.c:2627
 msgid "User Info"
 msgstr "Message d'Information"
 
-#: src/buddy.c:2434 src/dialogs.c:1356
+#: src/buddy.c:2631 src/dialogs.c:1362
 msgid "Directory Info"
 msgstr "Information Personnelle"
 
-#: src/buddy.c:2438 src/dialogs.c:1547
+#: src/buddy.c:2635 src/dialogs.c:1553
 msgid "Change Password"
 msgstr "Changer de Mot de Passe"
 
-#: src/buddy.c:2447
+#: src/buddy.c:2644
 #, fuzzy
 msgid "Protocol Actions"
 msgstr "Options"
 
-#: src/buddy.c:2454
+#: src/buddy.c:2651
 msgid "View System Log"
 msgstr ""
 
-#: src/buddy.c:2465
+#: src/buddy.c:2662
 #, fuzzy
 msgid "Perl"
 msgstr "Autoriser"
 
-#: src/buddy.c:2468
+#: src/buddy.c:2665
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2472
+#: src/buddy.c:2669
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2476
+#: src/buddy.c:2673
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2484
+#: src/buddy.c:2681
 msgid "Help"
 msgstr "Aide"
 
-#: src/buddy.c:2489
+#: src/buddy.c:2686
 #, fuzzy
 msgid "About Gaim"
 msgstr "A propos..."
 
-#: src/buddy.c:2508 src/prefs.c:2215
+#: src/buddy.c:2705 src/prefs.c:2425
 msgid "Buddy List"
 msgstr "Liste de Potes"
 
-#: src/buddy.c:2562
+#: src/buddy.c:2759
 msgid "Add a new Buddy"
 msgstr "Ajouter un Nouveau Pote"
 
-#: src/buddy.c:2563
+#: src/buddy.c:2760
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Ajouter un Nouveau Pote"
 
-#: src/buddy.c:2564
+#: src/buddy.c:2761
 msgid "Remove selected Buddy"
 msgstr "Supprimer le Pote s�lectionn�"
 
-#: src/buddy.c:2589
+#: src/buddy.c:2786
 msgid "Online"
 msgstr "En Ligne"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2788
 msgid "Edit Buddies"
 msgstr "Editer ses amis"
 
-#: src/buddy.c:2628
+#: src/buddy.c:2825
 msgid "Gaim - Buddy List"
 msgstr "GAIM - Liste des Potes"
 
-#: src/buddy_chat.c:160
+#: src/buddy_chat.c:157
 msgid "Join Chat"
 msgstr "Rallier le forum"
 
-#: src/buddy_chat.c:167 src/buddy_chat.c:978 src/buddy_chat.c:990
+#: src/buddy_chat.c:164 src/buddy_chat.c:987 src/buddy_chat.c:999
 msgid "Buddy Chat"
 msgstr "Forum"
 
-#: src/buddy_chat.c:177
+#: src/buddy_chat.c:174
 msgid "Join what group:"
 msgstr "Joindre le groupe: "
 
-#: src/buddy_chat.c:190
+#: src/buddy_chat.c:187
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "Rallier le forum"
 
-#: src/buddy_chat.c:202
+#: src/buddy_chat.c:199
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:209
+#: src/buddy_chat.c:206
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:217 src/buddy_chat.c:262 src/dialogs.c:404
-#: src/dialogs.c:690 src/dialogs.c:750 src/dialogs.c:874 src/dialogs.c:991
-#: src/dialogs.c:1270 src/dialogs.c:1480 src/dialogs.c:1608 src/dialogs.c:1673
-#: src/dialogs.c:1886 src/dialogs.c:2084 src/dialogs.c:2264 src/dialogs.c:2338
-#: src/dialogs.c:3200 src/dialogs.c:3434 src/dialogs.c:3526 src/dialogs.c:3713
-#: src/multi.c:475 src/multi.c:586 src/multi.c:833 src/prpl.c:156
-#: src/prpl.c:227
+#: src/buddy_chat.c:214 src/buddy_chat.c:259 src/dialogs.c:410
+#: src/dialogs.c:696 src/dialogs.c:756 src/dialogs.c:880 src/dialogs.c:997
+#: src/dialogs.c:1276 src/dialogs.c:1486 src/dialogs.c:1614 src/dialogs.c:1679
+#: src/dialogs.c:1887 src/dialogs.c:2085 src/dialogs.c:2265 src/dialogs.c:2339
+#: src/dialogs.c:3204 src/dialogs.c:3428 src/dialogs.c:3619 src/dialogs.c:3849
+#: src/dialogs.c:3937 src/multi.c:475 src/multi.c:586 src/multi.c:833
+#: src/prpl.c:156 src/prpl.c:227
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/buddy_chat.c:222
+#: src/buddy_chat.c:219
 msgid "Join"
 msgstr "Joindre"
 
-#: src/buddy_chat.c:263 src/buddy_chat.c:916 src/buddy_chat.c:1045
+#: src/buddy_chat.c:260 src/buddy_chat.c:925 src/buddy_chat.c:1054
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/buddy_chat.c:279
+#: src/buddy_chat.c:276
 msgid "Invite who?"
 msgstr "Inviter qui ?"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:280
 msgid "With message:"
 msgstr "En utilisant le message:"
 
-#: src/buddy_chat.c:307
+#: src/buddy_chat.c:304
 msgid "Invite to Buddy Chat"
 msgstr "Inviter � un Forum"
 
-#: src/buddy_chat.c:484 src/buddy_chat.c:867
+#: src/buddy_chat.c:481 src/buddy_chat.c:876
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: src/buddy_chat.c:536 src/buddy_chat.c:642
+#: src/buddy_chat.c:533 src/buddy_chat.c:639
 #, c-format
 msgid "%d %s in room"
 msgstr ""
 
-#: src/buddy_chat.c:543
+#: src/buddy_chat.c:540
 #, c-format
-msgid "<B>%s entered the room.</B>"
+msgid "%s entered the room."
 msgstr ""
 
-#: src/buddy_chat.c:606
+#: src/buddy_chat.c:603
 #, c-format
-msgid "<B>%s is now known as %s</B>"
+msgid "%s is now known as %s"
 msgstr ""
 
-#: src/buddy_chat.c:649
+#: src/buddy_chat.c:646
 #, c-format
-msgid "<B>%s left the room.</B>"
+msgid "%s left the room."
 msgstr ""
 
-#: src/buddy_chat.c:776
+#: src/buddy_chat.c:773
 #, fuzzy
 msgid "Gaim - Group Chats"
 msgstr "Forum Gaim"
 
-#: src/buddy_chat.c:844
+#: src/buddy_chat.c:853
 msgid "0 people in room"
 msgstr ""
 
-#: src/buddy_chat.c:921 src/buddy_chat.c:1044
+#: src/buddy_chat.c:930 src/buddy_chat.c:1053
 msgid "Whisper"
 msgstr "Murmurer"
 
-#: src/buddy_chat.c:926 src/buddy_chat.c:1042 src/buddy_chat.c:1088
-#: src/conversation.c:2121
+#: src/buddy_chat.c:935 src/buddy_chat.c:1051 src/buddy_chat.c:1097
+#: src/conversation.c:2154
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/buddy_chat.c:1082 src/conversation.c:2098
+#: src/buddy_chat.c:1091 src/conversation.c:2131
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/buddy_chat.c:1084 src/conversation.c:2104 src/dialogs.c:374
-#: src/dialogs.c:399
+#: src/buddy_chat.c:1093 src/conversation.c:2137 src/dialogs.c:380
+#: src/dialogs.c:405
 msgid "Warn"
 msgstr "Donner un Avertissement"
 
-#: src/conversation.c:352
+#: src/conversation.c:365
 #, fuzzy
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/conversation.c:503
+#: src/conversation.c:518
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Suppression de '%s' de la Liste\n"
 
-#: src/conversation.c:1068
+#: src/conversation.c:1083
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Actuellement � %d\n"
 
-#: src/conversation.c:1076
+#: src/conversation.c:1091
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Positionn� � %d\n"
 
-#: src/conversation.c:1602
+#: src/conversation.c:1623
 msgid "Bold"
 msgstr "Gras"
 
-#: src/conversation.c:1602 src/prefs.c:974
+#: src/conversation.c:1623 src/prefs.c:1147
 msgid "Bold Text"
 msgstr "Texte en Gras"
 
-#: src/conversation.c:1606 src/conversation.c:1607
+#: src/conversation.c:1627 src/conversation.c:1628
 msgid "Italics"
 msgstr "Italique"
 
-#: src/conversation.c:1606 src/prefs.c:975
+#: src/conversation.c:1627 src/prefs.c:1148
 msgid "Italics Text"
 msgstr "Texte en Italique"
 
-#: src/conversation.c:1610 src/conversation.c:1611
+#: src/conversation.c:1631 src/conversation.c:1632
 msgid "Underline"
 msgstr "Soulign�"
 
-#: src/conversation.c:1610
+#: src/conversation.c:1631
 msgid "Underline Text"
 msgstr "Texte Soulign�"
 
-#: src/conversation.c:1615
+#: src/conversation.c:1636
 msgid "Strike"
 msgstr "Barr�"
 
-#: src/conversation.c:1615
+#: src/conversation.c:1636
 msgid "Strike through Text"
 msgstr "Texte Barr�"
 
-#: src/conversation.c:1621
+#: src/conversation.c:1642
 msgid "Small"
 msgstr "Petit"
 
-#: src/conversation.c:1621
+#: src/conversation.c:1642
 msgid "Decrease font size"
 msgstr "Fonte plus Petite"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1645
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1645
 msgid "Normal font size"
 msgstr "Fonte Normale"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1648
 msgid "Big"
 msgstr "Grand"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1648
 msgid "Increase font size"
 msgstr "Fonte plus Grande"
 
-#: src/conversation.c:1634 src/conversation.c:1635
+#: src/conversation.c:1655 src/conversation.c:1656
 msgid "Font"
 msgstr "Fonte"
 
-#: src/conversation.c:1634 src/dialogs.c:2687 src/dialogs.c:2703
+#: src/conversation.c:1655 src/dialogs.c:2691 src/dialogs.c:2707
 msgid "Select Font"
 msgstr "Sectionner une fonte"
 
-#: src/conversation.c:1638 src/conversation.c:1639 src/conversation.c:1643
+#: src/conversation.c:1659 src/conversation.c:1660 src/conversation.c:1664
 msgid "Color"
 msgstr "Couleur"
 
-#: src/conversation.c:1638 src/prefs.c:988
+#: src/conversation.c:1659 src/prefs.c:1161
 msgid "Text Color"
 msgstr "Couleur de texte"
 
-#: src/conversation.c:1643 src/prefs.c:1006
+#: src/conversation.c:1664 src/prefs.c:1179
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1650 src/conversation.c:1651
+#: src/conversation.c:1671 src/conversation.c:1672
 msgid "Link"
 msgstr "Lien"
 
-#: src/conversation.c:1650 src/dialogs.c:2332
+#: src/conversation.c:1671 src/dialogs.c:2333
 msgid "Insert Link"
 msgstr "Ins�rer un Lien"
 
-#: src/conversation.c:1654
+#: src/conversation.c:1675
 #, fuzzy
 msgid "Smiley"
 msgstr "Fichier"
 
-#: src/conversation.c:1654
+#: src/conversation.c:1675
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1661 src/conversation.c:1662 src/prefs.c:2202
+#: src/conversation.c:1682 src/conversation.c:1683 src/prefs.c:245
 msgid "Logging"
 msgstr "Connection"
 
-#: src/conversation.c:1661
+#: src/conversation.c:1682
 msgid "Enable logging"
 msgstr "Activer la Connection"
 
-#: src/conversation.c:1671 src/conversation.c:1672 src/dialogs.c:1485
-#: src/dialogs.c:1678 src/dialogs.c:3212 src/dialogs.c:3826
+#: src/conversation.c:1692 src/conversation.c:1693 src/dialogs.c:1491
+#: src/dialogs.c:1684 src/dialogs.c:3216 src/dialogs.c:3728
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/conversation.c:1671
+#: src/conversation.c:1692
 #, fuzzy
 msgid "Save Conversation"
 msgstr "Tracer toutes les conversations"
 
-#: src/conversation.c:1676 src/conversation.c:1677
+#: src/conversation.c:1697 src/conversation.c:1698
 msgid "Sound"
 msgstr "Son"
 
-#: src/conversation.c:1676
+#: src/conversation.c:1697
 msgid "Enable sounds"
 msgstr "Activer le son"
 
-#: src/conversation.c:1964
+#: src/conversation.c:1985
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/conversation.c:2039
+#: src/conversation.c:2072
 #, fuzzy
 msgid "Send message as: "
 msgstr "Son � l'envoi d'un message"
 
-#: src/dialogs.c:361
+#: src/dialogs.c:367
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Donner un Avertissement?"
 
-#: src/dialogs.c:382
+#: src/dialogs.c:388
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Voulez-vous r�ellement donner un avertissement � %s?"
 
-#: src/dialogs.c:387
+#: src/dialogs.c:393
 msgid "Warn anonymously?"
 msgstr "Donner un avertissement anonyme?"
 
-#: src/dialogs.c:391
+#: src/dialogs.c:397
 msgid "Anonymous warnings are less harsh."
 msgstr "Les avertissements anonymes sont moins durs."
 
-#: src/dialogs.c:467
+#: src/dialogs.c:473
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossible d'ecrire dans le fichier %s."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:476
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossible de lire le fichier %s."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:479
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message trop long, perte des %d derniers octets."
 
-#: src/dialogs.c:476
+#: src/dialogs.c:482
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s n'est pas en ligne."
 
-#: src/dialogs.c:479
+#: src/dialogs.c:485
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Les Avertissements � %s ne sont pas permis."
 
-#: src/dialogs.c:482
+#: src/dialogs.c:488
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Un message a �t� perdu, vous d�passez la vitesse limite du serveur."
 
-#: src/dialogs.c:485
+#: src/dialogs.c:491
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Le forum %s est inaccessible."
 
-#: src/dialogs.c:488
+#: src/dialogs.c:494
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Vous envoyez vos messages trop vite � %s."
 
-#: src/dialogs.c:491
+#: src/dialogs.c:497
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 "Vous avez rat� un message de %s parce qu'il �tait trop gros (le message :))."
 
-#: src/dialogs.c:494
+#: src/dialogs.c:500
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Vous avez rat� un message de %s parce qu'il a �t� envoy� trop vite."
 
-#: src/dialogs.c:497
+#: src/dialogs.c:503
 msgid "Failure."
 msgstr "Echec"
 
-#: src/dialogs.c:500
+#: src/dialogs.c:506
 msgid "Too many matches."
 msgstr "Trop de r�ponses"
 
-#: src/dialogs.c:503
+#: src/dialogs.c:509
 msgid "Need more qualifiers."
 msgstr "Besoin de plus de crit�res."
 
-#: src/dialogs.c:506
+#: src/dialogs.c:512
 msgid "Dir service temporarily unavailable."
 msgstr "Le repertoire est temporairement indisponible."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:515
 msgid "Email lookup restricted."
 msgstr "La recherche par Email est restreinte."
 
-#: src/dialogs.c:512
+#: src/dialogs.c:518
 msgid "Keyword ignored."
 msgstr "Mot cl� ignor�."
 
-#: src/dialogs.c:515
+#: src/dialogs.c:521
 msgid "No keywords."
 msgstr "Pas de mot-cl�."
 
-#: src/dialogs.c:518
+#: src/dialogs.c:524
 msgid "User has no directory information."
 msgstr "L'utilisateur n'a pas d'information personnelle."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:528
 msgid "Country not supported."
 msgstr "Pays non support�."
 
-#: src/dialogs.c:525
+#: src/dialogs.c:531
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Echec inconnu: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:528 src/oscar.c:524
+#: src/dialogs.c:534 src/oscar.c:525
 msgid "Incorrect nickname or password."
 msgstr "Pseudonye ou Mot de Passe incorrect."
 
-#: src/dialogs.c:531
+#: src/dialogs.c:537
 msgid "The service is temporarily unavailable."
 msgstr "Le service est termporairement indisponible."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:540
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Votre niveau d'avertissement est actuellement trop �lev� pour que vous "
 "puissiez vous connecter"
 
-#: src/dialogs.c:537
+#: src/dialogs.c:543
 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."
@@ -827,382 +844,399 @@
 "etR�essayez. Si vous continuez d'essayer, il vous faudra attendre encore "
 "plus longtemps."
 
-#: src/dialogs.c:540
+#: src/dialogs.c:546
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Une erreur inconnue est survenue � la connection: %s."
 
-#: src/dialogs.c:543
+#: src/dialogs.c:549
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Une erreur inconnue, %d, s'est produite. Info:%s"
 
-#: src/dialogs.c:546
+#: src/dialogs.c:552
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - Erreur %d"
 
-#. Build OK Button
-#: src/dialogs.c:605 src/dialogs.c:695 src/dialogs.c:755 src/dialogs.c:1275
-#: src/dialogs.c:1613 src/dialogs.c:1726 src/dialogs.c:2083 src/dialogs.c:2269
-#: src/dialogs.c:2337 src/multi.c:479
-msgid "OK"
-msgstr "OK"
-
-#: src/dialogs.c:661
+#: src/dialogs.c:667
 msgid "Gaim - IM user"
 msgstr "Gaim - IM Utilisateur"
 
-#: src/dialogs.c:678
+#: src/dialogs.c:684
 #, fuzzy
 msgid "IM who:"
 msgstr "Envoyer un message � qui: "
 
-#: src/dialogs.c:726
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "Message d'Information"
 
-#: src/dialogs.c:733
+#: src/dialogs.c:739
 msgid "User:"
 msgstr ""
 
 #. Finish up
-#: src/dialogs.c:761
+#: src/dialogs.c:767
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Message d'information"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:833
 msgid "Buddies"
 msgstr "Potes"
 
-#: src/dialogs.c:880
+#: src/dialogs.c:886
 #, fuzzy
 msgid "Add Group"
 msgstr "Groupe"
 
-#: src/dialogs.c:910
+#: src/dialogs.c:916
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "GAIM - Ajouter un Pote"
 
-#: src/dialogs.c:937
+#: src/dialogs.c:943
 msgid "Gaim - Add Buddy"
 msgstr "GAIM - Ajouter un Pote"
 
-#: src/dialogs.c:951
+#: src/dialogs.c:957
 msgid "Add Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/dialogs.c:961 src/dialogs.c:3442 src/dialogs.c:3534
+#: src/dialogs.c:967 src/dialogs.c:3436
 msgid "Buddy"
 msgstr "Pote"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:1021
 #, fuzzy
 msgid "Please enter a buddy to pounce."
 msgstr "Entrez votre login"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:1021
 #, fuzzy
 msgid "Buddy Pounce Error"
 msgstr "Alerte"
 
-#: src/dialogs.c:1084
+#: src/dialogs.c:1090
 #, fuzzy
 msgid "Pounce buddy as:"
 msgstr "Son quand vos potes se connectent"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1140
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nouvelle Alerte"
 
-#: src/dialogs.c:1151
+#: src/dialogs.c:1157
 #, fuzzy
 msgid "Buddy:"
 msgstr "Pote"
 
-#: src/dialogs.c:1166
+#: src/dialogs.c:1172
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1171
+#: src/dialogs.c:1177
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1175
+#: src/dialogs.c:1181
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1183
+#: src/dialogs.c:1189
 #, fuzzy
 msgid "Open IM window on pounce"
 msgstr "Ouvrir la fenetre des messages � la connection"
 
-#: src/dialogs.c:1188
+#: src/dialogs.c:1194
 #, fuzzy
 msgid "Send IM on pounce"
 msgstr "Envoyer un message � la connection"
 
-#: src/dialogs.c:1197
+#: src/dialogs.c:1203
 #, fuzzy
 msgid "Message:"
 msgstr "Cr�er un Message"
 
-#: src/dialogs.c:1209
+#: src/dialogs.c:1215
 #, fuzzy
 msgid "Execute command on pounce"
 msgstr "Envoyer un message � la connection"
 
-#: src/dialogs.c:1218
+#: src/dialogs.c:1224
 msgid "Command:"
 msgstr ""
 
-#: src/dialogs.c:1231
+#: src/dialogs.c:1237
 #, fuzzy
 msgid "Play sound on pounce"
 msgstr "Envoyer un message � la connection"
 
-#: src/dialogs.c:1240
+#: src/dialogs.c:1246
 #, fuzzy
 msgid "Sound:"
 msgstr "Son"
 
-#: src/dialogs.c:1257
+#: src/dialogs.c:1263
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1352
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Donner vos informations personnelles"
 
-#: src/dialogs.c:1378
+#: src/dialogs.c:1384
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Autoriser les recherches sur le web � trouver vos informations"
 
 #. Line 1
-#: src/dialogs.c:1381 src/dialogs.c:2102
+#: src/dialogs.c:1387 src/dialogs.c:2103
 msgid "First Name"
 msgstr "Pr�nom"
 
 #. Line 2
-#: src/dialogs.c:1392 src/dialogs.c:2114
+#: src/dialogs.c:1398 src/dialogs.c:2115
 msgid "Middle Name"
 msgstr "Surnom"
 
 #. Line 3
-#: src/dialogs.c:1404 src/dialogs.c:2126
+#: src/dialogs.c:1410 src/dialogs.c:2127
 msgid "Last Name"
 msgstr "Nom"
 
 #. Line 4
-#: src/dialogs.c:1415 src/dialogs.c:2138
+#: src/dialogs.c:1421 src/dialogs.c:2139
 msgid "Maiden Name"
 msgstr "Nom de jeune-fille"
 
 #. Line 5
-#: src/dialogs.c:1426 src/dialogs.c:2150
+#: src/dialogs.c:1432 src/dialogs.c:2151
 msgid "City"
 msgstr "Ville"
 
 #. Line 6
-#: src/dialogs.c:1437 src/dialogs.c:2161
+#: src/dialogs.c:1443 src/dialogs.c:2162
 msgid "State"
 msgstr "Etat"
 
 #. Line 7
-#: src/dialogs.c:1448 src/dialogs.c:2172
+#: src/dialogs.c:1454 src/dialogs.c:2173
 msgid "Country"
 msgstr "Pays"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1509
 msgid "New Passwords Do Not Match"
 msgstr "Les nouveaux password diff�rent"
 
-#: src/dialogs.c:1503 src/dialogs.c:1508
+#: src/dialogs.c:1509 src/dialogs.c:1514
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Erreur au changement de Mot de Passe"
 
-#: src/dialogs.c:1508
+#: src/dialogs.c:1514
 msgid "Fill out all fields completely"
 msgstr "Remplissez tous les champs"
 
-#: src/dialogs.c:1535 src/toc.c:561
+#: src/dialogs.c:1541 src/toc.c:561
 msgid "Gaim - Password Change"
 msgstr "Gaim - Changement de mot de passe"
 
-#: src/dialogs.c:1566
+#: src/dialogs.c:1572
 msgid "Original Password"
 msgstr "Mot de Passe courrant"
 
-#: src/dialogs.c:1580
+#: src/dialogs.c:1586
 msgid "New Password"
 msgstr "Nouveau Mot de Passe"
 
-#: src/dialogs.c:1594
+#: src/dialogs.c:1600
 msgid "New Password (again)"
 msgstr "Nouveau Mot de passe (confirmation)"
 
-#: src/dialogs.c:1639
+#: src/dialogs.c:1645
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Message d'information"
 
-#: src/dialogs.c:1737
+#: src/dialogs.c:1743
 msgid "Below are the results of your search: "
 msgstr "R�sultats de votre recherche: "
 
-#: src/dialogs.c:1876 src/dialogs.c:1883
+#: src/dialogs.c:1877 src/dialogs.c:1884
 msgid "Permit"
 msgstr "Autoriser"
 
-#: src/dialogs.c:1878 src/dialogs.c:1885
+#: src/dialogs.c:1879 src/dialogs.c:1886
 msgid "Deny"
 msgstr "Interdire"
 
-#: src/dialogs.c:1926
+#: src/dialogs.c:1927
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ajouter des autorisation/Permission"
 
-#: src/dialogs.c:1928
+#: src/dialogs.c:1929
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ajouter des autorisation/Permission"
 
-#: src/dialogs.c:1999
+#: src/dialogs.c:2000
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/dialogs.c:2209
+#: src/dialogs.c:2210
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - trouver un pote d'apr�s ses Infos."
 
-#: src/dialogs.c:2239
+#: src/dialogs.c:2240
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Trouver un ami d'apr�s son Email"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2253
 msgid "Email"
 msgstr "Email"
 
-#: src/dialogs.c:2351
+#: src/dialogs.c:2352
 msgid "URL"
 msgstr "Site Web"
 
-#: src/dialogs.c:2359
+#: src/dialogs.c:2360
 msgid "Description"
 msgstr "Description"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2386
 msgid "GAIM - Add URL"
 msgstr "Gaim - Ajouter un site Web"
 
-#: src/dialogs.c:2526 src/dialogs.c:2539 src/dialogs.c:2576
+#: src/dialogs.c:2529 src/dialogs.c:2542 src/dialogs.c:2579
 msgid "Select Text Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2563
+#: src/dialogs.c:2566
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2808
+#: src/dialogs.c:2812
 #, c-format
 msgid "Error writing file %s"
 msgstr "Erreur � l'�criture du fichier %s"
 
-#: src/dialogs.c:2809 src/dialogs.c:2931 src/dialogs.c:3674 src/oscar.c:1824
-#: src/oscar.c:2241 src/toc.c:1398 src/toc.c:1415 src/toc.c:1503
+#: src/dialogs.c:2813 src/dialogs.c:2935 src/dialogs.c:3580 src/oscar.c:1923
+#: src/oscar.c:2342 src/toc.c:1398 src/toc.c:1415 src/toc.c:1503
 #: src/toc.c:1680 src/toc.c:1710
 msgid "Error"
 msgstr "Erreur"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2866
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Exporter la liste de Potes"
 
-#: src/dialogs.c:2930
+#: src/dialogs.c:2934
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erreur � la lecture du fichier %s"
 
-#: src/dialogs.c:3004
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importer la liste de Potes"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3067
+#: src/dialogs.c:3071
 msgid "You cannot create an away message with a blank title"
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3074
+#: src/dialogs.c:3078
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:3141
+#: src/dialogs.c:3145
 msgid "Gaim - New away message"
 msgstr "Gaim - Nouveau message d'absence"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3155
 #, fuzzy
 msgid "New away message"
 msgstr "Nouveau Message d'absence"
 
-#: src/dialogs.c:3164
+#: src/dialogs.c:3168
 msgid "Away title: "
 msgstr "Intitul�: "
 
-#: src/dialogs.c:3204
+#: src/dialogs.c:3208
 #, fuzzy
 msgid "Use"
 msgstr "Utilisation de GAIM"
 
-#: src/dialogs.c:3208
+#: src/dialogs.c:3212
 msgid "Save & Use"
 msgstr ""
 
 #. show everything
-#: src/dialogs.c:3377
+#: src/dialogs.c:3381
 #, fuzzy
 msgid "Smile!"
 msgstr "Fichier"
 
-#: src/dialogs.c:3440 src/dialogs.c:3532
+#: src/dialogs.c:3434
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/dialogs.c:3477 src/dialogs.c:3569
+#: src/dialogs.c:3471
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "GAIM - Ajouter un Pote"
 
-#: src/dialogs.c:3641
+#: src/dialogs.c:3545
 #, fuzzy
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Enregistrer sous..."
 
-#: src/dialogs.c:3672
+#: src/dialogs.c:3578
 #, fuzzy, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Impossible de lire le fichier %s."
 
-#: src/dialogs.c:3703
+#: src/dialogs.c:3609
 msgid "Really clear log?"
 msgstr ""
 
-#: src/dialogs.c:3721
+#: src/dialogs.c:3627
 #, fuzzy
 msgid "Okay"
 msgstr "Ok"
 
-#: src/dialogs.c:3821
+#: src/dialogs.c:3723
 #, fuzzy
 msgid "Clear"
 msgstr "Fermer"
 
+#: src/dialogs.c:3818
+#, fuzzy
+msgid "Gaim - Rename Group"
+msgstr "GAIM - Ajouter un Pote"
+
+#: src/dialogs.c:3828
+msgid "Rename Group"
+msgstr ""
+
+#: src/dialogs.c:3835 src/dialogs.c:3923
+#, fuzzy
+msgid "New name:"
+msgstr "Pseudonyme: "
+
+#: src/dialogs.c:3906
+#, fuzzy
+msgid "Gaim - Rename Buddy"
+msgstr "GAIM - Ajouter un Pote"
+
+#: src/dialogs.c:3916
+#, fuzzy
+msgid "Rename Buddy"
+msgstr "GAIM - Ajouter un Pote"
+
 #: src/gaimrc.c:880
 #, c-format
 msgid "Could not open config file %s."
@@ -1231,7 +1265,7 @@
 msgid "Receieved: '%s'\n"
 msgstr "Re�u: '%s'\n"
 
-#: src/multi.c:357 src/prefs.c:114
+#: src/multi.c:357 src/prefs.c:188
 #, fuzzy
 msgid "General Options"
 msgstr "Options"
@@ -1259,10 +1293,6 @@
 msgid "Auto-Login"
 msgstr "Connection automatique"
 
-#: src/multi.c:389
-msgid "Send KeepAlive packet (6 bytes/second)"
-msgstr ""
-
 #: src/multi.c:454
 #, fuzzy
 msgid "Gaim - Modify Account"
@@ -1299,78 +1329,78 @@
 "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
+#: src/oscar.c:295 src/oscar.c:312 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "D�connect�."
 
-#: src/oscar.c:302
+#: src/oscar.c:303
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "erreur � la connection!\n"
 
-#: src/oscar.c:310
+#: src/oscar.c:311
 #, fuzzy
 msgid "major connection error\n"
 msgstr "erreur � la connection!\n"
 
-#: src/oscar.c:323 src/toc.c:545
+#: src/oscar.c:324 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:324
+#: src/oscar.c:325
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Erreur"
 
-#: src/oscar.c:334
+#: src/oscar.c:335
 #, fuzzy
 msgid "Chat is currently unavailable"
 msgstr "Le forum %s est inaccessible."
 
-#: src/oscar.c:335
+#: src/oscar.c:336
 #, fuzzy
 msgid "Gaim - Chat"
 msgstr "Forum Gaim"
 
-#: src/oscar.c:382
+#: src/oscar.c:383
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Connection de %s.\n"
 
-#: src/oscar.c:420
+#: src/oscar.c:421
 msgid "internal connection error\n"
 msgstr "erreur interne de connection\n"
 
-#: src/oscar.c:421
+#: src/oscar.c:422
 msgid "Unable to login to AIM"
 msgstr "Impossible de se connecter � AIM."
 
-#: src/oscar.c:426
+#: src/oscar.c:427
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "incapable de r�soudre l'adresse\n"
 
-#: src/oscar.c:430
+#: src/oscar.c:431
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "incapable de se connecter au serveur\n"
 
-#: src/oscar.c:437
+#: src/oscar.c:438
 #, c-format
 msgid "Signon: %s"
 msgstr "Connection: %s"
 
-#: src/oscar.c:447
+#: src/oscar.c:448
 msgid "Password sent, waiting for response\n"
 msgstr "Mot de passe envoy�, en attente de r�ponse\n"
 
-#: src/oscar.c:475
+#: src/oscar.c:476
 msgid "Signed off.\n"
 msgstr "Hors Ligne.\n"
 
 #. connecting too frequently
-#: src/oscar.c:519
+#: src/oscar.c:520
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1381,63 +1411,63 @@
 "plus longtemps."
 
 #. client too old
-#: src/oscar.c:529
+#: src/oscar.c:530
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 
-#: src/oscar.c:533 src/toc.c:341
+#: src/oscar.c:534 src/toc.c:341
 msgid "Authentication Failed"
 msgstr "Echec de V�rification."
 
-#: src/oscar.c:563
+#: src/oscar.c:564
 msgid "Internal Error"
 msgstr "Erreur Interne"
 
-#: src/oscar.c:567
+#: src/oscar.c:568
 msgid "Could Not Connect"
 msgstr "Impossible de se Connecter"
 
-#: src/oscar.c:601
+#: src/oscar.c:603
 msgid "Connection established, cookie sent"
 msgstr "Connection �tablie, cookie envoy�"
 
-#: src/oscar.c:858 src/oscar.c:2125
+#: src/oscar.c:959 src/oscar.c:2226
 #, fuzzy, c-format
-msgid "<B>Direct IM with %s established</B>"
+msgid "Direct IM with %s established"
 msgstr "<HR><B>%s s'est connect�%s%s.</B><BR><HR>"
 
 #. message too large
-#: src/oscar.c:1308
+#: src/oscar.c:1409
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr ""
 "Vous avez rat� un message de %s parce qu'il �tait trop gros (le message :))."
 
-#: src/oscar.c:1313
+#: src/oscar.c:1414
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1348
+#: src/oscar.c:1449
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1349 src/oscar.c:1368
+#: src/oscar.c:1450 src/oscar.c:1469
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1367
+#: src/oscar.c:1468
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1403
+#: src/oscar.c:1504
 #, c-format
 msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1410
+#: src/oscar.c:1511
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1451,25 +1481,25 @@
 "SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1448
+#: src/oscar.c:1549
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1449
+#: src/oscar.c:1550
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:2182
+#: src/oscar.c:2283
 #, fuzzy, c-format
-msgid "<B>Direct IM with %s closed</B>"
+msgid "Direct IM with %s closed"
 msgstr "<HR><B>%s s'est connect�%s%s.</B><BR><HR>"
 
-#: src/oscar.c:2241
+#: src/oscar.c:2342
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "Impossible de se connecter � AIM."
 
-#: src/oscar.c:2251
+#: src/oscar.c:2352
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1477,17 +1507,17 @@
 "continue?"
 msgstr ""
 
-#: src/oscar.c:2268
+#: src/oscar.c:2369
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Message d'absence"
 
-#: src/oscar.c:2276
+#: src/oscar.c:2377
 #, fuzzy
 msgid "Direct IM"
 msgstr "Information Personnelle"
 
-#: src/oscar.c:2468
+#: src/oscar.c:2569
 msgid ""
 "Unfortunately, currently Oscar only allows new user registration by going to "
 "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
@@ -1495,558 +1525,618 @@
 msgstr ""
 
 #. Below is basically stolen from plugins.c
-#: src/perl.c:638
+#: src/perl.c:647
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Message d'information"
 
-#: src/perl.c:686
+#: src/perl.c:695
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:105
+#: src/plugins.c:107
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Liste des Plugins"
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:216
+#: src/plugins.c:188 src/plugins.c:194 src/plugins.c:218
 msgid "Plugin Error"
 msgstr "Erreur de Plugin"
 
-#: src/plugins.c:272
+#: src/plugins.c:274
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
 #. Build the bottom button bar
-#: src/plugins.c:301
+#: src/plugins.c:303
 msgid "Load Plugin"
 msgstr "Charger le Plugin"
 
-#: src/plugins.c:307
+#: src/plugins.c:309
 msgid "Configure Plugin"
 msgstr "Configurer le Plugin"
 
-#: src/plugins.c:313
+#: src/plugins.c:315
 msgid "Unload Plugin"
 msgstr "D�charger le Plugin"
 
-#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
-#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
-#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1762
+#: src/prefs.c:196 src/prefs.c:338 src/prefs.c:437 src/prefs.c:638
+#: src/prefs.c:1143 src/prefs.c:1378 src/prefs.c:1589 src/prefs.c:1967
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:126
-msgid "Use borderless buttons (requires restart for some buttons)"
+#: src/prefs.c:208
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/prefs.c:216
+msgid "Use borderless buttons"
 msgstr ""
 
-#: src/prefs.c:128
-msgid "Show Buddy Ticker after restart"
-msgstr ""
-
-#: src/prefs.c:132
+#: src/prefs.c:221
+#, fuzzy
+msgid "Show Buddy Ticker"
+msgstr "afficher les images des potes"
+
+#: src/prefs.c:227
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:144
+#: src/prefs.c:231
 #, fuzzy
-msgid "Report Idle Times:"
+msgid "Report Idle Times"
 msgstr "Afficher les temps d'inactivit�"
 
-#: src/prefs.c:147
+#: src/prefs.c:239
 msgid "None"
 msgstr ""
 
-#: src/prefs.c:148
+#: src/prefs.c:240
 msgid "GAIM Use"
 msgstr "Utilisation de GAIM"
 
-#: src/prefs.c:150
+#: src/prefs.c:242
 #, fuzzy
 msgid "X Use"
 msgstr "Utilisation de GAIM"
 
-#: src/prefs.c:224
-#, fuzzy
-msgid "Browser Options"
-msgstr "Options"
-
-#: src/prefs.c:236
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:237
-msgid "KFM"
-msgstr ""
-
-#: src/prefs.c:239
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:241
-msgid "Manual"
-msgstr "Manuel"
-
-#: src/prefs.c:252
-msgid "Pop up new window by default"
-msgstr "Afficher une nouvelle fen�tre par d�faut"
-
-#: src/prefs.c:279
-#, fuzzy
-msgid "Logging Options"
-msgstr "Connection de %s.\n"
-
-#: src/prefs.c:291
+#: src/prefs.c:253
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Tracer toutes les conversations"
 
-#: src/prefs.c:292
+#: src/prefs.c:254
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "Enlever l'HTML des traces"
 
-#: src/prefs.c:298
+#: src/prefs.c:260
 msgid "Log when buddies sign on/sign off"
 msgstr ""
 
-#: src/prefs.c:299
+#: src/prefs.c:261
 msgid "Log when buddies become idle/un-idle"
 msgstr ""
 
-#: src/prefs.c:300
+#: src/prefs.c:262
 msgid "Log when buddies go away/come back"
 msgstr ""
 
-#: src/prefs.c:301
-msgid "Log your own signons/idleness/awayness (as set by options above)"
+#: src/prefs.c:263
+msgid "Log your own signons/idleness/awayness"
 msgstr ""
 
-#: src/prefs.c:302
+#: src/prefs.c:264
 msgid "Individual log file for each buddy's signons"
 msgstr ""
 
-#: src/prefs.c:317
+#: src/prefs.c:266
+msgid "Browser"
+msgstr "Navigateur"
+
+#: src/prefs.c:278
+msgid "KFM"
+msgstr ""
+
+#: src/prefs.c:279
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/prefs.c:282
+msgid "Pop up new window by default"
+msgstr "Afficher une nouvelle fen�tre par d�faut"
+
+#: src/prefs.c:289
+msgid "GNOME URL Handler"
+msgstr ""
+
+#: src/prefs.c:291
+msgid "Manual"
+msgstr "Manuel"
+
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Liste de Potes"
 
-#: src/prefs.c:329
-#, fuzzy
-msgid "Save Window Size/Position"
-msgstr "M�moriser la taille et la position de certaines fenetres"
-
-#: src/prefs.c:331
-#, fuzzy
-msgid "Automatically show buddy list on sign on"
-msgstr "Afficher la liste des potes automagiquement"
-
-#: src/prefs.c:333
+#: src/prefs.c:342
 #, fuzzy
-msgid "Display Buddy List near applet"
-msgstr "La liste des potes disparait pr�s de l'applet"
-
-#: src/prefs.c:340
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:341
-msgid "Show numbers in groups"
-msgstr "Afficher le nombre dans les groupes"
-
-#: src/prefs.c:347
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "afficher les images des potes"
-
-#: src/prefs.c:348
-msgid "Show warning levels"
-msgstr ""
-
-#: src/prefs.c:349
-msgid "Show idle times"
-msgstr "Afficher les temps d'inactivit�"
-
-#: src/prefs.c:355
+msgid "Buddy List Window"
+msgstr "Liste de Potes"
+
+#: src/prefs.c:354
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
 #: src/prefs.c:356
+#, fuzzy
+msgid "Automatically show buddy list on sign on"
+msgstr "Afficher la liste des potes automagiquement"
+
+#: src/prefs.c:359
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "M�moriser la taille et la position de certaines fenetres"
+
+#: src/prefs.c:365
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:371
-msgid "Conversation Window Options"
+#: src/prefs.c:370
+#, fuzzy
+msgid "Display Buddy List near applet"
+msgstr "La liste des potes disparait pr�s de l'applet"
+
+#: src/prefs.c:373
+msgid "Group Displays"
+msgstr ""
+
+#: src/prefs.c:385
+msgid "Hide groups with no online buddies"
 msgstr ""
 
-#: src/prefs.c:383
+#: src/prefs.c:391
+msgid "Show numbers in groups"
+msgstr "Afficher le nombre dans les groupes"
+
+#: src/prefs.c:393
+#, fuzzy
+msgid "Buddy Displays"
+msgstr "Liste de Potes"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Show buddy type icons"
+msgstr "afficher les images des potes"
+
+#: src/prefs.c:406
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:412
+msgid "Show idle times"
+msgstr "Afficher les temps d'inactivit�"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Conversation Options"
+msgstr "Tracer toutes les conversations"
+
+#: src/prefs.c:441
+#, fuzzy
+msgid "Keyboard Options"
+msgstr "Options"
+
+#: src/prefs.c:453
 msgid "Enter sends message"
 msgstr "Entrer les messages envoy�s"
 
-#: src/prefs.c:384
+#: src/prefs.c:454
 #, fuzzy
 msgid "Control-Enter sends message"
 msgstr "Entrer les messages envoy�s"
 
-#: src/prefs.c:385
+#: src/prefs.c:455
 msgid "Escape closes window"
 msgstr ""
 
-#: src/prefs.c:386
+#: src/prefs.c:461
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:387
+#: src/prefs.c:462
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:388
+#: src/prefs.c:463
 msgid "F2 toggles timestamp display"
 msgstr ""
 
-#: src/prefs.c:394
+#: src/prefs.c:465
+#, fuzzy
+msgid "Display and General Options"
+msgstr "Options"
+
+#: src/prefs.c:477
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "Afficher graphiquement les smileys (exp�rimental)"
 
-#: src/prefs.c:395
+#: src/prefs.c:478
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "Afficher l'heure su les messages"
 
-#: src/prefs.c:396
-#, fuzzy
-msgid "Ignore colors"
-msgstr "Ignorer les couleurs envoy�es"
-
-#: src/prefs.c:397
+#: src/prefs.c:479
 #, fuzzy
-msgid "Ignore font faces"
-msgstr "Fonte plus Grande"
-
-#: src/prefs.c:398
-#, fuzzy
-msgid "Ignore font sizes"
-msgstr "Fonte plus Grande"
-
-#: src/prefs.c:404
+msgid "Show URLs as links"
+msgstr "Envoyer les URL comme des liens cliquables"
+
+#: src/prefs.c:480
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Surligner automagiquement les mots mal orthographi�s"
 
-#: src/prefs.c:405
-#, fuzzy
-msgid "Show URLs as links"
-msgstr "Envoyer les URL comme des liens cliquables"
-
-#: src/prefs.c:406
+#: src/prefs.c:481 src/prefs.c:1611
 msgid "Sending messages removes away status"
 msgstr "L'envoi de message supprime le statut d'absence"
 
-#: src/prefs.c:447 src/prefs.c:540
-msgid "Pictures and Text"
-msgstr ""
-
-#: src/prefs.c:453 src/prefs.c:546
-msgid "Pictures Only"
-msgstr ""
-
-#: src/prefs.c:459 src/prefs.c:552
+#: src/prefs.c:482 src/prefs.c:1618
+#, fuzzy
+msgid "Queue new messages when away"
+msgstr "Ignorer les nouveaux forums lors des absences"
+
+#: src/prefs.c:488
+#, fuzzy
+msgid "Ignore colors"
+msgstr "Ignorer les couleurs envoy�es"
+
+#: src/prefs.c:489
 #, fuzzy
-msgid "Text Only"
-msgstr "Couleur de texte"
-
-#: src/prefs.c:483
+msgid "Ignore font faces"
+msgstr "Fonte plus Grande"
+
+#: src/prefs.c:490
+#, fuzzy
+msgid "Ignore font sizes"
+msgstr "Fonte plus Grande"
+
+#: src/prefs.c:491
+#, fuzzy
+msgid "Ignore TiK Automated Messages"
+msgstr "Cr�er un Message"
+
+#: src/prefs.c:492 src/prefs.c:1609
+msgid "Ignore new conversations when away"
+msgstr "Ignorer les nouveaux forums lors des absences"
+
+#: src/prefs.c:630
 #, fuzzy
 msgid "IM Options"
 msgstr "Options"
 
-#: src/prefs.c:495
-#, fuzzy
-msgid "Show all conversations in one tabbed window"
-msgstr "Afficher les (d�)connection dans la fenetre de forum"
-
-#: src/prefs.c:496
-#, fuzzy
-msgid "Show logins in window"
-msgstr "Afficher les (d�)connection dans la fenetre de forum"
-
-#: src/prefs.c:502 src/prefs.c:593
+#: src/prefs.c:642
+msgid "IM Window"
+msgstr ""
+
+#: src/prefs.c:654 src/prefs.c:687
 #, fuzzy
 msgid "Show buttons as "
 msgstr "Afficher les images sur les boutons"
 
-#: src/prefs.c:511 src/prefs.c:603
-msgid "Show larger entry box on new windows"
+#: src/prefs.c:658 src/prefs.c:691
+msgid "Pictures And Text"
+msgstr ""
+
+#: src/prefs.c:659 src/prefs.c:692
+msgid "Pictures"
 msgstr ""
 
-#: src/prefs.c:513 src/prefs.c:605
+#: src/prefs.c:660 src/prefs.c:693
+#, fuzzy
+msgid "Text"
+msgstr "Texte en Gras"
+
+#: src/prefs.c:670
+#, fuzzy
+msgid "Show all conversations in one tabbed window"
+msgstr "Afficher les (d�)connection dans la fenetre de forum"
+
+#: src/prefs.c:671 src/prefs.c:704
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Avancer les fen�tres recevant un message"
 
-#: src/prefs.c:514 src/prefs.c:1509
-msgid "Ignore new conversations when away"
-msgstr "Ignorer les nouveaux forums lors des absences"
-
-#: src/prefs.c:516
+#: src/prefs.c:672
 #, fuzzy
-msgid "Ignore TiK Automated Messages"
-msgstr "Cr�er un Message"
-
-#: src/prefs.c:574
-#, fuzzy
-msgid "Chat Options"
-msgstr "Options"
-
-#: src/prefs.c:586
+msgid "Show logins in window"
+msgstr "Afficher les (d�)connection dans la fenetre de forum"
+
+#: src/prefs.c:673 src/prefs.c:706
+msgid "Show larger entry box on new windows"
+msgstr ""
+
+#: src/prefs.c:675
+msgid "Group Chat Window"
+msgstr ""
+
+#: src/prefs.c:703
 #, fuzzy
 msgid "Show all chats in one tabbed window"
 msgstr "Afficher les (d�)connection dans la fenetre de forum"
 
-#: src/prefs.c:587
+#: src/prefs.c:705
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
+#: src/prefs.c:708
+#, fuzzy
+msgid "Tabbed Window Options"
+msgstr "M�moriser la taille et la position de certaines fenetres"
+
+#: src/prefs.c:720
+msgid "IM Tab Placement:"
+msgstr ""
+
+#: src/prefs.c:732 src/prefs.c:766
+msgid "Top"
+msgstr ""
+
+#: src/prefs.c:734 src/prefs.c:768
+msgid "Bottom"
+msgstr ""
+
+#: src/prefs.c:741 src/prefs.c:775
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:743 src/prefs.c:777
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:754
+msgid "Chat Tab Placement:"
+msgstr ""
+
+#: src/prefs.c:809 src/prefs.c:811 src/prefs.c:1014 src/prefs.c:1016
 msgid "Gaim Chat"
 msgstr "Forum Gaim"
 
-#: src/prefs.c:779 src/prefs.c:2241
+#: src/prefs.c:952 src/prefs.c:2458
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:797
+#: src/prefs.c:970
 msgid "Refresh"
 msgstr "Rafraichir"
 
-#: src/prefs.c:822
+#: src/prefs.c:995
 msgid "List of available chats"
 msgstr "Liste des forums disponibles"
 
-#: src/prefs.c:832
+#: src/prefs.c:1005
 msgid "List of subscribed chats"
 msgstr "Liste des forums souscrits"
 
-#: src/prefs.c:962 src/prefs.c:2246
+#.
+#. text[0] = _("Chat Window");
+#. node = gtk_ctree_insert_node(GTK_CTREE(preftree), parent, NULL,
+#. text, 5, NULL, NULL, NULL, NULL, 0, 1);
+#. gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node, chat_page);
+#.
+#: src/prefs.c:1135 src/prefs.c:2453
 #, fuzzy
 msgid "Font Options"
 msgstr "Options"
 
-#: src/prefs.c:976
+#: src/prefs.c:1149
 msgid "Underlined Text"
 msgstr "Texte Soulign�"
 
-#: src/prefs.c:977
+#: src/prefs.c:1150
 msgid "Strike Text"
 msgstr "Texte barr�"
 
-#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
+#: src/prefs.c:1163 src/prefs.c:1181 src/prefs.c:1202
 #, fuzzy
 msgid "Select"
 msgstr "Sectionner une fonte"
 
-#: src/prefs.c:1027
+#: src/prefs.c:1200
 msgid "Font Face for Text"
 msgstr "Fonte pour le Texte"
 
-#: src/prefs.c:1042
+#: src/prefs.c:1215
 #, fuzzy
 msgid "Font Size for Text"
 msgstr "Fonte pour le Texte"
 
-#: src/prefs.c:1067
+#: src/prefs.c:1291
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Tracer la Conversation"
+
+#: src/prefs.c:1326
+#, fuzzy
+msgid "Reset"
+msgstr "S'enregistrer"
+
+#: src/prefs.c:1331
+#, fuzzy
+msgid "Choose..."
+msgstr "Fermer"
+
+#: src/prefs.c:1370
 #, fuzzy
 msgid "Sound Options"
 msgstr "Options"
 
-#: src/prefs.c:1079
+#: src/prefs.c:1398
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Son quand vos potes se connectent"
 
-#: src/prefs.c:1080 src/prefs.c:1511
+#: src/prefs.c:1399 src/prefs.c:1610
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1081
+#: src/prefs.c:1405
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1146
-#, fuzzy
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Tracer la Conversation"
-
-#: src/prefs.c:1181
-#, fuzzy
-msgid "Reset"
-msgstr "S'enregistrer"
-
-#: src/prefs.c:1186
-#, fuzzy
-msgid "Choose..."
-msgstr "Fermer"
-
-#: src/prefs.c:1222
-#, fuzzy
-msgid "Sound Events"
-msgstr "Sons"
-
-#: src/prefs.c:1234
+#: src/prefs.c:1415
+#, c-format
+msgid ""
+"Command to play sound files\n"
+"(%s for filename; internal if empty)"
+msgstr ""
+
+#: src/prefs.c:1426
+msgid "Events"
+msgstr ""
+
+#: src/prefs.c:1434
 msgid "Sound when buddy logs in"
 msgstr "Son quand vos potes se connectent"
 
-#: src/prefs.c:1235
+#: src/prefs.c:1435
 msgid "Sound when buddy logs out"
 msgstr "Son quand vos potes se d�connectent"
 
-#: src/prefs.c:1241
+#: src/prefs.c:1441
+#, fuzzy
+msgid "Sound when received message begins conversation"
+msgstr "Son � l'envoi d'un message"
+
+#: src/prefs.c:1442
 msgid "Sound when message is received"
 msgstr "Son � la reception d'un message"
 
-#: src/prefs.c:1242
-#, fuzzy
-msgid "Sound when message is first received"
-msgstr "Son � la reception d'un message"
-
-#: src/prefs.c:1243
+#: src/prefs.c:1443
 msgid "Sound when message is sent"
 msgstr "Son � l'envoi d'un message"
 
-#: src/prefs.c:1249
+#: src/prefs.c:1449
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "Son lorsque les personnes entrent/sortent d'un forum"
 
-#: src/prefs.c:1250
+#: src/prefs.c:1450
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "Son lorsque les personnes entrent/sortent d'un forum"
 
-#: src/prefs.c:1251
+#: src/prefs.c:1451
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "Son lorsque els personnes parlent dnas un forum"
 
-#: src/prefs.c:1252
+#: src/prefs.c:1452
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "Son lorsque els personnes parlent dnas un forum"
 
-#: src/prefs.c:1262
-#, c-format
-msgid "Command to play sound files (%s for filename; internal if empty)"
-msgstr ""
-
-#: src/prefs.c:1408 src/prefs.c:2273
+#: src/prefs.c:1581 src/prefs.c:2480
 #, fuzzy
 msgid "Away Messages"
 msgstr "Nouveau Message d'absence"
 
-#: src/prefs.c:1420
+#: src/prefs.c:1617
+msgid "Don't send auto-response"
+msgstr ""
+
+#: src/prefs.c:1628
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1641
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1654
+#, fuzzy
+msgid "Messages"
+msgstr "Cr�er un Message"
+
+#: src/prefs.c:1666
 #, fuzzy
 msgid "Title"
 msgstr "Fichier"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1670
 #, fuzzy
 msgid "Message"
 msgstr "Cr�er un Message"
 
-#: src/prefs.c:1464
+#: src/prefs.c:1709
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1468
+#: src/prefs.c:1713
 #, fuzzy
 msgid "Make Away"
 msgstr "Etre absent maintenant"
 
-#: src/prefs.c:1512
-msgid "Don't send auto-response"
-msgstr ""
-
-#: src/prefs.c:1522
-msgid "Auto Away after"
-msgstr ""
-
-#: src/prefs.c:1535
-msgid "minutes using"
-msgstr ""
-
-#: src/prefs.c:1754
+#: src/prefs.c:1959
 #, fuzzy
 msgid "Privacy Options"
 msgstr "Options"
 
-#: src/prefs.c:1770
+#: src/prefs.c:1975
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1789
+#: src/prefs.c:1994
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1790
+#: src/prefs.c:1995
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1792
+#: src/prefs.c:1997
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1823
+#: src/prefs.c:2028
 #, fuzzy
 msgid "Deny all users"
 msgstr "Interdire certains"
 
-#: src/prefs.c:1824
+#: src/prefs.c:2029
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1826
+#: src/prefs.c:2031
 #, fuzzy
 msgid "Block List"
 msgstr "Bloquer"
 
-#: src/prefs.c:1921
+#: src/prefs.c:2126
 msgid "Gaim - Preferences"
 msgstr "Gaim - Pr�f�rences"
 
-#: src/prefs.c:2001
+#: src/prefs.c:2206
 msgid "GAIM debug output window"
 msgstr "fenetre de debug GAIM"
 
-#: src/prefs.c:2192
+#: src/prefs.c:2400
 msgid "General"
 msgstr "G�nerale"
 
-#: src/prefs.c:2197
-msgid "Browser"
-msgstr "Navigateur"
-
-#: src/prefs.c:2226
+#: src/prefs.c:2436
 #, fuzzy
 msgid "Conversations"
 msgstr "Tracer toutes les conversations"
 
-#: src/prefs.c:2231
-msgid "IM Window"
+#: src/prefs.c:2441
+msgid "Windows"
 msgstr ""
 
-#: src/prefs.c:2236
-msgid "Chat Window"
-msgstr ""
-
-#: src/prefs.c:2257
+#: src/prefs.c:2469
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/prefs.c:2262
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2284
+#: src/prefs.c:2491
 msgid "Privacy"
 msgstr ""
 
@@ -2100,11 +2190,32 @@
 msgid "Register new user for"
 msgstr ""
 
-#: src/server.c:608
+#: src/server.c:56
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
+msgstr ""
+
+#: src/server.c:58
+#, fuzzy
+msgid "Login Error"
+msgstr "Erreur de Plugin"
+
+#: src/server.c:463
+#, fuzzy, c-format
+msgid "(%d messages)"
+msgstr "Son � l'envoi d'un message"
+
+#: src/server.c:469
+#, fuzzy
+msgid "(1 message)"
+msgstr "En utilisant le message:"
+
+#: src/server.c:763
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:609
+#: src/server.c:764
 msgid "No"
 msgstr ""
 
@@ -2181,6 +2292,30 @@
 msgid "%s requests you to send them a file"
 msgstr "%s vous demande de leur envoyer un fichier"
 
+#, fuzzy
+#~ msgid "Browser Options"
+#~ msgstr "Options"
+
+#, fuzzy
+#~ msgid "Logging Options"
+#~ msgstr "Connection de %s.\n"
+
+#, fuzzy
+#~ msgid "Text Only"
+#~ msgstr "Couleur de texte"
+
+#, fuzzy
+#~ msgid "Chat Options"
+#~ msgstr "Options"
+
+#, fuzzy
+#~ msgid "Sound Events"
+#~ msgstr "Sons"
+
+#, fuzzy
+#~ msgid "Sound when message is first received"
+#~ msgstr "Son � la reception d'un message"
+
 #~ msgid "Offline"
 #~ msgstr "Hors Ligne"
 
--- a/po/ko.po	Mon Apr 30 17:57:16 2001 +0000
+++ b/po/ko.po	Mon Apr 30 18:52:47 2001 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-04-13 17:07-0700\n"
+"POT-Creation-Date: 2001-04-30 10:14-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,37 +14,49 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: plugins/icq/gaim_icq.c:401 src/oscar.c:2261 src/toc.c:918
+#: plugins/msn/msn.c:1222
+msgid "Gaim-MSN: New Mail"
+msgstr ""
+
+#. Build OK Button
+#: plugins/msn/msn.c:1236 src/dialogs.c:611 src/dialogs.c:701
+#: src/dialogs.c:761 src/dialogs.c:1281 src/dialogs.c:1619 src/dialogs.c:1732
+#: src/dialogs.c:2084 src/dialogs.c:2270 src/dialogs.c:2338 src/dialogs.c:3854
+#: src/dialogs.c:3942 src/multi.c:479
+msgid "OK"
+msgstr "溌昔"
+
+#: plugins/icq/gaim_icq.c:401 src/oscar.c:2362 src/toc.c:918
 #, fuzzy
 msgid "Get Info"
 msgstr "紫遂切 舛左"
 
-#: plugins/yay/yay.c:172
+#: plugins/yay/yay.c:174
 #, fuzzy
 msgid "Your message did not get sent."
 msgstr "五獣走研 左馨 凶 社軒 鎧奄"
 
-#: plugins/yay/yay.c:172 src/dialogs.c:3067 src/dialogs.c:3074
-#: src/oscar.c:1309 src/oscar.c:1314 src/oscar.c:1350 src/oscar.c:1369
-#: src/oscar.c:1405
+#: plugins/yay/yay.c:174 src/dialogs.c:3071 src/dialogs.c:3078
+#: src/oscar.c:1410 src/oscar.c:1415 src/oscar.c:1451 src/oscar.c:1470
+#: src/oscar.c:1506
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - 神嫌 %d"
 
-#: plugins/yay/yay.c:190
+#: plugins/yay/yay.c:192
 #, c-format
 msgid "%s has made %s their buddy%s%s"
 msgstr ""
 
-#: plugins/yay/yay.c:192
+#: plugins/yay/yay.c:194
 #, fuzzy
 msgid "Gaim - Buddy"
 msgstr "Gaim - 庁姥 希馬奄"
 
-#: plugins/yay/yay.c:236 src/about.c:179 src/aim.c:301 src/buddy.c:2387
-#: src/buddy_chat.c:910 src/buddy_chat.c:1046 src/buddy_chat.c:1073
-#: src/conversation.c:2077 src/dialogs.c:434 src/dialogs.c:3817
-#: src/multi.c:686 src/plugins.c:319 src/prefs.c:1971 src/prpl.c:355
+#: plugins/yay/yay.c:238 src/about.c:179 src/aim.c:303 src/buddy.c:2584
+#: src/buddy_chat.c:919 src/buddy_chat.c:1055 src/buddy_chat.c:1082
+#: src/conversation.c:2110 src/dialogs.c:440 src/dialogs.c:3719
+#: src/multi.c:686 src/plugins.c:321 src/prefs.c:2176 src/prpl.c:355
 msgid "Close"
 msgstr "丸奄"
 
@@ -68,61 +80,61 @@
 msgid "Web Site"
 msgstr ""
 
-#: src/aim.c:135 src/buddy.c:2380
+#: src/aim.c:137 src/buddy.c:2577
 msgid "Signoff"
 msgstr "快奄"
 
-#: src/aim.c:147
+#: src/aim.c:149
 msgid "Please enter your logon"
 msgstr "戚硯聖 脊径馬室推"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:850
+#: src/aim.c:149 src/aim.c:154 src/multi.c:850
 #, fuzzy
 msgid "Signon Error"
 msgstr "尻衣"
 
-#: src/aim.c:152
+#: src/aim.c:154
 #, fuzzy
 msgid "Please enter your password"
 msgstr "戚硯聖 脊径馬室推"
 
-#: src/aim.c:246
+#: src/aim.c:248
 msgid "Gaim - Login"
 msgstr "Gaim - 稽益昔"
 
-#: src/aim.c:264
+#: src/aim.c:266
 msgid "Screen Name: "
 msgstr "鉢檎戚硯: "
 
-#: src/aim.c:278
+#: src/aim.c:280
 msgid "Password: "
 msgstr "章硲: "
 
-#: src/aim.c:299 src/buddy.c:2384
+#: src/aim.c:301 src/buddy.c:2581
 msgid "Quit"
 msgstr "魁鎧奄"
 
-#: src/aim.c:304 src/aim.c:641 src/buddy.c:2443
+#: src/aim.c:306 src/aim.c:642 src/buddy.c:2640
 msgid "Accounts"
 msgstr ""
 
-#: src/aim.c:306 src/multi.c:590
+#: src/aim.c:308 src/multi.c:590
 msgid "Signon"
 msgstr "尻衣"
 
-#: src/aim.c:338 src/prpl.c:359
+#: src/aim.c:340 src/prpl.c:359
 msgid "Register"
 msgstr "去系"
 
-#: src/aim.c:339
+#: src/aim.c:341 src/prefs.c:1382 src/prefs.c:1593
 msgid "Options"
 msgstr "辛芝"
 
-#: src/aim.c:341 src/aim.c:644 src/buddy.c:2460
+#: src/aim.c:343 src/aim.c:645 src/buddy.c:2657
 msgid "Plugins"
 msgstr "巴君益昔"
 
-#: src/aim.c:638 src/buddy.c:2452
+#: src/aim.c:639 src/buddy.c:2649
 msgid "Preferences"
 msgstr "竺舛"
 
@@ -139,11 +151,11 @@
 msgid "Offilne. Click to bring up login box."
 msgstr "羨紗鞠嬢 赤走 省柔艦陥. 適遣馬檎 稽益昔 鉢檎戚 蟹辛艦陥."
 
-#: src/applet.c:169 src/buddy.c:2398
+#: src/applet.c:169 src/buddy.c:2595
 msgid "Away"
 msgstr "節呪"
 
-#: src/applet.c:172 src/away.c:266
+#: src/applet.c:172 src/away.c:342
 msgid "New Away Message"
 msgstr "歯稽錘 節呪 五獣走"
 
@@ -155,130 +167,135 @@
 msgid "About..."
 msgstr "...拭 企馬食"
 
-#: src/away.c:96
+#: src/away.c:157
 msgid "I'm Back!"
 msgstr "鎧亜 宜焼尽陥!"
 
-#: src/away.c:133
+#: src/away.c:210
 msgid "Gaim - Away!"
 msgstr "Gaim - 節呪!"
 
-#: src/away.c:147 src/away.c:228 src/away.c:393
+#: src/away.c:224 src/away.c:304 src/away.c:469
 msgid "Back"
 msgstr "及稽"
 
-#: src/away.c:286
+#: src/away.c:362
 msgid "Remove Away Message"
 msgstr "節呪 五獣走 蒸蕉奄"
 
-#: src/away.c:462
+#: src/away.c:538
 msgid "Set All Away"
 msgstr ""
 
 #. Put the buttons in the box
-#: src/buddy.c:266 src/buddy.c:2528 src/buddy_chat.c:1078
-#: src/conversation.c:1772 src/conversation.c:2092 src/dialogs.c:872
-#: src/dialogs.c:996 src/dialogs.c:1897 src/multi.c:670 src/prefs.c:798
-#: src/prefs.c:1460 src/prefs.c:1811 src/prefs.c:1845
+#: src/buddy.c:437 src/buddy.c:2725 src/buddy_chat.c:1087
+#: src/conversation.c:1793 src/conversation.c:2125 src/dialogs.c:878
+#: src/dialogs.c:1002 src/dialogs.c:1898 src/multi.c:670 src/prefs.c:971
+#: src/prefs.c:1705 src/prefs.c:2016 src/prefs.c:2050
 msgid "Add"
 msgstr "希馬奄"
 
-#: src/buddy.c:267 src/buddy.c:2529 src/dialogs.c:882 src/dialogs.c:978
+#: src/buddy.c:438 src/buddy.c:2726 src/dialogs.c:888 src/dialogs.c:984
 msgid "Group"
 msgstr "益血"
 
-#: src/buddy.c:268 src/buddy.c:2530 src/buddy_chat.c:1080
-#: src/conversation.c:1758 src/conversation.c:2089 src/prefs.c:799
-#: src/prefs.c:1474 src/prefs.c:1815 src/prefs.c:1849
+#: src/buddy.c:439 src/buddy.c:2727 src/buddy_chat.c:1089
+#: src/conversation.c:1779 src/conversation.c:2122 src/prefs.c:972
+#: src/prefs.c:1719 src/prefs.c:2020 src/prefs.c:2054
 msgid "Remove"
 msgstr "薦暗"
 
-#: src/buddy.c:271 src/buddy.c:1912 src/buddy.c:2271
+#: src/buddy.c:442 src/buddy.c:2113 src/buddy.c:2468
 msgid "Chat"
 msgstr "辰特"
 
-#: src/buddy.c:272 src/buddy.c:464 src/buddy.c:2269 src/buddy_chat.c:478
-#: src/buddy_chat.c:863
+#: src/buddy.c:443 src/buddy.c:654 src/buddy.c:764 src/buddy.c:2466
+#: src/buddy_chat.c:475 src/buddy_chat.c:872
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:273 src/buddy.c:2270 src/buddy_chat.c:491 src/buddy_chat.c:871
-#: src/buddy_chat.c:1086 src/conversation.c:2110
+#: src/buddy.c:444 src/buddy.c:2467 src/buddy_chat.c:488 src/buddy_chat.c:880
+#: src/buddy_chat.c:1095 src/conversation.c:2143
 msgid "Info"
 msgstr "舛左"
 
 #. Put the buttons in the box
-#: src/buddy.c:470 src/buddy.c:575 src/dialogs.c:972 src/dialogs.c:3432
-#: src/dialogs.c:3447 src/dialogs.c:3524 src/dialogs.c:3539
+#: src/buddy.c:660 src/buddy.c:770 src/dialogs.c:978 src/dialogs.c:3426
+#: src/dialogs.c:3441
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:476 src/buddy.c:589
+#: src/buddy.c:666 src/buddy.c:790
 msgid "Add Buddy Pounce"
 msgstr "庁姥 細説奄 幻級奄"
 
-#: src/buddy.c:482 src/buddy.c:595
+#: src/buddy.c:672 src/buddy.c:796
 msgid "View Log"
 msgstr ""
 
-#: src/buddy.c:582
+#: src/buddy.c:752 src/buddy.c:784
+#, fuzzy
+msgid "Rename"
+msgstr "薦暗"
+
+#: src/buddy.c:777
 msgid "Un-Alias"
 msgstr ""
 
-#: src/buddy.c:1590
+#: src/buddy.c:1791
 msgid "New Buddy Pounce"
 msgstr "庁姥 細説奄 歯稽 幻級奄"
 
-#: src/buddy.c:1608
+#: src/buddy.c:1809
 msgid "Remove Buddy Pounce"
 msgstr "庁姥 細説奄 走酔奄"
 
-#: src/buddy.c:1903
+#: src/buddy.c:2104
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "庁姥 細説奄"
 
-#: src/buddy.c:1906
+#: src/buddy.c:2107
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1909
+#: src/buddy.c:2110
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1915
+#: src/buddy.c:2116
 #, fuzzy
 msgid "Get File"
 msgstr "督析"
 
-#: src/buddy.c:1918
+#: src/buddy.c:2119
 #, fuzzy
 msgid "Send File"
 msgstr "督析"
 
-#: src/buddy.c:1921
+#: src/buddy.c:2122
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:1924
+#: src/buddy.c:2125
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:1976
+#: src/buddy.c:2177
 #, fuzzy, c-format
 msgid "Logged in: %s\n"
 msgstr "%s 拭 羨紗\n"
 
-#: src/buddy.c:1987
+#: src/buddy.c:2188
 msgid "Warnings: %d%%\n"
 msgstr "爽税: %d%%\n"
 
-#: src/buddy.c:1999
+#: src/buddy.c:2200
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:2003
+#: src/buddy.c:2204
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -289,534 +306,534 @@
 "稽益昔 廃 凶: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:2007
+#: src/buddy.c:2208
 msgid "Idle: "
 msgstr "且奄: "
 
-#: src/buddy.c:2076
+#: src/buddy.c:2277
 #, fuzzy, c-format
-msgid "<B>%s logged in%s%s.</B>"
+msgid "%s logged in."
 msgstr "<HR><B>%s 亜 稽益昔 馬心柔艦陥 %s%s.</B><BR><HR>"
 
-#: src/buddy.c:2130
+#: src/buddy.c:2329
 #, fuzzy, c-format
-msgid "<B>%s logged out%s%s.</B>"
+msgid "%s logged out."
 msgstr "<HR><B>%s 亜 稽益焼数 馬心柔艦陥 %s%s.</B><BR><HR>"
 
-#: src/buddy.c:2296
+#: src/buddy.c:2493
 msgid "Information on selected Buddy"
 msgstr "識澱廃 庁姥拭 企廃 舛左"
 
-#: src/buddy.c:2297 src/dialogs.c:671
+#: src/buddy.c:2494 src/dialogs.c:677
 msgid "Send Instant Message"
 msgstr "五獣走 左鎧奄"
 
-#: src/buddy.c:2298
+#: src/buddy.c:2495
 msgid "Start/join a Buddy Chat"
 msgstr "辰特 獣拙/凧亜"
 
-#: src/buddy.c:2362
+#: src/buddy.c:2559
 msgid "File"
 msgstr "督析"
 
-#: src/buddy.c:2366
+#: src/buddy.c:2563
 msgid "Add A Buddy"
 msgstr "庁姥 希馬奄"
 
-#: src/buddy.c:2368
+#: src/buddy.c:2565
 #, fuzzy
 msgid "Join A Chat"
 msgstr "辰特拭 凧亜"
 
-#: src/buddy.c:2370
+#: src/buddy.c:2567
 #, fuzzy
 msgid "New Instant Message"
 msgstr "五獣走 左鎧奄"
 
-#: src/buddy.c:2375
+#: src/buddy.c:2572
 msgid "Import Buddy List"
 msgstr "庁姥 鯉系 亜閃神奄"
 
-#: src/buddy.c:2377
+#: src/buddy.c:2574
 msgid "Export Buddy List"
 msgstr "庁姥 鯉系 鎧左鎧奄"
 
-#: src/buddy.c:2393
+#: src/buddy.c:2590
 msgid "Tools"
 msgstr "亀姥"
 
-#: src/buddy.c:2403
+#: src/buddy.c:2600
 msgid "Buddy Pounce"
 msgstr "庁姥 細説奄"
 
-#: src/buddy.c:2412 src/dialogs.c:2078 src/dialogs.c:2245
+#: src/buddy.c:2609 src/dialogs.c:2079 src/dialogs.c:2246
 msgid "Search for Buddy"
 msgstr "庁姥 達奄"
 
-#: src/buddy.c:2415
+#: src/buddy.c:2612
 msgid "by Email"
 msgstr "五析稽"
 
-#: src/buddy.c:2419
+#: src/buddy.c:2616
 msgid "by Dir Info"
 msgstr "巨刑塘軒 舛左稽"
 
-#: src/buddy.c:2426 src/buddy.c:2427
+#: src/buddy.c:2623 src/buddy.c:2624
 msgid "Settings"
 msgstr "竺舛"
 
-#: src/buddy.c:2430
+#: src/buddy.c:2627
 msgid "User Info"
 msgstr "紫遂切 舛左"
 
-#: src/buddy.c:2434 src/dialogs.c:1356
+#: src/buddy.c:2631 src/dialogs.c:1362
 msgid "Directory Info"
 msgstr "巨刑塘軒 舛左"
 
-#: src/buddy.c:2438 src/dialogs.c:1547
+#: src/buddy.c:2635 src/dialogs.c:1553
 msgid "Change Password"
 msgstr "鳶什趨球 郊荷奄"
 
-#: src/buddy.c:2447
+#: src/buddy.c:2644
 #, fuzzy
 msgid "Protocol Actions"
 msgstr "辛芝"
 
-#: src/buddy.c:2454
+#: src/buddy.c:2651
 msgid "View System Log"
 msgstr ""
 
-#: src/buddy.c:2465
+#: src/buddy.c:2662
 #, fuzzy
 msgid "Perl"
 msgstr "買遂"
 
-#: src/buddy.c:2468
+#: src/buddy.c:2665
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2472
+#: src/buddy.c:2669
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2476
+#: src/buddy.c:2673
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2484
+#: src/buddy.c:2681
 msgid "Help"
 msgstr "亀崇源"
 
-#: src/buddy.c:2489
+#: src/buddy.c:2686
 #, fuzzy
 msgid "About Gaim"
 msgstr "GAIM 精"
 
-#: src/buddy.c:2508 src/prefs.c:2215
+#: src/buddy.c:2705 src/prefs.c:2425
 msgid "Buddy List"
 msgstr "庁姥 鯉系"
 
-#: src/buddy.c:2562
+#: src/buddy.c:2759
 msgid "Add a new Buddy"
 msgstr "歯 庁姥 希馬奄"
 
-#: src/buddy.c:2563
+#: src/buddy.c:2760
 #, fuzzy
 msgid "Add a new Group"
 msgstr "歯 庁姥 希馬奄"
 
-#: src/buddy.c:2564
+#: src/buddy.c:2761
 msgid "Remove selected Buddy"
 msgstr "識澱廃 庁姥 皐奄"
 
-#: src/buddy.c:2589
+#: src/buddy.c:2786
 msgid "Online"
 msgstr "尻衣掻"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2788
 msgid "Edit Buddies"
 msgstr "庁姥 畷増"
 
-#: src/buddy.c:2628
+#: src/buddy.c:2825
 msgid "Gaim - Buddy List"
 msgstr "Gaim - 庁姥 鯉系"
 
-#: src/buddy_chat.c:160
+#: src/buddy_chat.c:157
 msgid "Join Chat"
 msgstr "辰特拭 凧亜"
 
-#: src/buddy_chat.c:167 src/buddy_chat.c:978 src/buddy_chat.c:990
+#: src/buddy_chat.c:164 src/buddy_chat.c:987 src/buddy_chat.c:999
 msgid "Buddy Chat"
 msgstr "辰特"
 
-#: src/buddy_chat.c:177
+#: src/buddy_chat.c:174
 msgid "Join what group:"
 msgstr "凧亜拝 益血精:"
 
-#: src/buddy_chat.c:190
+#: src/buddy_chat.c:187
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "辰特拭 凧亜"
 
-#: src/buddy_chat.c:202
+#: src/buddy_chat.c:199
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:209
+#: src/buddy_chat.c:206
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:217 src/buddy_chat.c:262 src/dialogs.c:404
-#: src/dialogs.c:690 src/dialogs.c:750 src/dialogs.c:874 src/dialogs.c:991
-#: src/dialogs.c:1270 src/dialogs.c:1480 src/dialogs.c:1608 src/dialogs.c:1673
-#: src/dialogs.c:1886 src/dialogs.c:2084 src/dialogs.c:2264 src/dialogs.c:2338
-#: src/dialogs.c:3200 src/dialogs.c:3434 src/dialogs.c:3526 src/dialogs.c:3713
-#: src/multi.c:475 src/multi.c:586 src/multi.c:833 src/prpl.c:156
-#: src/prpl.c:227
+#: src/buddy_chat.c:214 src/buddy_chat.c:259 src/dialogs.c:410
+#: src/dialogs.c:696 src/dialogs.c:756 src/dialogs.c:880 src/dialogs.c:997
+#: src/dialogs.c:1276 src/dialogs.c:1486 src/dialogs.c:1614 src/dialogs.c:1679
+#: src/dialogs.c:1887 src/dialogs.c:2085 src/dialogs.c:2265 src/dialogs.c:2339
+#: src/dialogs.c:3204 src/dialogs.c:3428 src/dialogs.c:3619 src/dialogs.c:3849
+#: src/dialogs.c:3937 src/multi.c:475 src/multi.c:586 src/multi.c:833
+#: src/prpl.c:156 src/prpl.c:227
 msgid "Cancel"
 msgstr "昼社"
 
-#: src/buddy_chat.c:222
+#: src/buddy_chat.c:219
 msgid "Join"
 msgstr "凧亜"
 
-#: src/buddy_chat.c:263 src/buddy_chat.c:916 src/buddy_chat.c:1045
+#: src/buddy_chat.c:260 src/buddy_chat.c:925 src/buddy_chat.c:1054
 msgid "Invite"
 msgstr "段企"
 
-#: src/buddy_chat.c:279
+#: src/buddy_chat.c:276
 msgid "Invite who?"
 msgstr "刊閏 段企拝猿推?"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:280
 msgid "With message:"
 msgstr "五獣走澗:"
 
-#: src/buddy_chat.c:307
+#: src/buddy_chat.c:304
 msgid "Invite to Buddy Chat"
 msgstr "辰特拭 段企"
 
-#: src/buddy_chat.c:484 src/buddy_chat.c:867
+#: src/buddy_chat.c:481 src/buddy_chat.c:876
 msgid "Ignore"
 msgstr "巷獣"
 
-#: src/buddy_chat.c:536 src/buddy_chat.c:642
+#: src/buddy_chat.c:533 src/buddy_chat.c:639
 #, c-format
 msgid "%d %s in room"
 msgstr ""
 
-#: src/buddy_chat.c:543
+#: src/buddy_chat.c:540
 #, c-format
-msgid "<B>%s entered the room.</B>"
+msgid "%s entered the room."
 msgstr ""
 
-#: src/buddy_chat.c:606
+#: src/buddy_chat.c:603
 #, c-format
-msgid "<B>%s is now known as %s</B>"
+msgid "%s is now known as %s"
 msgstr ""
 
-#: src/buddy_chat.c:649
+#: src/buddy_chat.c:646
 #, c-format
-msgid "<B>%s left the room.</B>"
+msgid "%s left the room."
 msgstr ""
 
-#: src/buddy_chat.c:776
+#: src/buddy_chat.c:773
 #, fuzzy
 msgid "Gaim - Group Chats"
 msgstr "Gaim 辰特"
 
-#: src/buddy_chat.c:844
+#: src/buddy_chat.c:853
 msgid "0 people in room"
 msgstr ""
 
-#: src/buddy_chat.c:921 src/buddy_chat.c:1044
+#: src/buddy_chat.c:930 src/buddy_chat.c:1053
 msgid "Whisper"
 msgstr "詠紗源"
 
-#: src/buddy_chat.c:926 src/buddy_chat.c:1042 src/buddy_chat.c:1088
-#: src/conversation.c:2121
+#: src/buddy_chat.c:935 src/buddy_chat.c:1051 src/buddy_chat.c:1097
+#: src/conversation.c:2154
 msgid "Send"
 msgstr "左鎧奄"
 
-#: src/buddy_chat.c:1082 src/conversation.c:2098
+#: src/buddy_chat.c:1091 src/conversation.c:2131
 msgid "Block"
 msgstr "託舘"
 
-#: src/buddy_chat.c:1084 src/conversation.c:2104 src/dialogs.c:374
-#: src/dialogs.c:399
+#: src/buddy_chat.c:1093 src/conversation.c:2137 src/dialogs.c:380
+#: src/dialogs.c:405
 msgid "Warn"
 msgstr "爽税"
 
-#: src/conversation.c:352
+#: src/conversation.c:365
 #, fuzzy
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 企鉢 稽焔"
 
-#: src/conversation.c:503
+#: src/conversation.c:518
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "'%s' 研 庁姥 鯉系拭辞 皿艦陥.\n"
 
-#: src/conversation.c:1068
+#: src/conversation.c:1083
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "薄仙 %d 拭 赤柔艦陥\n"
 
-#: src/conversation.c:1076
+#: src/conversation.c:1091
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "是帖研 %d 稽 薪演艦陥\n"
 
-#: src/conversation.c:1602
+#: src/conversation.c:1623
 msgid "Bold"
 msgstr "噂惟"
 
-#: src/conversation.c:1602 src/prefs.c:974
+#: src/conversation.c:1623 src/prefs.c:1147
 msgid "Bold Text"
 msgstr "噂精 越松"
 
-#: src/conversation.c:1606 src/conversation.c:1607
+#: src/conversation.c:1627 src/conversation.c:1628
 msgid "Italics"
 msgstr "奄随績"
 
-#: src/conversation.c:1606 src/prefs.c:975
+#: src/conversation.c:1627 src/prefs.c:1148
 msgid "Italics Text"
 msgstr "奄随昔 越松"
 
-#: src/conversation.c:1610 src/conversation.c:1611
+#: src/conversation.c:1631 src/conversation.c:1632
 msgid "Underline"
 msgstr "購匝"
 
-#: src/conversation.c:1610
+#: src/conversation.c:1631
 msgid "Underline Text"
 msgstr "購匝庁 越松"
 
-#: src/conversation.c:1615
+#: src/conversation.c:1636
 msgid "Strike"
 msgstr "亜錘汽匝"
 
-#: src/conversation.c:1615
+#: src/conversation.c:1636
 msgid "Strike through Text"
 msgstr "亜錘汽匝庁 越松"
 
-#: src/conversation.c:1621
+#: src/conversation.c:1642
 msgid "Small"
 msgstr "拙惟"
 
-#: src/conversation.c:1621
+#: src/conversation.c:1642
 msgid "Decrease font size"
 msgstr "越松 滴奄 匝戚奄"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1645
 msgid "Normal"
 msgstr "左搭"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1645
 msgid "Normal font size"
 msgstr "左搭 越松 滴奄"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1648
 msgid "Big"
 msgstr "滴惟"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1648
 msgid "Increase font size"
 msgstr "越松 滴奄 徹酔奄"
 
-#: src/conversation.c:1634 src/conversation.c:1635
+#: src/conversation.c:1655 src/conversation.c:1656
 msgid "Font"
 msgstr "越加"
 
-#: src/conversation.c:1634 src/dialogs.c:2687 src/dialogs.c:2703
+#: src/conversation.c:1655 src/dialogs.c:2691 src/dialogs.c:2707
 msgid "Select Font"
 msgstr "越加 識澱"
 
-#: src/conversation.c:1638 src/conversation.c:1639 src/conversation.c:1643
+#: src/conversation.c:1659 src/conversation.c:1660 src/conversation.c:1664
 msgid "Color"
 msgstr "事薗"
 
-#: src/conversation.c:1638 src/prefs.c:988
+#: src/conversation.c:1659 src/prefs.c:1161
 msgid "Text Color"
 msgstr "越松 事薗"
 
-#: src/conversation.c:1643 src/prefs.c:1006
+#: src/conversation.c:1664 src/prefs.c:1179
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1650 src/conversation.c:1651
+#: src/conversation.c:1671 src/conversation.c:1672
 msgid "Link"
 msgstr "尻衣"
 
-#: src/conversation.c:1650 src/dialogs.c:2332
+#: src/conversation.c:1671 src/dialogs.c:2333
 msgid "Insert Link"
 msgstr "尻衣 隔奄"
 
-#: src/conversation.c:1654
+#: src/conversation.c:1675
 #, fuzzy
 msgid "Smiley"
 msgstr "督析"
 
-#: src/conversation.c:1654
+#: src/conversation.c:1675
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1661 src/conversation.c:1662 src/prefs.c:2202
+#: src/conversation.c:1682 src/conversation.c:1683 src/prefs.c:245
 msgid "Logging"
 msgstr "稽焔"
 
-#: src/conversation.c:1661
+#: src/conversation.c:1682
 msgid "Enable logging"
 msgstr "稽焔 馬奄"
 
-#: src/conversation.c:1671 src/conversation.c:1672 src/dialogs.c:1485
-#: src/dialogs.c:1678 src/dialogs.c:3212 src/dialogs.c:3826
+#: src/conversation.c:1692 src/conversation.c:1693 src/dialogs.c:1491
+#: src/dialogs.c:1684 src/dialogs.c:3216 src/dialogs.c:3728
 msgid "Save"
 msgstr "煽舌"
 
-#: src/conversation.c:1671
+#: src/conversation.c:1692
 #, fuzzy
 msgid "Save Conversation"
 msgstr "乞窮 企鉢研 稽焔"
 
-#: src/conversation.c:1676 src/conversation.c:1677
+#: src/conversation.c:1697 src/conversation.c:1698
 msgid "Sound"
 msgstr "社軒"
 
-#: src/conversation.c:1676
+#: src/conversation.c:1697
 msgid "Enable sounds"
 msgstr "社軒 級軒惟"
 
-#: src/conversation.c:1964
+#: src/conversation.c:1985
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - 企鉢 稽焔"
 
-#: src/conversation.c:2039
+#: src/conversation.c:2072
 #, fuzzy
 msgid "Send message as: "
 msgstr "五獣走研 左馨 凶 社軒 鎧奄"
 
-#: src/dialogs.c:361
+#: src/dialogs.c:367
 msgid "Gaim - Warn user?"
 msgstr "Gaim - 紫遂切拭惟 爽税 左鎧奄"
 
-#: src/dialogs.c:382
+#: src/dialogs.c:388
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "%s 拭惟 舛源稽 爽税研 左鎧獣憩艦猿?"
 
-#: src/dialogs.c:387
+#: src/dialogs.c:393
 msgid "Warn anonymously?"
 msgstr "爽税研 斥誤生稽 左馨猿推?"
 
-#: src/dialogs.c:391
+#: src/dialogs.c:397
 msgid "Anonymous warnings are less harsh."
 msgstr "斥誤税 爽税亜 旗 暗十険 呪 赤柔艦陥."
 
-#: src/dialogs.c:467
+#: src/dialogs.c:473
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%s 督析拭 承 呪亜 蒸柔艦陥."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:476
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%s 督析拭辞 石聖 呪亜 蒸柔艦陥."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:479
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "五獣走亜 格巷 掩嬢辞 原走厳 %s 郊戚闘亜 息携柔艦陥."
 
-#: src/dialogs.c:476
+#: src/dialogs.c:482
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 澗 薄仙 稽益昔馬走 省紹柔艦陥."
 
-#: src/dialogs.c:479
+#: src/dialogs.c:485
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s 拭惟 爽税研 左鎧澗 依精 買遂鞠走 省柔艦陥."
 
-#: src/dialogs.c:482
+#: src/dialogs.c:488
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "辞獄税 紗亀廃域研 角醸奄 凶庚拭 五獣走研 獄携柔艦陥."
 
-#: src/dialogs.c:485
+#: src/dialogs.c:491
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s 拭 辰特 凧亜研 拝 呪 蒸柔艦陥."
 
-#: src/dialogs.c:488
+#: src/dialogs.c:494
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "%s 拭惟 格巷 察軒 五獣走研 左鎧壱 赤柔艦陥."
 
-#: src/dialogs.c:491
+#: src/dialogs.c:497
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "%s 拭惟辞 紳 五獣走亜 格巷 朕辞 兜弾柔艦陥."
 
-#: src/dialogs.c:494
+#: src/dialogs.c:500
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s 拭惟辞 紳 五獣走亜 格巷 察虞辞 兜弾柔艦陥."
 
-#: src/dialogs.c:497
+#: src/dialogs.c:503
 msgid "Failure."
 msgstr "叔鳶."
 
-#: src/dialogs.c:500
+#: src/dialogs.c:506
 msgid "Too many matches."
 msgstr "背雁 牌鯉戚 格巷 弦柔艦陥."
 
-#: src/dialogs.c:503
+#: src/dialogs.c:509
 msgid "Need more qualifiers."
 msgstr "希 雌室備 走舛馬淑獣推."
 
-#: src/dialogs.c:506
+#: src/dialogs.c:512
 msgid "Dir service temporarily unavailable."
 msgstr "巨刑塘軒 辞搾什研 析獣旋生稽 紫遂拝 呪 蒸柔艦陥."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:515
 msgid "Email lookup restricted."
 msgstr "五析 達焼左奄拭 薦鉦戚 赤柔艦陥."
 
-#: src/dialogs.c:512
+#: src/dialogs.c:518
 msgid "Keyword ignored."
 msgstr "徹趨球亜 巷獣鞠醸柔艦陥."
 
-#: src/dialogs.c:515
+#: src/dialogs.c:521
 msgid "No keywords."
 msgstr "徹趨球亜 蒸柔艦陥."
 
-#: src/dialogs.c:518
+#: src/dialogs.c:524
 msgid "User has no directory information."
 msgstr "紫遂切亜 巨刑塘軒 舛左研 握壱 赤走 省柔艦陥."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:528
 msgid "Country not supported."
 msgstr "厩亜澗 走据鞠走 省柔艦陥."
 
-#: src/dialogs.c:525
+#: src/dialogs.c:531
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "硝 呪 蒸澗 叔鳶: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:528 src/oscar.c:524
+#: src/dialogs.c:534 src/oscar.c:525
 msgid "Incorrect nickname or password."
 msgstr "戚硯戚蟹 鳶什趨球亜 堂携柔艦陥."
 
-#: src/dialogs.c:531
+#: src/dialogs.c:537
 msgid "The service is temporarily unavailable."
 msgstr "節獣 辞搾什亜 紫遂災亜管杯艦陥."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:540
 msgid "Your warning level is currently too high to log in."
 msgstr "雁重精 爽税 呪層戚 株嬢辞 稽益昔 拝 呪 蒸柔艦陥."
 
-#: src/dialogs.c:537
+#: src/dialogs.c:543
 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."
@@ -824,382 +841,399 @@
 "雁重精 格巷 切爽 尻衣馬壱 快壱馬心柔艦陥. 10歳聖 奄陥鍵 板 陥獣 "
 "獣亀馬淑獣推. 域紗 獣亀廃陥檎 奄陥形醤 馬澗 獣娃戚 希 掩嬢増艦陥."
 
-#: src/dialogs.c:540
+#: src/dialogs.c:546
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "羨紗 掻拭 硝 呪 蒸澗 神嫌亜 降持馬心柔艦陥: %s."
 
-#: src/dialogs.c:543
+#: src/dialogs.c:549
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "硝 呪 蒸澗 神嫌, %d 亜 降持馬心柔艦陥.  舛左澗: %s"
 
-#: src/dialogs.c:546
+#: src/dialogs.c:552
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - 神嫌 %d"
 
-#. Build OK Button
-#: src/dialogs.c:605 src/dialogs.c:695 src/dialogs.c:755 src/dialogs.c:1275
-#: src/dialogs.c:1613 src/dialogs.c:1726 src/dialogs.c:2083 src/dialogs.c:2269
-#: src/dialogs.c:2337 src/multi.c:479
-msgid "OK"
-msgstr "溌昔"
-
-#: src/dialogs.c:661
+#: src/dialogs.c:667
 msgid "Gaim - IM user"
 msgstr "Gaim - 昔什渡闘 五重煽 紫遂切"
 
-#: src/dialogs.c:678
+#: src/dialogs.c:684
 #, fuzzy
 msgid "IM who:"
 msgstr "昔什渡闘 五重煽 紫遂切: "
 
-#: src/dialogs.c:726
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "紫遂切 舛左"
 
-#: src/dialogs.c:733
+#: src/dialogs.c:739
 msgid "User:"
 msgstr ""
 
 #. Finish up
-#: src/dialogs.c:761
+#: src/dialogs.c:767
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 紫遂切 舛左 竺舛"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:833
 msgid "Buddies"
 msgstr "庁姥"
 
-#: src/dialogs.c:880
+#: src/dialogs.c:886
 #, fuzzy
 msgid "Add Group"
 msgstr "益血"
 
-#: src/dialogs.c:910
+#: src/dialogs.c:916
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - 庁姥 希馬奄"
 
-#: src/dialogs.c:937
+#: src/dialogs.c:943
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 庁姥 希馬奄"
 
-#: src/dialogs.c:951
+#: src/dialogs.c:957
 msgid "Add Buddy"
 msgstr "庁姥 希馬奄"
 
-#: src/dialogs.c:961 src/dialogs.c:3442 src/dialogs.c:3534
+#: src/dialogs.c:967 src/dialogs.c:3436
 msgid "Buddy"
 msgstr "庁姥"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:1021
 #, fuzzy
 msgid "Please enter a buddy to pounce."
 msgstr "戚硯聖 脊径馬室推"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:1021
 #, fuzzy
 msgid "Buddy Pounce Error"
 msgstr "庁姥 細説奄"
 
-#: src/dialogs.c:1084
+#: src/dialogs.c:1090
 #, fuzzy
 msgid "Pounce buddy as:"
 msgstr "庁姥亜 級嬢神檎 社軒 鎧奄"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1140
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - 細説聖 庁姥 歯稽 幻級奄"
 
-#: src/dialogs.c:1151
+#: src/dialogs.c:1157
 #, fuzzy
 msgid "Buddy:"
 msgstr "庁姥"
 
-#: src/dialogs.c:1166
+#: src/dialogs.c:1172
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1171
+#: src/dialogs.c:1177
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1175
+#: src/dialogs.c:1181
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1183
+#: src/dialogs.c:1189
 #, fuzzy
 msgid "Open IM window on pounce"
 msgstr "庁姥亜 羨紗拝 凶 五獣走 但 伸奄"
 
-#: src/dialogs.c:1188
+#: src/dialogs.c:1194
 #, fuzzy
 msgid "Send IM on pounce"
 msgstr "庁姥亜 羨紗拝 凶 五獣走 左鎧奄"
 
-#: src/dialogs.c:1197
+#: src/dialogs.c:1203
 #, fuzzy
 msgid "Message:"
 msgstr "五獣走 幻級奄"
 
-#: src/dialogs.c:1209
+#: src/dialogs.c:1215
 #, fuzzy
 msgid "Execute command on pounce"
 msgstr "庁姥亜 羨紗拝 凶 五獣走 左鎧奄"
 
-#: src/dialogs.c:1218
+#: src/dialogs.c:1224
 msgid "Command:"
 msgstr ""
 
-#: src/dialogs.c:1231
+#: src/dialogs.c:1237
 #, fuzzy
 msgid "Play sound on pounce"
 msgstr "庁姥亜 羨紗拝 凶 五獣走 左鎧奄"
 
-#: src/dialogs.c:1240
+#: src/dialogs.c:1246
 #, fuzzy
 msgid "Sound:"
 msgstr "社軒"
 
-#: src/dialogs.c:1257
+#: src/dialogs.c:1263
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1352
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 巨刑塘軒 舛左 竺舛"
 
-#: src/dialogs.c:1378
+#: src/dialogs.c:1384
 msgid "Allow Web Searches To Find Your Info"
 msgstr "瀬聖 搭馬食 蟹税 舛左研 伊事拝 呪 赤亀系 買遂"
 
 #. Line 1
-#: src/dialogs.c:1381 src/dialogs.c:2102
+#: src/dialogs.c:1387 src/dialogs.c:2103
 msgid "First Name"
 msgstr "戚硯"
 
 #. Line 2
-#: src/dialogs.c:1392 src/dialogs.c:2114
+#: src/dialogs.c:1398 src/dialogs.c:2115
 msgid "Middle Name"
 msgstr "掻娃 戚硯"
 
 #. Line 3
-#: src/dialogs.c:1404 src/dialogs.c:2126
+#: src/dialogs.c:1410 src/dialogs.c:2127
 msgid "Last Name"
 msgstr "失"
 
 #. Line 4
-#: src/dialogs.c:1415 src/dialogs.c:2138
+#: src/dialogs.c:1421 src/dialogs.c:2139
 msgid "Maiden Name"
 msgstr "坦橿獣箭 戚硯"
 
 #. Line 5
-#: src/dialogs.c:1426 src/dialogs.c:2150
+#: src/dialogs.c:1432 src/dialogs.c:2151
 msgid "City"
 msgstr "浦/姥"
 
 #. Line 6
-#: src/dialogs.c:1437 src/dialogs.c:2161
+#: src/dialogs.c:1443 src/dialogs.c:2162
 msgid "State"
 msgstr "獣/亀"
 
 #. Line 7
-#: src/dialogs.c:1448 src/dialogs.c:2172
+#: src/dialogs.c:1454 src/dialogs.c:2173
 msgid "Country"
 msgstr "厩亜"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1509
 msgid "New Passwords Do Not Match"
 msgstr "歯 章硲亜 析帖馬走 省柔艦陥"
 
-#: src/dialogs.c:1503 src/dialogs.c:1508
+#: src/dialogs.c:1509 src/dialogs.c:1514
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - 章硲 痕井 叔鳶"
 
-#: src/dialogs.c:1508
+#: src/dialogs.c:1514
 msgid "Fill out all fields completely"
 msgstr "乞窮 牌鯉聖 刃穿備 辰酔淑獣推"
 
-#: src/dialogs.c:1535 src/toc.c:561
+#: src/dialogs.c:1541 src/toc.c:561
 msgid "Gaim - Password Change"
 msgstr "Gaim - 章硲 痕井"
 
-#: src/dialogs.c:1566
+#: src/dialogs.c:1572
 msgid "Original Password"
 msgstr "据掘 章硲"
 
-#: src/dialogs.c:1580
+#: src/dialogs.c:1586
 msgid "New Password"
 msgstr "歯 章硲"
 
-#: src/dialogs.c:1594
+#: src/dialogs.c:1600
 msgid "New Password (again)"
 msgstr "歯 章硲 (廃腰希)"
 
-#: src/dialogs.c:1639
+#: src/dialogs.c:1645
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 紫遂切 舛左 竺舛"
 
-#: src/dialogs.c:1737
+#: src/dialogs.c:1743
 msgid "Below are the results of your search: "
 msgstr "伊事税 衣引澗 陥製引 旭柔艦陥: "
 
-#: src/dialogs.c:1876 src/dialogs.c:1883
+#: src/dialogs.c:1877 src/dialogs.c:1884
 msgid "Permit"
 msgstr "買遂"
 
-#: src/dialogs.c:1878 src/dialogs.c:1885
+#: src/dialogs.c:1879 src/dialogs.c:1886
 msgid "Deny"
 msgstr "暗採"
 
-#: src/dialogs.c:1926
+#: src/dialogs.c:1927
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - 買遂/暗採 鯉系拭 希馬奄"
 
-#: src/dialogs.c:1928
+#: src/dialogs.c:1929
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - 買遂/暗採 鯉系拭 希馬奄"
 
-#: src/dialogs.c:1999
+#: src/dialogs.c:2000
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - 企鉢 稽焔"
 
-#: src/dialogs.c:2209
+#: src/dialogs.c:2210
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 舛左稽 庁姥 達奄"
 
-#: src/dialogs.c:2239
+#: src/dialogs.c:2240
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - 五析稽 庁姥 達奄"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2253
 msgid "Email"
 msgstr "五析"
 
-#: src/dialogs.c:2351
+#: src/dialogs.c:2352
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2359
+#: src/dialogs.c:2360
 msgid "Description"
 msgstr "竺誤"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2386
 msgid "GAIM - Add URL"
 msgstr "GAIM - URL 希馬奄"
 
-#: src/dialogs.c:2526 src/dialogs.c:2539 src/dialogs.c:2576
+#: src/dialogs.c:2529 src/dialogs.c:2542 src/dialogs.c:2579
 msgid "Select Text Color"
 msgstr "越松 事薗 識澱"
 
-#: src/dialogs.c:2563
+#: src/dialogs.c:2566
 #, fuzzy
 msgid "Select Background Color"
 msgstr "越松 事薗 識澱"
 
-#: src/dialogs.c:2808
+#: src/dialogs.c:2812
 #, c-format
 msgid "Error writing file %s"
 msgstr "%s 督析拭 承 呪亜 蒸柔艦陥"
 
-#: src/dialogs.c:2809 src/dialogs.c:2931 src/dialogs.c:3674 src/oscar.c:1824
-#: src/oscar.c:2241 src/toc.c:1398 src/toc.c:1415 src/toc.c:1503
+#: src/dialogs.c:2813 src/dialogs.c:2935 src/dialogs.c:3580 src/oscar.c:1923
+#: src/oscar.c:2342 src/toc.c:1398 src/toc.c:1415 src/toc.c:1503
 #: src/toc.c:1680 src/toc.c:1710
 msgid "Error"
 msgstr "神嫌"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2866
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - 庁姥 鯉系 鎧左鎧奄"
 
-#: src/dialogs.c:2930
+#: src/dialogs.c:2934
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s 督析拭辞 石聖 呪 蒸柔艦陥"
 
-#: src/dialogs.c:3004
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 庁姥 鯉系 亜閃神奄"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3067
+#: src/dialogs.c:3071
 msgid "You cannot create an away message with a blank title"
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3074
+#: src/dialogs.c:3078
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:3141
+#: src/dialogs.c:3145
 msgid "Gaim - New away message"
 msgstr "Gaim - 節呪 五獣走 歯稽 幻級奄"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3155
 #, fuzzy
 msgid "New away message"
 msgstr "歯稽錘 節呪 五獣走"
 
-#: src/dialogs.c:3164
+#: src/dialogs.c:3168
 msgid "Away title: "
 msgstr "薦鯉: "
 
-#: src/dialogs.c:3204
+#: src/dialogs.c:3208
 #, fuzzy
 msgid "Use"
 msgstr "GAIM 聖 紫遂"
 
-#: src/dialogs.c:3208
+#: src/dialogs.c:3212
 msgid "Save & Use"
 msgstr ""
 
 #. show everything
-#: src/dialogs.c:3377
+#: src/dialogs.c:3381
 #, fuzzy
 msgid "Smile!"
 msgstr "督析"
 
-#: src/dialogs.c:3440 src/dialogs.c:3532
+#: src/dialogs.c:3434
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "庁姥 希馬奄"
 
-#: src/dialogs.c:3477 src/dialogs.c:3569
+#: src/dialogs.c:3471
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 庁姥 希馬奄"
 
-#: src/dialogs.c:3641
+#: src/dialogs.c:3545
 #, fuzzy
 msgid "Gaim - Save Log File"
 msgstr "Gaim - 歯 戚硯生稽 煽舌"
 
-#: src/dialogs.c:3672
+#: src/dialogs.c:3578
 #, fuzzy, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "%s 督析拭辞 石聖 呪亜 蒸柔艦陥."
 
-#: src/dialogs.c:3703
+#: src/dialogs.c:3609
 msgid "Really clear log?"
 msgstr ""
 
-#: src/dialogs.c:3721
+#: src/dialogs.c:3627
 #, fuzzy
 msgid "Okay"
 msgstr "溌昔"
 
-#: src/dialogs.c:3821
+#: src/dialogs.c:3723
 #, fuzzy
 msgid "Clear"
 msgstr "丸奄"
 
+#: src/dialogs.c:3818
+#, fuzzy
+msgid "Gaim - Rename Group"
+msgstr "Gaim - 庁姥 希馬奄"
+
+#: src/dialogs.c:3828
+msgid "Rename Group"
+msgstr ""
+
+#: src/dialogs.c:3835 src/dialogs.c:3923
+#, fuzzy
+msgid "New name:"
+msgstr "鉢檎戚硯: "
+
+#: src/dialogs.c:3906
+#, fuzzy
+msgid "Gaim - Rename Buddy"
+msgstr "Gaim - 庁姥 希馬奄"
+
+#: src/dialogs.c:3916
+#, fuzzy
+msgid "Rename Buddy"
+msgstr "Gaim - 庁姥 希馬奄"
+
 #: src/gaimrc.c:880
 #, c-format
 msgid "Could not open config file %s."
@@ -1228,7 +1262,7 @@
 msgid "Receieved: '%s'\n"
 msgstr "閤精鎧遂: '%s'\n"
 
-#: src/multi.c:357 src/prefs.c:114
+#: src/multi.c:357 src/prefs.c:188
 #, fuzzy
 msgid "General Options"
 msgstr "辛芝"
@@ -1256,10 +1290,6 @@
 msgid "Auto-Login"
 msgstr "切疑 稽益昔"
 
-#: src/multi.c:389
-msgid "Send KeepAlive packet (6 bytes/second)"
-msgstr ""
-
 #: src/multi.c:454
 #, fuzzy
 msgid "Gaim - Modify Account"
@@ -1296,78 +1326,78 @@
 "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
+#: src/oscar.c:295 src/oscar.c:312 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "快嬢像."
 
-#: src/oscar.c:302
+#: src/oscar.c:303
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "羨紗 神嫌!\n"
 
-#: src/oscar.c:310
+#: src/oscar.c:311
 #, fuzzy
 msgid "major connection error\n"
 msgstr "羨紗 神嫌!\n"
 
-#: src/oscar.c:323 src/toc.c:545
+#: src/oscar.c:324 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:324
+#: src/oscar.c:325
 #, fuzzy
 msgid "Chat Error!"
 msgstr "神嫌"
 
-#: src/oscar.c:334
+#: src/oscar.c:335
 #, fuzzy
 msgid "Chat is currently unavailable"
 msgstr "%s 拭 辰特 凧亜研 拝 呪 蒸柔艦陥."
 
-#: src/oscar.c:335
+#: src/oscar.c:336
 #, fuzzy
 msgid "Gaim - Chat"
 msgstr "Gaim 辰特"
 
-#: src/oscar.c:382
+#: src/oscar.c:383
 #, c-format
 msgid "Logging in %s\n"
 msgstr "%s 拭 羨紗\n"
 
-#: src/oscar.c:420
+#: src/oscar.c:421
 msgid "internal connection error\n"
 msgstr "鎧採 羨紗 神嫌\n"
 
-#: src/oscar.c:421
+#: src/oscar.c:422
 msgid "Unable to login to AIM"
 msgstr "AIM 拭 稽益昔拝 呪 蒸柔艦陥"
 
-#: src/oscar.c:426
+#: src/oscar.c:427
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "硲什闘研 達聖 呪 蒸柔艦陥\n"
 
-#: src/oscar.c:430
+#: src/oscar.c:431
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "硲什闘拭 尻衣拝 呪 蒸柔艦陥\n"
 
-#: src/oscar.c:437
+#: src/oscar.c:438
 #, c-format
 msgid "Signon: %s"
 msgstr "羨紗: %s"
 
-#: src/oscar.c:447
+#: src/oscar.c:448
 msgid "Password sent, waiting for response\n"
 msgstr "章硲研 左鎧壱 誓岩聖 奄陥験艦陥\n"
 
-#: src/oscar.c:475
+#: src/oscar.c:476
 msgid "Signed off.\n"
 msgstr "羨紗 快奄.\n"
 
 #. connecting too frequently
-#: src/oscar.c:519
+#: src/oscar.c:520
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1377,62 +1407,62 @@
 "獣亀馬淑獣推. 域紗 獣亀廃陥檎 奄陥形醤 馬澗 獣娃戚 希 掩嬢増艦陥."
 
 #. client too old
-#: src/oscar.c:529
+#: src/oscar.c:530
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 
-#: src/oscar.c:533 src/toc.c:341
+#: src/oscar.c:534 src/toc.c:341
 msgid "Authentication Failed"
 msgstr "昔装 叔鳶"
 
-#: src/oscar.c:563
+#: src/oscar.c:564
 msgid "Internal Error"
 msgstr "鎧採 神嫌"
 
-#: src/oscar.c:567
+#: src/oscar.c:568
 msgid "Could Not Connect"
 msgstr "尻衣拝 呪 蒸柔艦陥"
 
-#: src/oscar.c:601
+#: src/oscar.c:603
 msgid "Connection established, cookie sent"
 msgstr "尻衣馬壱 庭徹研 左蛎柔艦陥"
 
-#: src/oscar.c:858 src/oscar.c:2125
+#: src/oscar.c:959 src/oscar.c:2226
 #, fuzzy, c-format
-msgid "<B>Direct IM with %s established</B>"
+msgid "Direct IM with %s established"
 msgstr "<HR><B>%s 亜 稽益昔 馬心柔艦陥 %s%s.</B><BR><HR>"
 
 #. message too large
-#: src/oscar.c:1308
+#: src/oscar.c:1409
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "%s 拭惟辞 紳 五獣走亜 格巷 朕辞 兜弾柔艦陥."
 
-#: src/oscar.c:1313
+#: src/oscar.c:1414
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1348
+#: src/oscar.c:1449
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1349 src/oscar.c:1368
+#: src/oscar.c:1450 src/oscar.c:1469
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1367
+#: src/oscar.c:1468
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1403
+#: src/oscar.c:1504
 #, c-format
 msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1410
+#: src/oscar.c:1511
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1446,25 +1476,25 @@
 "SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1448
+#: src/oscar.c:1549
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1449
+#: src/oscar.c:1550
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:2182
+#: src/oscar.c:2283
 #, fuzzy, c-format
-msgid "<B>Direct IM with %s closed</B>"
+msgid "Direct IM with %s closed"
 msgstr "<HR><B>%s 亜 稽益昔 馬心柔艦陥 %s%s.</B><BR><HR>"
 
-#: src/oscar.c:2241
+#: src/oscar.c:2342
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "AIM 拭 稽益昔拝 呪 蒸柔艦陥"
 
-#: src/oscar.c:2251
+#: src/oscar.c:2352
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1472,17 +1502,17 @@
 "continue?"
 msgstr ""
 
-#: src/oscar.c:2268
+#: src/oscar.c:2369
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "節呪 五獣走"
 
-#: src/oscar.c:2276
+#: src/oscar.c:2377
 #, fuzzy
 msgid "Direct IM"
 msgstr "巨刑塘軒 舛左"
 
-#: src/oscar.c:2468
+#: src/oscar.c:2569
 msgid ""
 "Unfortunately, currently Oscar only allows new user registration by going to "
 "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
@@ -1490,558 +1520,618 @@
 msgstr ""
 
 #. Below is basically stolen from plugins.c
-#: src/perl.c:638
+#: src/perl.c:647
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - 紫遂切 舛左 竺舛"
 
-#: src/perl.c:686
+#: src/perl.c:695
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:105
+#: src/plugins.c:107
 msgid "Gaim - Plugin List"
 msgstr "Gaim - 巴君益昔 鯉系"
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:216
+#: src/plugins.c:188 src/plugins.c:194 src/plugins.c:218
 msgid "Plugin Error"
 msgstr "巴君益昔 神嫌"
 
-#: src/plugins.c:272
+#: src/plugins.c:274
 msgid "Gaim - Plugins"
 msgstr "Gaim - 巴君益昔"
 
 #. Build the bottom button bar
-#: src/plugins.c:301
+#: src/plugins.c:303
 msgid "Load Plugin"
 msgstr "巴君益昔 臣軒奄"
 
-#: src/plugins.c:307
+#: src/plugins.c:309
 msgid "Configure Plugin"
 msgstr "巴君益昔 竺舛"
 
-#: src/plugins.c:313
+#: src/plugins.c:315
 msgid "Unload Plugin"
 msgstr "巴君益昔 鎧軒奄"
 
-#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
-#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
-#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1762
+#: src/prefs.c:196 src/prefs.c:338 src/prefs.c:437 src/prefs.c:638
+#: src/prefs.c:1143 src/prefs.c:1378 src/prefs.c:1589 src/prefs.c:1967
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:126
-msgid "Use borderless buttons (requires restart for some buttons)"
+#: src/prefs.c:208
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/prefs.c:216
+msgid "Use borderless buttons"
 msgstr ""
 
-#: src/prefs.c:128
-msgid "Show Buddy Ticker after restart"
-msgstr ""
-
-#: src/prefs.c:132
+#: src/prefs.c:221
+#, fuzzy
+msgid "Show Buddy Ticker"
+msgstr "庁姥 曽嫌 益顕 左食爽奄"
+
+#: src/prefs.c:227
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:144
+#: src/prefs.c:231
 #, fuzzy
-msgid "Report Idle Times:"
+msgid "Report Idle Times"
 msgstr "且壱 赤澗 獣娃 左食爽奄"
 
-#: src/prefs.c:147
+#: src/prefs.c:239
 msgid "None"
 msgstr ""
 
-#: src/prefs.c:148
+#: src/prefs.c:240
 msgid "GAIM Use"
 msgstr "GAIM 聖 紫遂"
 
-#: src/prefs.c:150
+#: src/prefs.c:242
 #, fuzzy
 msgid "X Use"
 msgstr "GAIM 聖 紫遂"
 
-#: src/prefs.c:224
-#, fuzzy
-msgid "Browser Options"
-msgstr "辛芝"
-
-#: src/prefs.c:236
-msgid "Netscape"
-msgstr "掛什追戚覗"
-
-#: src/prefs.c:237
-msgid "KFM"
-msgstr ""
-
-#: src/prefs.c:239
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:241
-msgid "Manual"
-msgstr "呪疑"
-
-#: src/prefs.c:252
-msgid "Pop up new window by default"
-msgstr "奄沙生稽 歯 但 伸奄"
-
-#: src/prefs.c:279
-#, fuzzy
-msgid "Logging Options"
-msgstr "%s 拭 羨紗\n"
-
-#: src/prefs.c:291
+#: src/prefs.c:253
 #, fuzzy
 msgid "Log all conversations"
 msgstr "乞窮 企鉢研 稽焔"
 
-#: src/prefs.c:292
+#: src/prefs.c:254
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "稽益 督析拭 HTML 精 皐壱 眼奄"
 
-#: src/prefs.c:298
+#: src/prefs.c:260
 msgid "Log when buddies sign on/sign off"
 msgstr ""
 
-#: src/prefs.c:299
+#: src/prefs.c:261
 msgid "Log when buddies become idle/un-idle"
 msgstr ""
 
-#: src/prefs.c:300
+#: src/prefs.c:262
 msgid "Log when buddies go away/come back"
 msgstr ""
 
-#: src/prefs.c:301
-msgid "Log your own signons/idleness/awayness (as set by options above)"
+#: src/prefs.c:263
+msgid "Log your own signons/idleness/awayness"
 msgstr ""
 
-#: src/prefs.c:302
+#: src/prefs.c:264
 msgid "Individual log file for each buddy's signons"
 msgstr ""
 
-#: src/prefs.c:317
+#: src/prefs.c:266
+msgid "Browser"
+msgstr "崎虞酔煽"
+
+#: src/prefs.c:278
+msgid "KFM"
+msgstr ""
+
+#: src/prefs.c:279
+msgid "Netscape"
+msgstr "掛什追戚覗"
+
+#: src/prefs.c:282
+msgid "Pop up new window by default"
+msgstr "奄沙生稽 歯 但 伸奄"
+
+#: src/prefs.c:289
+msgid "GNOME URL Handler"
+msgstr ""
+
+#: src/prefs.c:291
+msgid "Manual"
+msgstr "呪疑"
+
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "庁姥 鯉系"
 
-#: src/prefs.c:329
-#, fuzzy
-msgid "Save Window Size/Position"
-msgstr "析採 但税 滴奄/是帖 煽舌"
-
-#: src/prefs.c:331
-#, fuzzy
-msgid "Automatically show buddy list on sign on"
-msgstr "庁姥 鯉系聖 切疑生稽 左食捜"
-
-#: src/prefs.c:333
+#: src/prefs.c:342
 #, fuzzy
-msgid "Display Buddy List near applet"
-msgstr "庁姥 鯉系精 蕉巴鹸 採悦拭 妊獣"
-
-#: src/prefs.c:340
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:341
-msgid "Show numbers in groups"
-msgstr "益血拭 昔据 妊獣"
-
-#: src/prefs.c:347
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "庁姥 曽嫌 益顕 左食爽奄"
-
-#: src/prefs.c:348
-msgid "Show warning levels"
-msgstr ""
-
-#: src/prefs.c:349
-msgid "Show idle times"
-msgstr "且壱 赤澗 獣娃 左食爽奄"
-
-#: src/prefs.c:355
+msgid "Buddy List Window"
+msgstr "庁姥 鯉系"
+
+#: src/prefs.c:354
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
 #: src/prefs.c:356
+#, fuzzy
+msgid "Automatically show buddy list on sign on"
+msgstr "庁姥 鯉系聖 切疑生稽 左食捜"
+
+#: src/prefs.c:359
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "析採 但税 滴奄/是帖 煽舌"
+
+#: src/prefs.c:365
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:371
-msgid "Conversation Window Options"
+#: src/prefs.c:370
+#, fuzzy
+msgid "Display Buddy List near applet"
+msgstr "庁姥 鯉系精 蕉巴鹸 採悦拭 妊獣"
+
+#: src/prefs.c:373
+msgid "Group Displays"
+msgstr ""
+
+#: src/prefs.c:385
+msgid "Hide groups with no online buddies"
 msgstr ""
 
-#: src/prefs.c:383
+#: src/prefs.c:391
+msgid "Show numbers in groups"
+msgstr "益血拭 昔据 妊獣"
+
+#: src/prefs.c:393
+#, fuzzy
+msgid "Buddy Displays"
+msgstr "庁姥 鯉系"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Show buddy type icons"
+msgstr "庁姥 曽嫌 益顕 左食爽奄"
+
+#: src/prefs.c:406
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:412
+msgid "Show idle times"
+msgstr "且壱 赤澗 獣娃 左食爽奄"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Conversation Options"
+msgstr "乞窮 企鉢研 稽焔"
+
+#: src/prefs.c:441
+#, fuzzy
+msgid "Keyboard Options"
+msgstr "辛芝"
+
+#: src/prefs.c:453
 msgid "Enter sends message"
 msgstr "殖斗徹研 刊牽檎 五獣走 左鎧奄"
 
-#: src/prefs.c:384
+#: src/prefs.c:454
 #, fuzzy
 msgid "Control-Enter sends message"
 msgstr "殖斗徹研 刊牽檎 五獣走 左鎧奄"
 
-#: src/prefs.c:385
+#: src/prefs.c:455
 msgid "Escape closes window"
 msgstr ""
 
-#: src/prefs.c:386
+#: src/prefs.c:461
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:387
+#: src/prefs.c:462
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:388
+#: src/prefs.c:463
 msgid "F2 toggles timestamp display"
 msgstr ""
 
-#: src/prefs.c:394
+#: src/prefs.c:465
+#, fuzzy
+msgid "Display and General Options"
+msgstr "辛芝"
+
+#: src/prefs.c:477
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "越松益顕聖 益顕生稽 左食爽奄 (叔蝿呪層)"
 
-#: src/prefs.c:395
+#: src/prefs.c:478
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "五獣走拭 獣娃 妊獣"
 
-#: src/prefs.c:396
-#, fuzzy
-msgid "Ignore colors"
-msgstr "左鎧神澗 事薗精 巷獣"
-
-#: src/prefs.c:397
+#: src/prefs.c:479
 #, fuzzy
-msgid "Ignore font faces"
-msgstr "越松 滴奄 徹酔奄"
-
-#: src/prefs.c:398
-#, fuzzy
-msgid "Ignore font sizes"
-msgstr "越松 滴奄 徹酔奄"
-
-#: src/prefs.c:404
+msgid "Show URLs as links"
+msgstr "URL 聖 元滴稽 左鎧奄"
+
+#: src/prefs.c:480
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "堂鍵 旦切 切疑生稽 妊獣"
 
-#: src/prefs.c:405
-#, fuzzy
-msgid "Show URLs as links"
-msgstr "URL 聖 元滴稽 左鎧奄"
-
-#: src/prefs.c:406
+#: src/prefs.c:481 src/prefs.c:1611
 msgid "Sending messages removes away status"
 msgstr "五獣走研 左鎧檎 節呪拭辞 蟹神奄"
 
-#: src/prefs.c:447 src/prefs.c:540
-msgid "Pictures and Text"
-msgstr ""
-
-#: src/prefs.c:453 src/prefs.c:546
-msgid "Pictures Only"
-msgstr ""
-
-#: src/prefs.c:459 src/prefs.c:552
+#: src/prefs.c:482 src/prefs.c:1618
+#, fuzzy
+msgid "Queue new messages when away"
+msgstr "節呪掻拭澗 歯稽錘 企鉢 巷獣"
+
+#: src/prefs.c:488
+#, fuzzy
+msgid "Ignore colors"
+msgstr "左鎧神澗 事薗精 巷獣"
+
+#: src/prefs.c:489
 #, fuzzy
-msgid "Text Only"
-msgstr "越松 事薗"
-
-#: src/prefs.c:483
+msgid "Ignore font faces"
+msgstr "越松 滴奄 徹酔奄"
+
+#: src/prefs.c:490
+#, fuzzy
+msgid "Ignore font sizes"
+msgstr "越松 滴奄 徹酔奄"
+
+#: src/prefs.c:491
+#, fuzzy
+msgid "Ignore TiK Automated Messages"
+msgstr "五獣走 幻級奄"
+
+#: src/prefs.c:492 src/prefs.c:1609
+msgid "Ignore new conversations when away"
+msgstr "節呪掻拭澗 歯稽錘 企鉢 巷獣"
+
+#: src/prefs.c:630
 #, fuzzy
 msgid "IM Options"
 msgstr "辛芝"
 
-#: src/prefs.c:495
-#, fuzzy
-msgid "Show all conversations in one tabbed window"
-msgstr "企鉢但拭辞 稽益紳/神覗 左食爽奄"
-
-#: src/prefs.c:496
-#, fuzzy
-msgid "Show logins in window"
-msgstr "企鉢但拭辞 稽益紳/神覗 左食爽奄"
-
-#: src/prefs.c:502 src/prefs.c:593
+#: src/prefs.c:642
+msgid "IM Window"
+msgstr ""
+
+#: src/prefs.c:654 src/prefs.c:687
 #, fuzzy
 msgid "Show buttons as "
 msgstr "獄動 益顕 左食爽奄"
 
-#: src/prefs.c:511 src/prefs.c:603
-msgid "Show larger entry box on new windows"
+#: src/prefs.c:658 src/prefs.c:691
+msgid "Pictures And Text"
+msgstr ""
+
+#: src/prefs.c:659 src/prefs.c:692
+msgid "Pictures"
 msgstr ""
 
-#: src/prefs.c:513 src/prefs.c:605
+#: src/prefs.c:660 src/prefs.c:693
+#, fuzzy
+msgid "Text"
+msgstr "噂精 越松"
+
+#: src/prefs.c:670
+#, fuzzy
+msgid "Show all conversations in one tabbed window"
+msgstr "企鉢但拭辞 稽益紳/神覗 左食爽奄"
+
+#: src/prefs.c:671 src/prefs.c:704
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "五獣走亜 神檎 但聖 蒋生稽"
 
-#: src/prefs.c:514 src/prefs.c:1509
-msgid "Ignore new conversations when away"
-msgstr "節呪掻拭澗 歯稽錘 企鉢 巷獣"
-
-#: src/prefs.c:516
+#: src/prefs.c:672
 #, fuzzy
-msgid "Ignore TiK Automated Messages"
-msgstr "五獣走 幻級奄"
-
-#: src/prefs.c:574
-#, fuzzy
-msgid "Chat Options"
-msgstr "辛芝"
-
-#: src/prefs.c:586
+msgid "Show logins in window"
+msgstr "企鉢但拭辞 稽益紳/神覗 左食爽奄"
+
+#: src/prefs.c:673 src/prefs.c:706
+msgid "Show larger entry box on new windows"
+msgstr ""
+
+#: src/prefs.c:675
+msgid "Group Chat Window"
+msgstr ""
+
+#: src/prefs.c:703
 #, fuzzy
 msgid "Show all chats in one tabbed window"
 msgstr "企鉢但拭辞 稽益紳/神覗 左食爽奄"
 
-#: src/prefs.c:587
+#: src/prefs.c:705
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
+#: src/prefs.c:708
+#, fuzzy
+msgid "Tabbed Window Options"
+msgstr "析採 但税 滴奄/是帖 煽舌"
+
+#: src/prefs.c:720
+msgid "IM Tab Placement:"
+msgstr ""
+
+#: src/prefs.c:732 src/prefs.c:766
+msgid "Top"
+msgstr ""
+
+#: src/prefs.c:734 src/prefs.c:768
+msgid "Bottom"
+msgstr ""
+
+#: src/prefs.c:741 src/prefs.c:775
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:743 src/prefs.c:777
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:754
+msgid "Chat Tab Placement:"
+msgstr ""
+
+#: src/prefs.c:809 src/prefs.c:811 src/prefs.c:1014 src/prefs.c:1016
 msgid "Gaim Chat"
 msgstr "Gaim 辰特"
 
-#: src/prefs.c:779 src/prefs.c:2241
+#: src/prefs.c:952 src/prefs.c:2458
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:797
+#: src/prefs.c:970
 msgid "Refresh"
 msgstr "飴重"
 
-#: src/prefs.c:822
+#: src/prefs.c:995
 msgid "List of available chats"
 msgstr "亜管廃 辰特税 鯉系"
 
-#: src/prefs.c:832
+#: src/prefs.c:1005
 msgid "List of subscribed chats"
 msgstr "亜脊廃 辰特税 鯉系"
 
-#: src/prefs.c:962 src/prefs.c:2246
+#.
+#. text[0] = _("Chat Window");
+#. node = gtk_ctree_insert_node(GTK_CTREE(preftree), parent, NULL,
+#. text, 5, NULL, NULL, NULL, NULL, 0, 1);
+#. gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node, chat_page);
+#.
+#: src/prefs.c:1135 src/prefs.c:2453
 #, fuzzy
 msgid "Font Options"
 msgstr "辛芝"
 
-#: src/prefs.c:976
+#: src/prefs.c:1149
 msgid "Underlined Text"
 msgstr "購匝庁 越松"
 
-#: src/prefs.c:977
+#: src/prefs.c:1150
 msgid "Strike Text"
 msgstr "亜錘汽 匝庁 越松"
 
-#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
+#: src/prefs.c:1163 src/prefs.c:1181 src/prefs.c:1202
 #, fuzzy
 msgid "Select"
 msgstr "越加 識澱"
 
-#: src/prefs.c:1027
+#: src/prefs.c:1200
 msgid "Font Face for Text"
 msgstr "越松拭 紫遂拝 越加"
 
-#: src/prefs.c:1042
+#: src/prefs.c:1215
 #, fuzzy
 msgid "Font Size for Text"
 msgstr "越松拭 紫遂拝 越加"
 
-#: src/prefs.c:1067
+#: src/prefs.c:1291
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - 企鉢 稽焔"
+
+#: src/prefs.c:1326
+#, fuzzy
+msgid "Reset"
+msgstr "去系"
+
+#: src/prefs.c:1331
+#, fuzzy
+msgid "Choose..."
+msgstr "丸奄"
+
+#: src/prefs.c:1370
 #, fuzzy
 msgid "Sound Options"
 msgstr "辛芝"
 
-#: src/prefs.c:1079
+#: src/prefs.c:1398
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "庁姥亜 級嬢神檎 社軒 鎧奄"
 
-#: src/prefs.c:1080 src/prefs.c:1511
+#: src/prefs.c:1399 src/prefs.c:1610
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1081
+#: src/prefs.c:1405
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1146
-#, fuzzy
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - 企鉢 稽焔"
-
-#: src/prefs.c:1181
-#, fuzzy
-msgid "Reset"
-msgstr "去系"
-
-#: src/prefs.c:1186
-#, fuzzy
-msgid "Choose..."
-msgstr "丸奄"
-
-#: src/prefs.c:1222
-#, fuzzy
-msgid "Sound Events"
-msgstr "社軒"
-
-#: src/prefs.c:1234
+#: src/prefs.c:1415
+#, c-format
+msgid ""
+"Command to play sound files\n"
+"(%s for filename; internal if empty)"
+msgstr ""
+
+#: src/prefs.c:1426
+msgid "Events"
+msgstr ""
+
+#: src/prefs.c:1434
 msgid "Sound when buddy logs in"
 msgstr "庁姥亜 級嬢神檎 社軒 鎧奄"
 
-#: src/prefs.c:1235
+#: src/prefs.c:1435
 msgid "Sound when buddy logs out"
 msgstr "庁姥亜 蟹亜檎 社軒 鎧奄"
 
-#: src/prefs.c:1241
+#: src/prefs.c:1441
+#, fuzzy
+msgid "Sound when received message begins conversation"
+msgstr "五獣走研 左馨 凶 社軒 鎧奄"
+
+#: src/prefs.c:1442
 msgid "Sound when message is received"
 msgstr "五獣走亜 神檎 社軒 鎧奄"
 
-#: src/prefs.c:1242
-#, fuzzy
-msgid "Sound when message is first received"
-msgstr "五獣走亜 神檎 社軒 鎧奄"
-
-#: src/prefs.c:1243
+#: src/prefs.c:1443
 msgid "Sound when message is sent"
 msgstr "五獣走研 左馨 凶 社軒 鎧奄"
 
-#: src/prefs.c:1249
+#: src/prefs.c:1449
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "辰特号拭 紫寓級戚 球蟹級 凶 社軒 鎧奄"
 
-#: src/prefs.c:1250
+#: src/prefs.c:1450
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "辰特号拭 紫寓級戚 球蟹級 凶 社軒 鎧奄"
 
-#: src/prefs.c:1251
+#: src/prefs.c:1451
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "紫寓級戚 辰特号拭辞 剰奄拝 凶 社軒 鎧奄"
 
-#: src/prefs.c:1252
+#: src/prefs.c:1452
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "紫寓級戚 辰特号拭辞 剰奄拝 凶 社軒 鎧奄"
 
-#: src/prefs.c:1262
-#, c-format
-msgid "Command to play sound files (%s for filename; internal if empty)"
-msgstr ""
-
-#: src/prefs.c:1408 src/prefs.c:2273
+#: src/prefs.c:1581 src/prefs.c:2480
 #, fuzzy
 msgid "Away Messages"
 msgstr "歯稽錘 節呪 五獣走"
 
-#: src/prefs.c:1420
+#: src/prefs.c:1617
+msgid "Don't send auto-response"
+msgstr ""
+
+#: src/prefs.c:1628
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1641
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1654
+#, fuzzy
+msgid "Messages"
+msgstr "五獣走 幻級奄"
+
+#: src/prefs.c:1666
 #, fuzzy
 msgid "Title"
 msgstr "督析"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1670
 #, fuzzy
 msgid "Message"
 msgstr "五獣走 幻級奄"
 
-#: src/prefs.c:1464
+#: src/prefs.c:1709
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1468
+#: src/prefs.c:1713
 #, fuzzy
 msgid "Make Away"
 msgstr "走榎 郊稽 節呪"
 
-#: src/prefs.c:1512
-msgid "Don't send auto-response"
-msgstr ""
-
-#: src/prefs.c:1522
-msgid "Auto Away after"
-msgstr ""
-
-#: src/prefs.c:1535
-msgid "minutes using"
-msgstr ""
-
-#: src/prefs.c:1754
+#: src/prefs.c:1959
 #, fuzzy
 msgid "Privacy Options"
 msgstr "辛芝"
 
-#: src/prefs.c:1770
+#: src/prefs.c:1975
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1789
+#: src/prefs.c:1994
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1790
+#: src/prefs.c:1995
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1792
+#: src/prefs.c:1997
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1823
+#: src/prefs.c:2028
 #, fuzzy
 msgid "Deny all users"
 msgstr "護誤幻 暗採"
 
-#: src/prefs.c:1824
+#: src/prefs.c:2029
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1826
+#: src/prefs.c:2031
 #, fuzzy
 msgid "Block List"
 msgstr "託舘"
 
-#: src/prefs.c:1921
+#: src/prefs.c:2126
 msgid "Gaim - Preferences"
 msgstr "Gaim - 竺舛"
 
-#: src/prefs.c:2001
+#: src/prefs.c:2206
 msgid "GAIM debug output window"
 msgstr "GAIM 巨獄焔 窒径但"
 
-#: src/prefs.c:2192
+#: src/prefs.c:2400
 msgid "General"
 msgstr "析鋼"
 
-#: src/prefs.c:2197
-msgid "Browser"
-msgstr "崎虞酔煽"
-
-#: src/prefs.c:2226
+#: src/prefs.c:2436
 #, fuzzy
 msgid "Conversations"
 msgstr "乞窮 企鉢研 稽焔"
 
-#: src/prefs.c:2231
-msgid "IM Window"
+#: src/prefs.c:2441
+msgid "Windows"
 msgstr ""
 
-#: src/prefs.c:2236
-msgid "Chat Window"
-msgstr ""
-
-#: src/prefs.c:2257
+#: src/prefs.c:2469
 msgid "Sounds"
 msgstr "社軒"
 
-#: src/prefs.c:2262
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2284
+#: src/prefs.c:2491
 msgid "Privacy"
 msgstr ""
 
@@ -2095,11 +2185,32 @@
 msgid "Register new user for"
 msgstr ""
 
-#: src/server.c:608
+#: src/server.c:56
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
+msgstr ""
+
+#: src/server.c:58
+#, fuzzy
+msgid "Login Error"
+msgstr "巴君益昔 神嫌"
+
+#: src/server.c:463
+#, fuzzy, c-format
+msgid "(%d messages)"
+msgstr "五獣走研 左馨 凶 社軒 鎧奄"
+
+#: src/server.c:469
+#, fuzzy
+msgid "(1 message)"
+msgstr "五獣走澗:"
+
+#: src/server.c:763
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:609
+#: src/server.c:764
 msgid "No"
 msgstr ""
 
@@ -2176,6 +2287,30 @@
 msgid "%s requests you to send them a file"
 msgstr "%s 亜 雁重拭惟 督析聖 左鎧含虞壱 推短馬心柔艦陥"
 
+#, fuzzy
+#~ msgid "Browser Options"
+#~ msgstr "辛芝"
+
+#, fuzzy
+#~ msgid "Logging Options"
+#~ msgstr "%s 拭 羨紗\n"
+
+#, fuzzy
+#~ msgid "Text Only"
+#~ msgstr "越松 事薗"
+
+#, fuzzy
+#~ msgid "Chat Options"
+#~ msgstr "辛芝"
+
+#, fuzzy
+#~ msgid "Sound Events"
+#~ msgstr "社軒"
+
+#, fuzzy
+#~ msgid "Sound when message is first received"
+#~ msgstr "五獣走亜 神檎 社軒 鎧奄"
+
 #~ msgid "Offline"
 #~ msgstr "快沿"
 
--- a/po/zh_CN.po	Mon Apr 30 17:57:16 2001 +0000
+++ b/po/zh_CN.po	Mon Apr 30 18:52:47 2001 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2001-04-13 17:07-0700\n"
+"POT-Creation-Date: 2001-04-30 10:14-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"
@@ -14,37 +14,49 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/icq/gaim_icq.c:401 src/oscar.c:2261 src/toc.c:918
+#: plugins/msn/msn.c:1222
+msgid "Gaim-MSN: New Mail"
+msgstr ""
+
+#. Build OK Button
+#: plugins/msn/msn.c:1236 src/dialogs.c:611 src/dialogs.c:701
+#: src/dialogs.c:761 src/dialogs.c:1281 src/dialogs.c:1619 src/dialogs.c:1732
+#: src/dialogs.c:2084 src/dialogs.c:2270 src/dialogs.c:2338 src/dialogs.c:3854
+#: src/dialogs.c:3942 src/multi.c:479
+msgid "OK"
+msgstr "鳩範"
+
+#: plugins/icq/gaim_icq.c:401 src/oscar.c:2362 src/toc.c:918
 #, fuzzy
 msgid "Get Info"
 msgstr "喘薩�聾彿創"
 
-#: plugins/yay/yay.c:172
+#: plugins/yay/yay.c:174
 #, fuzzy
 msgid "Your message did not get sent."
 msgstr "窟竃佚連蕗"
 
-#: plugins/yay/yay.c:172 src/dialogs.c:3067 src/dialogs.c:3074
-#: src/oscar.c:1309 src/oscar.c:1314 src/oscar.c:1350 src/oscar.c:1369
-#: src/oscar.c:1405
+#: plugins/yay/yay.c:174 src/dialogs.c:3071 src/dialogs.c:3078
+#: src/oscar.c:1410 src/oscar.c:1415 src/oscar.c:1451 src/oscar.c:1470
+#: src/oscar.c:1506
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - 危列 %d"
 
-#: plugins/yay/yay.c:190
+#: plugins/yay/yay.c:192
 #, c-format
 msgid "%s has made %s their buddy%s%s"
 msgstr ""
 
-#: plugins/yay/yay.c:192
+#: plugins/yay/yay.c:194
 #, fuzzy
 msgid "Gaim - Buddy"
 msgstr "Gaim - 奐紗涛嗔"
 
-#: plugins/yay/yay.c:236 src/about.c:179 src/aim.c:301 src/buddy.c:2387
-#: src/buddy_chat.c:910 src/buddy_chat.c:1046 src/buddy_chat.c:1073
-#: src/conversation.c:2077 src/dialogs.c:434 src/dialogs.c:3817
-#: src/multi.c:686 src/plugins.c:319 src/prefs.c:1971 src/prpl.c:355
+#: plugins/yay/yay.c:238 src/about.c:179 src/aim.c:303 src/buddy.c:2584
+#: src/buddy_chat.c:919 src/buddy_chat.c:1055 src/buddy_chat.c:1082
+#: src/conversation.c:2110 src/dialogs.c:440 src/dialogs.c:3719
+#: src/multi.c:686 src/plugins.c:321 src/prefs.c:2176 src/prpl.c:355
 msgid "Close"
 msgstr "購液"
 
@@ -68,61 +80,61 @@
 msgid "Web Site"
 msgstr ""
 
-#: src/aim.c:135 src/buddy.c:2380
+#: src/aim.c:137 src/buddy.c:2577
 msgid "Signoff"
 msgstr "宣蝕"
 
-#: src/aim.c:147
+#: src/aim.c:149
 msgid "Please enter your logon"
 msgstr "萩補秘艇議鞠村兆各"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:850
+#: src/aim.c:149 src/aim.c:154 src/multi.c:850
 #, fuzzy
 msgid "Signon Error"
 msgstr "鞠村"
 
-#: src/aim.c:152
+#: src/aim.c:154
 #, fuzzy
 msgid "Please enter your password"
 msgstr "萩補秘艇議鞠村兆各"
 
-#: src/aim.c:246
+#: src/aim.c:248
 msgid "Gaim - Login"
 msgstr "Gaim - 鞠秘"
 
-#: src/aim.c:264
+#: src/aim.c:266
 msgid "Screen Name: "
 msgstr "�幣議侖兆�"
 
-#: src/aim.c:278
+#: src/aim.c:280
 msgid "Password: "
 msgstr "畜鷹�"
 
-#: src/aim.c:299 src/buddy.c:2384
+#: src/aim.c:301 src/buddy.c:2581
 msgid "Quit"
 msgstr "曜竃"
 
-#: src/aim.c:304 src/aim.c:641 src/buddy.c:2443
+#: src/aim.c:306 src/aim.c:642 src/buddy.c:2640
 msgid "Accounts"
 msgstr ""
 
-#: src/aim.c:306 src/multi.c:590
+#: src/aim.c:308 src/multi.c:590
 msgid "Signon"
 msgstr "鞠村"
 
-#: src/aim.c:338 src/prpl.c:359
+#: src/aim.c:340 src/prpl.c:359
 msgid "Register"
 msgstr "廣過"
 
-#: src/aim.c:339
+#: src/aim.c:341 src/prefs.c:1382 src/prefs.c:1593
 msgid "Options"
 msgstr "僉�"
 
-#: src/aim.c:341 src/aim.c:644 src/buddy.c:2460
+#: src/aim.c:343 src/aim.c:645 src/buddy.c:2657
 msgid "Plugins"
 msgstr "峨周"
 
-#: src/aim.c:638 src/buddy.c:2452
+#: src/aim.c:639 src/buddy.c:2649
 msgid "Preferences"
 msgstr "單枠僉�"
 
@@ -139,11 +151,11 @@
 msgid "Offilne. Click to bring up login box."
 msgstr "宣�。泣似宸戦尼強鞠村完"
 
-#: src/applet.c:169 src/buddy.c:2398
+#: src/applet.c:169 src/buddy.c:2595
 msgid "Away"
 msgstr "壙扮宣蝕"
 
-#: src/applet.c:172 src/away.c:266
+#: src/applet.c:172 src/away.c:342
 msgid "New Away Message"
 msgstr "仟議壙扮宣蝕佚連"
 
@@ -155,130 +167,135 @@
 msgid "About..."
 msgstr "購噐´´"
 
-#: src/away.c:96
+#: src/away.c:157
 msgid "I'm Back!"
 msgstr "厘鮭査眉嗽指栖阻�"
 
-#: src/away.c:133
+#: src/away.c:210
 msgid "Gaim - Away!"
 msgstr "Gaim - 壙扮宣蝕"
 
-#: src/away.c:147 src/away.c:228 src/away.c:393
+#: src/away.c:224 src/away.c:304 src/away.c:469
 msgid "Back"
 msgstr "卦指"
 
-#: src/away.c:286
+#: src/away.c:362
 msgid "Remove Away Message"
 msgstr "評茅宣蝕佚連"
 
-#: src/away.c:462
+#: src/away.c:538
 msgid "Set All Away"
 msgstr ""
 
 #. Put the buttons in the box
-#: src/buddy.c:266 src/buddy.c:2528 src/buddy_chat.c:1078
-#: src/conversation.c:1772 src/conversation.c:2092 src/dialogs.c:872
-#: src/dialogs.c:996 src/dialogs.c:1897 src/multi.c:670 src/prefs.c:798
-#: src/prefs.c:1460 src/prefs.c:1811 src/prefs.c:1845
+#: src/buddy.c:437 src/buddy.c:2725 src/buddy_chat.c:1087
+#: src/conversation.c:1793 src/conversation.c:2125 src/dialogs.c:878
+#: src/dialogs.c:1002 src/dialogs.c:1898 src/multi.c:670 src/prefs.c:971
+#: src/prefs.c:1705 src/prefs.c:2016 src/prefs.c:2050
 msgid "Add"
 msgstr "奐紗"
 
-#: src/buddy.c:267 src/buddy.c:2529 src/dialogs.c:882 src/dialogs.c:978
+#: src/buddy.c:438 src/buddy.c:2726 src/dialogs.c:888 src/dialogs.c:984
 msgid "Group"
 msgstr "怏蛤"
 
-#: src/buddy.c:268 src/buddy.c:2530 src/buddy_chat.c:1080
-#: src/conversation.c:1758 src/conversation.c:2089 src/prefs.c:799
-#: src/prefs.c:1474 src/prefs.c:1815 src/prefs.c:1849
+#: src/buddy.c:439 src/buddy.c:2727 src/buddy_chat.c:1089
+#: src/conversation.c:1779 src/conversation.c:2122 src/prefs.c:972
+#: src/prefs.c:1719 src/prefs.c:2020 src/prefs.c:2054
 msgid "Remove"
 msgstr "評茅"
 
-#: src/buddy.c:271 src/buddy.c:1912 src/buddy.c:2271
+#: src/buddy.c:442 src/buddy.c:2113 src/buddy.c:2468
 msgid "Chat"
 msgstr "祖爺"
 
-#: src/buddy.c:272 src/buddy.c:464 src/buddy.c:2269 src/buddy_chat.c:478
-#: src/buddy_chat.c:863
+#: src/buddy.c:443 src/buddy.c:654 src/buddy.c:764 src/buddy.c:2466
+#: src/buddy_chat.c:475 src/buddy_chat.c:872
 msgid "IM"
 msgstr "軸扮佚連"
 
-#: src/buddy.c:273 src/buddy.c:2270 src/buddy_chat.c:491 src/buddy_chat.c:871
-#: src/buddy_chat.c:1086 src/conversation.c:2110
+#: src/buddy.c:444 src/buddy.c:2467 src/buddy_chat.c:488 src/buddy_chat.c:880
+#: src/buddy_chat.c:1095 src/conversation.c:2143
 msgid "Info"
 msgstr "�聾彿創"
 
 #. Put the buttons in the box
-#: src/buddy.c:470 src/buddy.c:575 src/dialogs.c:972 src/dialogs.c:3432
-#: src/dialogs.c:3447 src/dialogs.c:3524 src/dialogs.c:3539
+#: src/buddy.c:660 src/buddy.c:770 src/dialogs.c:978 src/dialogs.c:3426
+#: src/dialogs.c:3441
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:476 src/buddy.c:589
+#: src/buddy.c:666 src/buddy.c:790
 msgid "Add Buddy Pounce"
 msgstr "奐紗酌篇涛嗔"
 
-#: src/buddy.c:482 src/buddy.c:595
+#: src/buddy.c:672 src/buddy.c:796
 msgid "View Log"
 msgstr ""
 
-#: src/buddy.c:582
+#: src/buddy.c:752 src/buddy.c:784
+#, fuzzy
+msgid "Rename"
+msgstr "評茅"
+
+#: src/buddy.c:777
 msgid "Un-Alias"
 msgstr ""
 
-#: src/buddy.c:1590
+#: src/buddy.c:1791
 msgid "New Buddy Pounce"
 msgstr "仟奐酌篇涛嗔"
 
-#: src/buddy.c:1608
+#: src/buddy.c:1809
 msgid "Remove Buddy Pounce"
 msgstr "函�酌篇涛嗔"
 
-#: src/buddy.c:1903
+#: src/buddy.c:2104
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "酌篇涛嗔"
 
-#: src/buddy.c:1906
+#: src/buddy.c:2107
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1909
+#: src/buddy.c:2110
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1915
+#: src/buddy.c:2116
 #, fuzzy
 msgid "Get File"
 msgstr "猟周"
 
-#: src/buddy.c:1918
+#: src/buddy.c:2119
 #, fuzzy
 msgid "Send File"
 msgstr "猟周"
 
-#: src/buddy.c:1921
+#: src/buddy.c:2122
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:1924
+#: src/buddy.c:2125
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:1976
+#: src/buddy.c:2177
 #, fuzzy, c-format
 msgid "Logged in: %s\n"
 msgstr "銭俊欺� %s\n"
 
-#: src/buddy.c:1987
+#: src/buddy.c:2188
 msgid "Warnings: %d%%\n"
 msgstr "少御�%d%%\n"
 
-#: src/buddy.c:1999
+#: src/buddy.c:2200
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:2003
+#: src/buddy.c:2204
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -289,916 +306,933 @@
 "鞠秘欺�%s\n"
 "%s%s%s"
 
-#: src/buddy.c:2007
+#: src/buddy.c:2208
 msgid "Idle: "
 msgstr "腎廬扮寂�"
 
-#: src/buddy.c:2076
+#: src/buddy.c:2277
 #, fuzzy, c-format
-msgid "<B>%s logged in%s%s.</B>"
+msgid "%s logged in."
 msgstr "<HR><B>%s 鞠秘欺 %s%s。</B><BR><HR>"
 
-#: src/buddy.c:2130
+#: src/buddy.c:2329
 #, fuzzy, c-format
-msgid "<B>%s logged out%s%s.</B>"
+msgid "%s logged out."
 msgstr "<HR><B>%s 宣蝕阻 %s%s 。</B><BR><HR>"
 
-#: src/buddy.c:2296
+#: src/buddy.c:2493
 msgid "Information on selected Buddy"
 msgstr "僉嶄議涛嗔議彿創"
 
-#: src/buddy.c:2297 src/dialogs.c:671
+#: src/buddy.c:2494 src/dialogs.c:677
 msgid "Send Instant Message"
 msgstr "窟竃軸扮佚連"
 
-#: src/buddy.c:2298
+#: src/buddy.c:2495
 msgid "Start/join a Buddy Chat"
 msgstr "窟軟�紗秘匯倖祖爺片"
 
-#: src/buddy.c:2362
+#: src/buddy.c:2559
 msgid "File"
 msgstr "猟周"
 
-#: src/buddy.c:2366
+#: src/buddy.c:2563
 msgid "Add A Buddy"
 msgstr "紗秘匯倖悟断隅"
 
-#: src/buddy.c:2368
+#: src/buddy.c:2565
 #, fuzzy
 msgid "Join A Chat"
 msgstr "紗秘祖爺"
 
-#: src/buddy.c:2370
+#: src/buddy.c:2567
 #, fuzzy
 msgid "New Instant Message"
 msgstr "窟竃軸扮佚連"
 
-#: src/buddy.c:2375
+#: src/buddy.c:2572
 msgid "Import Buddy List"
 msgstr "擬秘涛嗔双燕"
 
-#: src/buddy.c:2377
+#: src/buddy.c:2574
 msgid "Export Buddy List"
 msgstr "擬竃涛嗔双燕"
 
-#: src/buddy.c:2393
+#: src/buddy.c:2590
 msgid "Tools"
 msgstr "垢醤"
 
-#: src/buddy.c:2403
+#: src/buddy.c:2600
 msgid "Buddy Pounce"
 msgstr "酌篇涛嗔"
 
-#: src/buddy.c:2412 src/dialogs.c:2078 src/dialogs.c:2245
+#: src/buddy.c:2609 src/dialogs.c:2079 src/dialogs.c:2246
 msgid "Search for Buddy"
 msgstr "朴儖涛嗔"
 
-#: src/buddy.c:2415
+#: src/buddy.c:2612
 msgid "by Email"
 msgstr "聞喘窮喨"
 
-#: src/buddy.c:2419
+#: src/buddy.c:2616
 msgid "by Dir Info"
 msgstr "聞喘侖兆仇峽村"
 
-#: src/buddy.c:2426 src/buddy.c:2427
+#: src/buddy.c:2623 src/buddy.c:2624
 msgid "Settings"
 msgstr "譜協"
 
-#: src/buddy.c:2430
+#: src/buddy.c:2627
 msgid "User Info"
 msgstr "喘薩�聾彿創"
 
-#: src/buddy.c:2434 src/dialogs.c:1356
+#: src/buddy.c:2631 src/dialogs.c:1362
 msgid "Directory Info"
 msgstr "侖兆仇峽村"
 
-#: src/buddy.c:2438 src/dialogs.c:1547
+#: src/buddy.c:2635 src/dialogs.c:1553
 msgid "Change Password"
 msgstr "厚個畜鷹"
 
-#: src/buddy.c:2447
+#: src/buddy.c:2644
 #, fuzzy
 msgid "Protocol Actions"
 msgstr "僉�"
 
-#: src/buddy.c:2454
+#: src/buddy.c:2651
 msgid "View System Log"
 msgstr ""
 
-#: src/buddy.c:2465
+#: src/buddy.c:2662
 #, fuzzy
 msgid "Perl"
 msgstr "塋俯"
 
-#: src/buddy.c:2468
+#: src/buddy.c:2665
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2472
+#: src/buddy.c:2669
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2476
+#: src/buddy.c:2673
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2484
+#: src/buddy.c:2681
 msgid "Help"
 msgstr "逸廁"
 
-#: src/buddy.c:2489
+#: src/buddy.c:2686
 #, fuzzy
 msgid "About Gaim"
 msgstr "購噐"
 
-#: src/buddy.c:2508 src/prefs.c:2215
+#: src/buddy.c:2705 src/prefs.c:2425
 msgid "Buddy List"
 msgstr "涛嗔双燕"
 
-#: src/buddy.c:2562
+#: src/buddy.c:2759
 msgid "Add a new Buddy"
 msgstr "奐紗匯倖仟悟断隅"
 
-#: src/buddy.c:2563
+#: src/buddy.c:2760
 #, fuzzy
 msgid "Add a new Group"
 msgstr "奐紗匯倖仟悟断隅"
 
-#: src/buddy.c:2564
+#: src/buddy.c:2761
 msgid "Remove selected Buddy"
 msgstr "評茅僉嶄議涛嗔"
 
-#: src/buddy.c:2589
+#: src/buddy.c:2786
 msgid "Online"
 msgstr "壓�"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2788
 msgid "Edit Buddies"
 msgstr "俐個涛嗔燕"
 
-#: src/buddy.c:2628
+#: src/buddy.c:2825
 msgid "Gaim - Buddy List"
 msgstr "Gaim - 涛嗔双燕"
 
-#: src/buddy_chat.c:160
+#: src/buddy_chat.c:157
 msgid "Join Chat"
 msgstr "紗秘祖爺"
 
-#: src/buddy_chat.c:167 src/buddy_chat.c:978 src/buddy_chat.c:990
+#: src/buddy_chat.c:164 src/buddy_chat.c:987 src/buddy_chat.c:999
 msgid "Buddy Chat"
 msgstr "涛嗔祖爺"
 
-#: src/buddy_chat.c:177
+#: src/buddy_chat.c:174
 msgid "Join what group:"
 msgstr "勣紗秘議怏�"
 
-#: src/buddy_chat.c:190
+#: src/buddy_chat.c:187
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "紗秘祖爺"
 
-#: src/buddy_chat.c:202
+#: src/buddy_chat.c:199
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:209
+#: src/buddy_chat.c:206
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:217 src/buddy_chat.c:262 src/dialogs.c:404
-#: src/dialogs.c:690 src/dialogs.c:750 src/dialogs.c:874 src/dialogs.c:991
-#: src/dialogs.c:1270 src/dialogs.c:1480 src/dialogs.c:1608 src/dialogs.c:1673
-#: src/dialogs.c:1886 src/dialogs.c:2084 src/dialogs.c:2264 src/dialogs.c:2338
-#: src/dialogs.c:3200 src/dialogs.c:3434 src/dialogs.c:3526 src/dialogs.c:3713
-#: src/multi.c:475 src/multi.c:586 src/multi.c:833 src/prpl.c:156
-#: src/prpl.c:227
+#: src/buddy_chat.c:214 src/buddy_chat.c:259 src/dialogs.c:410
+#: src/dialogs.c:696 src/dialogs.c:756 src/dialogs.c:880 src/dialogs.c:997
+#: src/dialogs.c:1276 src/dialogs.c:1486 src/dialogs.c:1614 src/dialogs.c:1679
+#: src/dialogs.c:1887 src/dialogs.c:2085 src/dialogs.c:2265 src/dialogs.c:2339
+#: src/dialogs.c:3204 src/dialogs.c:3428 src/dialogs.c:3619 src/dialogs.c:3849
+#: src/dialogs.c:3937 src/multi.c:475 src/multi.c:586 src/multi.c:833
+#: src/prpl.c:156 src/prpl.c:227
 msgid "Cancel"
 msgstr "函�"
 
-#: src/buddy_chat.c:222
+#: src/buddy_chat.c:219
 msgid "Join"
 msgstr "紗秘"
 
-#: src/buddy_chat.c:263 src/buddy_chat.c:916 src/buddy_chat.c:1045
+#: src/buddy_chat.c:260 src/buddy_chat.c:925 src/buddy_chat.c:1054
 msgid "Invite"
 msgstr "剱萩"
 
-#: src/buddy_chat.c:279
+#: src/buddy_chat.c:276
 msgid "Invite who?"
 msgstr "�萩豊�"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:280
 msgid "With message:"
 msgstr "剱萩佚連�"
 
-#: src/buddy_chat.c:307
+#: src/buddy_chat.c:304
 msgid "Invite to Buddy Chat"
 msgstr "萩繁祖爺"
 
-#: src/buddy_chat.c:484 src/buddy_chat.c:867
+#: src/buddy_chat.c:481 src/buddy_chat.c:876
 msgid "Ignore"
 msgstr "音尖麿"
 
-#: src/buddy_chat.c:536 src/buddy_chat.c:642
+#: src/buddy_chat.c:533 src/buddy_chat.c:639
 #, c-format
 msgid "%d %s in room"
 msgstr ""
 
-#: src/buddy_chat.c:543
+#: src/buddy_chat.c:540
 #, c-format
-msgid "<B>%s entered the room.</B>"
+msgid "%s entered the room."
 msgstr ""
 
-#: src/buddy_chat.c:606
+#: src/buddy_chat.c:603
 #, c-format
-msgid "<B>%s is now known as %s</B>"
+msgid "%s is now known as %s"
 msgstr ""
 
-#: src/buddy_chat.c:649
+#: src/buddy_chat.c:646
 #, c-format
-msgid "<B>%s left the room.</B>"
+msgid "%s left the room."
 msgstr ""
 
-#: src/buddy_chat.c:776
+#: src/buddy_chat.c:773
 #, fuzzy
 msgid "Gaim - Group Chats"
 msgstr "Gaim 祖爺"
 
-#: src/buddy_chat.c:844
+#: src/buddy_chat.c:853
 msgid "0 people in room"
 msgstr ""
 
-#: src/buddy_chat.c:921 src/buddy_chat.c:1044
+#: src/buddy_chat.c:930 src/buddy_chat.c:1053
 msgid "Whisper"
 msgstr "把把三"
 
-#: src/buddy_chat.c:926 src/buddy_chat.c:1042 src/buddy_chat.c:1088
-#: src/conversation.c:2121
+#: src/buddy_chat.c:935 src/buddy_chat.c:1051 src/buddy_chat.c:1097
+#: src/conversation.c:2154
 msgid "Send"
 msgstr "僕竃"
 
-#: src/buddy_chat.c:1082 src/conversation.c:2098
+#: src/buddy_chat.c:1091 src/conversation.c:2131
 msgid "Block"
 msgstr "翠"
 
-#: src/buddy_chat.c:1084 src/conversation.c:2104 src/dialogs.c:374
-#: src/dialogs.c:399
+#: src/buddy_chat.c:1093 src/conversation.c:2137 src/dialogs.c:380
+#: src/dialogs.c:405
 msgid "Warn"
 msgstr "少御"
 
-#: src/conversation.c:352
+#: src/conversation.c:365
 #, fuzzy
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 芝村斤三坪否"
 
-#: src/conversation.c:503
+#: src/conversation.c:518
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "委 ^%s ̄貫涛嗔燕貧評肇\n"
 
-#: src/conversation.c:1068
+#: src/conversation.c:1083
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "朕念壓 %d\n"
 
-#: src/conversation.c:1076
+#: src/conversation.c:1091
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "委了崔譜協欺 %d\n"
 
-#: src/conversation.c:1602
+#: src/conversation.c:1623
 msgid "Bold"
 msgstr "間悶"
 
-#: src/conversation.c:1602 src/prefs.c:974
+#: src/conversation.c:1623 src/prefs.c:1147
 msgid "Bold Text"
 msgstr "間悶猟忖"
 
-#: src/conversation.c:1606 src/conversation.c:1607
+#: src/conversation.c:1627 src/conversation.c:1628
 msgid "Italics"
 msgstr "弍悶"
 
-#: src/conversation.c:1606 src/prefs.c:975
+#: src/conversation.c:1627 src/prefs.c:1148
 msgid "Italics Text"
 msgstr "弍悶猟忖"
 
-#: src/conversation.c:1610 src/conversation.c:1611
+#: src/conversation.c:1631 src/conversation.c:1632
 msgid "Underline"
 msgstr "和紗�"
 
-#: src/conversation.c:1610
+#: src/conversation.c:1631
 msgid "Underline Text"
 msgstr "和紗�猟忖"
 
-#: src/conversation.c:1615
+#: src/conversation.c:1636
 msgid "Strike"
 msgstr "皿渠"
 
-#: src/conversation.c:1615
+#: src/conversation.c:1636
 msgid "Strike through Text"
 msgstr "皿渠議猟忖"
 
-#: src/conversation.c:1621
+#: src/conversation.c:1642
 msgid "Small"
 msgstr "弌"
 
-#: src/conversation.c:1621
+#: src/conversation.c:1642
 msgid "Decrease font size"
 msgstr "抹弌忖悶"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1645
 msgid "Normal"
 msgstr "屎械"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1645
 msgid "Normal font size"
 msgstr "屎械忖悶寄弌"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1648
 msgid "Big"
 msgstr "寄"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1648
 msgid "Increase font size"
 msgstr "奐寄忖悶"
 
-#: src/conversation.c:1634 src/conversation.c:1635
+#: src/conversation.c:1655 src/conversation.c:1656
 msgid "Font"
 msgstr "忖侏"
 
-#: src/conversation.c:1634 src/dialogs.c:2687 src/dialogs.c:2703
+#: src/conversation.c:1655 src/dialogs.c:2691 src/dialogs.c:2707
 msgid "Select Font"
 msgstr "僉夲忖侏"
 
-#: src/conversation.c:1638 src/conversation.c:1639 src/conversation.c:1643
+#: src/conversation.c:1659 src/conversation.c:1660 src/conversation.c:1664
 msgid "Color"
 msgstr "冲弼"
 
-#: src/conversation.c:1638 src/prefs.c:988
+#: src/conversation.c:1659 src/prefs.c:1161
 msgid "Text Color"
 msgstr "猟忖冲弼"
 
-#: src/conversation.c:1643 src/prefs.c:1006
+#: src/conversation.c:1664 src/prefs.c:1179
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1650 src/conversation.c:1651
+#: src/conversation.c:1671 src/conversation.c:1672
 msgid "Link"
 msgstr "銭俊"
 
-#: src/conversation.c:1650 src/dialogs.c:2332
+#: src/conversation.c:1671 src/dialogs.c:2333
 msgid "Insert Link"
 msgstr "峨秘銭俊"
 
-#: src/conversation.c:1654
+#: src/conversation.c:1675
 #, fuzzy
 msgid "Smiley"
 msgstr "猟周"
 
-#: src/conversation.c:1654
+#: src/conversation.c:1675
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1661 src/conversation.c:1662 src/prefs.c:2202
+#: src/conversation.c:1682 src/conversation.c:1683 src/prefs.c:245
 msgid "Logging"
 msgstr "芝村"
 
-#: src/conversation.c:1661
+#: src/conversation.c:1682
 msgid "Enable logging"
 msgstr "嬉蝕芝村"
 
-#: src/conversation.c:1671 src/conversation.c:1672 src/dialogs.c:1485
-#: src/dialogs.c:1678 src/dialogs.c:3212 src/dialogs.c:3826
+#: src/conversation.c:1692 src/conversation.c:1693 src/dialogs.c:1491
+#: src/dialogs.c:1684 src/dialogs.c:3216 src/dialogs.c:3728
 msgid "Save"
 msgstr "贋徒"
 
-#: src/conversation.c:1671
+#: src/conversation.c:1692
 #, fuzzy
 msgid "Save Conversation"
 msgstr "芝村侭嗤斤三坪否"
 
-#: src/conversation.c:1676 src/conversation.c:1677
+#: src/conversation.c:1697 src/conversation.c:1698
 msgid "Sound"
 msgstr "蕗咄"
 
-#: src/conversation.c:1676
+#: src/conversation.c:1697
 msgid "Enable sounds"
 msgstr "嬉蝕蕗咄"
 
-#: src/conversation.c:1964
+#: src/conversation.c:1985
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - 芝村斤三坪否"
 
-#: src/conversation.c:2039
+#: src/conversation.c:2072
 #, fuzzy
 msgid "Send message as: "
 msgstr "窟竃佚連蕗"
 
-#: src/dialogs.c:361
+#: src/dialogs.c:367
 msgid "Gaim - Warn user?"
 msgstr "Gaim - 少御喘薩�"
 
-#: src/dialogs.c:382
+#: src/dialogs.c:388
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "低寔議�少御%s�"
 
-#: src/dialogs.c:387
+#: src/dialogs.c:393
 msgid "Warn anonymously?"
 msgstr "窟停兆少御�"
 
-#: src/dialogs.c:391
+#: src/dialogs.c:397
 msgid "Anonymous warnings are less harsh."
 msgstr "停兆少御音椎担冢染。"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:473
 #, c-format
 msgid "Unable to write file %s."
 msgstr "音嬬亟秘猟周 %s。"
 
-#: src/dialogs.c:470
+#: src/dialogs.c:476
 #, c-format
 msgid "Unable to read file %s."
 msgstr "音嬬響秘猟周 %s。"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:479
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "佚連湊海�朔中 %s 忖圷瓜審渠阻。"
 
-#: src/dialogs.c:476
+#: src/dialogs.c:482
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s �壓短嗤鞠秘。"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:485
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "音塋俯少御 %s 。"
 
-#: src/dialogs.c:482
+#: src/dialogs.c:488
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "函�阻匯倖佚連�低階竃阻捲別匂議堀業�崙。"
 
-#: src/dialogs.c:485
+#: src/dialogs.c:491
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "壓 %s 嶄短嗤祖爺。"
 
-#: src/dialogs.c:488
+#: src/dialogs.c:494
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "低窟僕公 %s 議堀業湊酔阻。"
 
-#: src/dialogs.c:491
+#: src/dialogs.c:497
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "低危狛阻匯倖貫 %s 窟栖議軸扮佚連�乎佚連湊寄阻。"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:500
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "低危狛阻匯倖貫 %s 窟栖議軸扮佚連�乎佚連窟僕議堀業湊酔。"
 
-#: src/dialogs.c:497
+#: src/dialogs.c:503
 msgid "Failure."
 msgstr "払移阻。"
 
-#: src/dialogs.c:500
+#: src/dialogs.c:506
 msgid "Too many matches."
 msgstr "謄塘湊謹。"
 
-#: src/dialogs.c:503
+#: src/dialogs.c:509
 msgid "Need more qualifiers."
 msgstr "俶勣厚謹議歌方。"
 
-#: src/dialogs.c:506
+#: src/dialogs.c:512
 msgid "Dir service temporarily unavailable."
 msgstr "侖兆仇峽村捲暦匂壙扮銭音貧。"
 
-#: src/dialogs.c:509
+#: src/dialogs.c:515
 msgid "Email lookup restricted."
 msgstr "窮喨臥孀�崙。"
 
-#: src/dialogs.c:512
+#: src/dialogs.c:518
 msgid "Keyword ignored."
 msgstr "購囚忖瓜策待。"
 
-#: src/dialogs.c:515
+#: src/dialogs.c:521
 msgid "No keywords."
 msgstr "短嗤購囚忖。"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:524
 msgid "User has no directory information."
 msgstr "乎喘薩短嗤侖兆仇峽村"
 
-#: src/dialogs.c:522
+#: src/dialogs.c:528
 msgid "Country not supported."
 msgstr "音屶隔宸倖忽社。"
 
-#: src/dialogs.c:525
+#: src/dialogs.c:531
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "音苧危列� %s 。"
 
 #. Incorrect nick/password
-#: src/dialogs.c:528 src/oscar.c:524
+#: src/dialogs.c:534 src/oscar.c:525
 msgid "Incorrect nickname or password."
 msgstr "蠻兆賜宀畜鷹危列。"
 
-#: src/dialogs.c:531
+#: src/dialogs.c:537
 msgid "The service is temporarily unavailable."
 msgstr "壙扮短嗤乎捲暦。"
 
-#: src/dialogs.c:534
+#: src/dialogs.c:540
 msgid "Your warning level is currently too high to log in."
 msgstr "低朕念議少御雫艶湊互�涙隈鞠秘。"
 
-#: src/dialogs.c:537
+#: src/dialogs.c:543
 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/dialogs.c:540
+#: src/dialogs.c:546
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "窟伏音苧議鞠村危列� %s。"
 
-#: src/dialogs.c:543
+#: src/dialogs.c:549
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "音苧危列 %d 窟伏阻。醤悶儷連� %s"
 
-#: src/dialogs.c:546
+#: src/dialogs.c:552
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - 危列 %d"
 
-#. Build OK Button
-#: src/dialogs.c:605 src/dialogs.c:695 src/dialogs.c:755 src/dialogs.c:1275
-#: src/dialogs.c:1613 src/dialogs.c:1726 src/dialogs.c:2083 src/dialogs.c:2269
-#: src/dialogs.c:2337 src/multi.c:479
-msgid "OK"
-msgstr "鳩範"
-
-#: src/dialogs.c:661
+#: src/dialogs.c:667
 msgid "Gaim - IM user"
 msgstr "Gaim - 軸扮佚連喘薩"
 
-#: src/dialogs.c:678
+#: src/dialogs.c:684
 #, fuzzy
 msgid "IM who:"
 msgstr "公豊軸扮佚連�"
 
-#: src/dialogs.c:726
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "喘薩�聾彿創"
 
-#: src/dialogs.c:733
+#: src/dialogs.c:739
 msgid "User:"
 msgstr ""
 
 #. Finish up
-#: src/dialogs.c:761
+#: src/dialogs.c:767
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 譜協喘薩彿創"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:833
 msgid "Buddies"
 msgstr "悟断隅断"
 
-#: src/dialogs.c:880
+#: src/dialogs.c:886
 #, fuzzy
 msgid "Add Group"
 msgstr "怏蛤"
 
-#: src/dialogs.c:910
+#: src/dialogs.c:916
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - 奐紗涛嗔"
 
-#: src/dialogs.c:937
+#: src/dialogs.c:943
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 奐紗涛嗔"
 
-#: src/dialogs.c:951
+#: src/dialogs.c:957
 msgid "Add Buddy"
 msgstr "奐紗涛嗔"
 
-#: src/dialogs.c:961 src/dialogs.c:3442 src/dialogs.c:3534
+#: src/dialogs.c:967 src/dialogs.c:3436
 msgid "Buddy"
 msgstr "涛嗔"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:1021
 #, fuzzy
 msgid "Please enter a buddy to pounce."
 msgstr "萩補秘艇議鞠村兆各"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:1021
 #, fuzzy
 msgid "Buddy Pounce Error"
 msgstr "酌篇涛嗔"
 
-#: src/dialogs.c:1084
+#: src/dialogs.c:1090
 #, fuzzy
 msgid "Pounce buddy as:"
 msgstr "涛嗔鞠村蕗"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1140
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - 仟奐酌篇涛嗔"
 
-#: src/dialogs.c:1151
+#: src/dialogs.c:1157
 #, fuzzy
 msgid "Buddy:"
 msgstr "涛嗔"
 
-#: src/dialogs.c:1166
+#: src/dialogs.c:1172
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1171
+#: src/dialogs.c:1177
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1175
+#: src/dialogs.c:1181
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1183
+#: src/dialogs.c:1189
 #, fuzzy
 msgid "Open IM window on pounce"
 msgstr "涛嗔鞠村扮嬉蝕軸扮佚連完笥"
 
-#: src/dialogs.c:1188
+#: src/dialogs.c:1194
 #, fuzzy
 msgid "Send IM on pounce"
 msgstr "涛嗔鞠村扮窟僕軸扮佚連"
 
-#: src/dialogs.c:1197
+#: src/dialogs.c:1203
 #, fuzzy
 msgid "Message:"
 msgstr "幹恬佚連"
 
-#: src/dialogs.c:1209
+#: src/dialogs.c:1215
 #, fuzzy
 msgid "Execute command on pounce"
 msgstr "涛嗔鞠村扮窟僕軸扮佚連"
 
-#: src/dialogs.c:1218
+#: src/dialogs.c:1224
 msgid "Command:"
 msgstr ""
 
-#: src/dialogs.c:1231
+#: src/dialogs.c:1237
 #, fuzzy
 msgid "Play sound on pounce"
 msgstr "涛嗔鞠村扮窟僕軸扮佚連"
 
-#: src/dialogs.c:1240
+#: src/dialogs.c:1246
 #, fuzzy
 msgid "Sound:"
 msgstr "蕗咄"
 
-#: src/dialogs.c:1257
+#: src/dialogs.c:1263
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1352
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 譜協侖兆仇峽村"
 
-#: src/dialogs.c:1378
+#: src/dialogs.c:1384
 msgid "Allow Web Searches To Find Your Info"
 msgstr "塋俯貫利匈朴儖孀欺低議彿創"
 
 #. Line 1
-#: src/dialogs.c:1381 src/dialogs.c:2102
+#: src/dialogs.c:1387 src/dialogs.c:2103
 msgid "First Name"
 msgstr "兆"
 
 #. Line 2
-#: src/dialogs.c:1392 src/dialogs.c:2114
+#: src/dialogs.c:1398 src/dialogs.c:2115
 msgid "Middle Name"
 msgstr "忖"
 
 #. Line 3
-#: src/dialogs.c:1404 src/dialogs.c:2126
+#: src/dialogs.c:1410 src/dialogs.c:2127
 msgid "Last Name"
 msgstr "侖"
 
 #. Line 4
-#: src/dialogs.c:1415 src/dialogs.c:2138
+#: src/dialogs.c:1421 src/dialogs.c:2139
 msgid "Maiden Name"
 msgstr "弟社侖"
 
 #. Line 5
-#: src/dialogs.c:1426 src/dialogs.c:2150
+#: src/dialogs.c:1432 src/dialogs.c:2151
 msgid "City"
 msgstr "偏"
 
 #. Line 6
-#: src/dialogs.c:1437 src/dialogs.c:2161
+#: src/dialogs.c:1443 src/dialogs.c:2162
 msgid "State"
 msgstr "福"
 
 #. Line 7
-#: src/dialogs.c:1448 src/dialogs.c:2172
+#: src/dialogs.c:1454 src/dialogs.c:2173
 msgid "Country"
 msgstr "忽"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1509
 msgid "New Passwords Do Not Match"
 msgstr "仟畜鷹音匯崑"
 
-#: src/dialogs.c:1503 src/dialogs.c:1508
+#: src/dialogs.c:1509 src/dialogs.c:1514
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - 厚個畜鷹危列"
 
-#: src/dialogs.c:1508
+#: src/dialogs.c:1514
 msgid "Fill out all fields completely"
 msgstr "委侭嗤議燕鯉脅耶阻"
 
-#: src/dialogs.c:1535 src/toc.c:561
+#: src/dialogs.c:1541 src/toc.c:561
 msgid "Gaim - Password Change"
 msgstr "Gaim - 厚個畜鷹"
 
-#: src/dialogs.c:1566
+#: src/dialogs.c:1572
 msgid "Original Password"
 msgstr "症畜鷹"
 
-#: src/dialogs.c:1580
+#: src/dialogs.c:1586
 msgid "New Password"
 msgstr "仟畜鷹"
 
-#: src/dialogs.c:1594
+#: src/dialogs.c:1600
 msgid "New Password (again)"
 msgstr "仟畜鷹�鳩協�"
 
-#: src/dialogs.c:1639
+#: src/dialogs.c:1645
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 譜協喘薩彿創"
 
-#: src/dialogs.c:1737
+#: src/dialogs.c:1743
 msgid "Below are the results of your search: "
 msgstr "參和頁低朴沫議潤惚�"
 
-#: src/dialogs.c:1876 src/dialogs.c:1883
+#: src/dialogs.c:1877 src/dialogs.c:1884
 msgid "Permit"
 msgstr "塋俯"
 
-#: src/dialogs.c:1878 src/dialogs.c:1885
+#: src/dialogs.c:1879 src/dialogs.c:1886
 msgid "Deny"
 msgstr "詳蒸"
 
-#: src/dialogs.c:1926
+#: src/dialogs.c:1927
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - 奐紗 塋俯�鋤峭"
 
-#: src/dialogs.c:1928
+#: src/dialogs.c:1929
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - 奐紗 塋俯�鋤峭"
 
-#: src/dialogs.c:1999
+#: src/dialogs.c:2000
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - 芝村斤三坪否"
 
-#: src/dialogs.c:2209
+#: src/dialogs.c:2210
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 功象喘薩彿創臥儖涛嗔"
 
-#: src/dialogs.c:2239
+#: src/dialogs.c:2240
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - 功象窮喨臥儖涛嗔"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2253
 msgid "Email"
 msgstr "窮喨"
 
-#: src/dialogs.c:2351
+#: src/dialogs.c:2352
 msgid "URL"
 msgstr ""
 
-#: src/dialogs.c:2359
+#: src/dialogs.c:2360
 msgid "Description"
 msgstr "宙峰"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2386
 msgid "GAIM - Add URL"
 msgstr "GAIM - 奐紗 URL"
 
-#: src/dialogs.c:2526 src/dialogs.c:2539 src/dialogs.c:2576
+#: src/dialogs.c:2529 src/dialogs.c:2542 src/dialogs.c:2579
 msgid "Select Text Color"
 msgstr "譜協猟忖冲弼"
 
-#: src/dialogs.c:2563
+#: src/dialogs.c:2566
 #, fuzzy
 msgid "Select Background Color"
 msgstr "譜協猟忖冲弼"
 
-#: src/dialogs.c:2808
+#: src/dialogs.c:2812
 #, c-format
 msgid "Error writing file %s"
 msgstr "亟秘猟周 %s 窟伏危列"
 
-#: src/dialogs.c:2809 src/dialogs.c:2931 src/dialogs.c:3674 src/oscar.c:1824
-#: src/oscar.c:2241 src/toc.c:1398 src/toc.c:1415 src/toc.c:1503
+#: src/dialogs.c:2813 src/dialogs.c:2935 src/dialogs.c:3580 src/oscar.c:1923
+#: src/oscar.c:2342 src/toc.c:1398 src/toc.c:1415 src/toc.c:1503
 #: src/toc.c:1680 src/toc.c:1710
 msgid "Error"
 msgstr "危列"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2866
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - 擬竃涛嗔双燕"
 
-#: src/dialogs.c:2930
+#: src/dialogs.c:2934
 #, c-format
 msgid "Error reading file %s"
 msgstr "響函猟周 %s 窟伏危列"
 
-#: src/dialogs.c:3004
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 擬秘涛嗔双燕"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3067
+#: src/dialogs.c:3071
 msgid "You cannot create an away message with a blank title"
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3074
+#: src/dialogs.c:3078
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:3141
+#: src/dialogs.c:3145
 msgid "Gaim - New away message"
 msgstr "Gaim - 厚仟壙扮宣蝕佚連"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3155
 #, fuzzy
 msgid "New away message"
 msgstr "仟議壙扮宣蝕佚連"
 
-#: src/dialogs.c:3164
+#: src/dialogs.c:3168
 msgid "Away title: "
 msgstr "壙扮宣蝕炎籾�"
 
-#: src/dialogs.c:3204
+#: src/dialogs.c:3208
 #, fuzzy
 msgid "Use"
 msgstr "GAIM 聞喘"
 
-#: src/dialogs.c:3208
+#: src/dialogs.c:3212
 msgid "Save & Use"
 msgstr ""
 
 #. show everything
-#: src/dialogs.c:3377
+#: src/dialogs.c:3381
 #, fuzzy
 msgid "Smile!"
 msgstr "猟周"
 
-#: src/dialogs.c:3440 src/dialogs.c:3532
+#: src/dialogs.c:3434
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "奐紗涛嗔"
 
-#: src/dialogs.c:3477 src/dialogs.c:3569
+#: src/dialogs.c:3471
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 奐紗涛嗔"
 
-#: src/dialogs.c:3641
+#: src/dialogs.c:3545
 #, fuzzy
 msgid "Gaim - Save Log File"
 msgstr "Gaim - 贋徒葎´´"
 
-#: src/dialogs.c:3672
+#: src/dialogs.c:3578
 #, fuzzy, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "音嬬響秘猟周 %s。"
 
-#: src/dialogs.c:3703
+#: src/dialogs.c:3609
 msgid "Really clear log?"
 msgstr ""
 
-#: src/dialogs.c:3721
+#: src/dialogs.c:3627
 #, fuzzy
 msgid "Okay"
 msgstr "鳩協"
 
-#: src/dialogs.c:3821
+#: src/dialogs.c:3723
 #, fuzzy
 msgid "Clear"
 msgstr "購液"
 
+#: src/dialogs.c:3818
+#, fuzzy
+msgid "Gaim - Rename Group"
+msgstr "Gaim - 奐紗涛嗔"
+
+#: src/dialogs.c:3828
+msgid "Rename Group"
+msgstr ""
+
+#: src/dialogs.c:3835 src/dialogs.c:3923
+#, fuzzy
+msgid "New name:"
+msgstr "�幣議侖兆�"
+
+#: src/dialogs.c:3906
+#, fuzzy
+msgid "Gaim - Rename Buddy"
+msgstr "Gaim - 奐紗涛嗔"
+
+#: src/dialogs.c:3916
+#, fuzzy
+msgid "Rename Buddy"
+msgstr "Gaim - 奐紗涛嗔"
+
 #: src/gaimrc.c:880
 #, c-format
 msgid "Could not open config file %s."
@@ -1227,7 +1261,7 @@
 msgid "Receieved: '%s'\n"
 msgstr "辺欺阻�^%s ̄\n"
 
-#: src/multi.c:357 src/prefs.c:114
+#: src/multi.c:357 src/prefs.c:188
 #, fuzzy
 msgid "General Options"
 msgstr "僉�"
@@ -1255,10 +1289,6 @@
 msgid "Auto-Login"
 msgstr "徭強鞠村"
 
-#: src/multi.c:389
-msgid "Send KeepAlive packet (6 bytes/second)"
-msgstr ""
-
 #: src/multi.c:454
 #, fuzzy
 msgid "Gaim - Modify Account"
@@ -1295,78 +1325,78 @@
 "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
+#: src/oscar.c:295 src/oscar.c:312 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "厮僅蝕。"
 
-#: src/oscar.c:302
+#: src/oscar.c:303
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "銭俊危列�\n"
 
-#: src/oscar.c:310
+#: src/oscar.c:311
 #, fuzzy
 msgid "major connection error\n"
 msgstr "銭俊危列�\n"
 
-#: src/oscar.c:323 src/toc.c:545
+#: src/oscar.c:324 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:324
+#: src/oscar.c:325
 #, fuzzy
 msgid "Chat Error!"
 msgstr "危列"
 
-#: src/oscar.c:334
+#: src/oscar.c:335
 #, fuzzy
 msgid "Chat is currently unavailable"
 msgstr "壓 %s 嶄短嗤祖爺。"
 
-#: src/oscar.c:335
+#: src/oscar.c:336
 #, fuzzy
 msgid "Gaim - Chat"
 msgstr "Gaim 祖爺"
 
-#: src/oscar.c:382
+#: src/oscar.c:383
 #, c-format
 msgid "Logging in %s\n"
 msgstr "銭俊欺� %s\n"
 
-#: src/oscar.c:420
+#: src/oscar.c:421
 msgid "internal connection error\n"
 msgstr "坪何銭俊危列\n"
 
-#: src/oscar.c:421
+#: src/oscar.c:422
 msgid "Unable to login to AIM"
 msgstr "音嬬鞠村欺 AIM"
 
-#: src/oscar.c:426
+#: src/oscar.c:427
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "音嬬盾裂麼字\n"
 
-#: src/oscar.c:430
+#: src/oscar.c:431
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "音嬬銭俊欺麼字\n"
 
-#: src/oscar.c:437
+#: src/oscar.c:438
 #, c-format
 msgid "Signon: %s"
 msgstr "鞠村� %s"
 
-#: src/oscar.c:447
+#: src/oscar.c:448
 msgid "Password sent, waiting for response\n"
 msgstr "畜鷹厮僕竃�吉昨指哘\n"
 
-#: src/oscar.c:475
+#: src/oscar.c:476
 msgid "Signed off.\n"
 msgstr "鞠竃。\n"
 
 #. connecting too frequently
-#: src/oscar.c:519
+#: src/oscar.c:520
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1375,62 +1405,62 @@
 "低銭俊�僅蝕議撞楕湊互阻�吉噴蛍嶝壅編。泌惚低掲勣俊彭編�吉議扮寂氏厚海。"
 
 #. client too old
-#: src/oscar.c:529
+#: src/oscar.c:530
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 
-#: src/oscar.c:533 src/toc.c:341
+#: src/oscar.c:534 src/toc.c:341
 msgid "Authentication Failed"
 msgstr "刮屬払移"
 
-#: src/oscar.c:563
+#: src/oscar.c:564
 msgid "Internal Error"
 msgstr "坪何危列"
 
-#: src/oscar.c:567
+#: src/oscar.c:568
 msgid "Could Not Connect"
 msgstr "涙隈銭俊"
 
-#: src/oscar.c:601
+#: src/oscar.c:603
 msgid "Connection established, cookie sent"
 msgstr "銭俊撹孔�僕竃往孤。。亜�往孤��"
 
-#: src/oscar.c:858 src/oscar.c:2125
+#: src/oscar.c:959 src/oscar.c:2226
 #, fuzzy, c-format
-msgid "<B>Direct IM with %s established</B>"
+msgid "Direct IM with %s established"
 msgstr "<HR><B>%s 鞠秘欺 %s%s。</B><BR><HR>"
 
 #. message too large
-#: src/oscar.c:1308
+#: src/oscar.c:1409
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "低危狛阻匯倖貫 %s 窟栖議軸扮佚連�乎佚連湊寄阻。"
 
-#: src/oscar.c:1313
+#: src/oscar.c:1414
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1348
+#: src/oscar.c:1449
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1349 src/oscar.c:1368
+#: src/oscar.c:1450 src/oscar.c:1469
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1367
+#: src/oscar.c:1468
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1403
+#: src/oscar.c:1504
 #, c-format
 msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1410
+#: src/oscar.c:1511
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1444,25 +1474,25 @@
 "SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1448
+#: src/oscar.c:1549
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1449
+#: src/oscar.c:1550
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:2182
+#: src/oscar.c:2283
 #, fuzzy, c-format
-msgid "<B>Direct IM with %s closed</B>"
+msgid "Direct IM with %s closed"
 msgstr "<HR><B>%s 鞠秘欺 %s%s。</B><BR><HR>"
 
-#: src/oscar.c:2241
+#: src/oscar.c:2342
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "音嬬鞠村欺 AIM"
 
-#: src/oscar.c:2251
+#: src/oscar.c:2352
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1470,17 +1500,17 @@
 "continue?"
 msgstr ""
 
-#: src/oscar.c:2268
+#: src/oscar.c:2369
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "壙扮宣蝕佚連"
 
-#: src/oscar.c:2276
+#: src/oscar.c:2377
 #, fuzzy
 msgid "Direct IM"
 msgstr "侖兆仇峽村"
 
-#: src/oscar.c:2468
+#: src/oscar.c:2569
 msgid ""
 "Unfortunately, currently Oscar only allows new user registration by going to "
 "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
@@ -1488,558 +1518,618 @@
 msgstr ""
 
 #. Below is basically stolen from plugins.c
-#: src/perl.c:638
+#: src/perl.c:647
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - 譜協喘薩彿創"
 
-#: src/perl.c:686
+#: src/perl.c:695
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:105
+#: src/plugins.c:107
 msgid "Gaim - Plugin List"
 msgstr "Gaim - 峨周双燕"
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:216
+#: src/plugins.c:188 src/plugins.c:194 src/plugins.c:218
 msgid "Plugin Error"
 msgstr "峨周危列"
 
-#: src/plugins.c:272
+#: src/plugins.c:274
 msgid "Gaim - Plugins"
 msgstr "Gaim - 峨周"
 
 #. Build the bottom button bar
-#: src/plugins.c:301
+#: src/plugins.c:303
 msgid "Load Plugin"
 msgstr "墮秘峨周"
 
-#: src/plugins.c:307
+#: src/plugins.c:309
 msgid "Configure Plugin"
 msgstr "譜協峨周"
 
-#: src/plugins.c:313
+#: src/plugins.c:315
 msgid "Unload Plugin"
 msgstr "亢墮峨周"
 
-#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
-#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
-#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1762
+#: src/prefs.c:196 src/prefs.c:338 src/prefs.c:437 src/prefs.c:638
+#: src/prefs.c:1143 src/prefs.c:1378 src/prefs.c:1589 src/prefs.c:1967
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:126
-msgid "Use borderless buttons (requires restart for some buttons)"
+#: src/prefs.c:208
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/prefs.c:216
+msgid "Use borderless buttons"
 msgstr ""
 
-#: src/prefs.c:128
-msgid "Show Buddy Ticker after restart"
-msgstr ""
-
-#: src/prefs.c:132
+#: src/prefs.c:221
+#, fuzzy
+msgid "Show Buddy Ticker"
+msgstr "�幣涛嗔窃艶夕侘"
+
+#: src/prefs.c:227
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:144
+#: src/prefs.c:231
 #, fuzzy
-msgid "Report Idle Times:"
+msgid "Report Idle Times"
 msgstr "�幣腎廬扮寂"
 
-#: src/prefs.c:147
+#: src/prefs.c:239
 msgid "None"
 msgstr ""
 
-#: src/prefs.c:148
+#: src/prefs.c:240
 msgid "GAIM Use"
 msgstr "GAIM 聞喘"
 
-#: src/prefs.c:150
+#: src/prefs.c:242
 #, fuzzy
 msgid "X Use"
 msgstr "GAIM 聞喘"
 
-#: src/prefs.c:224
-#, fuzzy
-msgid "Browser Options"
-msgstr "僉�"
-
-#: src/prefs.c:236
-msgid "Netscape"
-msgstr ""
-
-#: src/prefs.c:237
-msgid "KFM"
-msgstr ""
-
-#: src/prefs.c:239
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:241
-msgid "Manual"
-msgstr "喘薩返過"
-
-#: src/prefs.c:252
-msgid "Pop up new window by default"
-msgstr "髪福起竃仟完笥"
-
-#: src/prefs.c:279
-#, fuzzy
-msgid "Logging Options"
-msgstr "銭俊欺� %s\n"
-
-#: src/prefs.c:291
+#: src/prefs.c:253
 #, fuzzy
 msgid "Log all conversations"
 msgstr "芝村侭嗤斤三坪否"
 
-#: src/prefs.c:292
+#: src/prefs.c:254
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "賠茅芝村猟周坪議 HTML 炎芝"
 
-#: src/prefs.c:298
+#: src/prefs.c:260
 msgid "Log when buddies sign on/sign off"
 msgstr ""
 
-#: src/prefs.c:299
+#: src/prefs.c:261
 msgid "Log when buddies become idle/un-idle"
 msgstr ""
 
-#: src/prefs.c:300
+#: src/prefs.c:262
 msgid "Log when buddies go away/come back"
 msgstr ""
 
-#: src/prefs.c:301
-msgid "Log your own signons/idleness/awayness (as set by options above)"
+#: src/prefs.c:263
+msgid "Log your own signons/idleness/awayness"
 msgstr ""
 
-#: src/prefs.c:302
+#: src/prefs.c:264
 msgid "Individual log file for each buddy's signons"
 msgstr ""
 
-#: src/prefs.c:317
+#: src/prefs.c:266
+msgid "Browser"
+msgstr "箝誓匂"
+
+#: src/prefs.c:278
+msgid "KFM"
+msgstr ""
+
+#: src/prefs.c:279
+msgid "Netscape"
+msgstr ""
+
+#: src/prefs.c:282
+msgid "Pop up new window by default"
+msgstr "髪福起竃仟完笥"
+
+#: src/prefs.c:289
+msgid "GNOME URL Handler"
+msgstr ""
+
+#: src/prefs.c:291
+msgid "Manual"
+msgstr "喘薩返過"
+
+#: src/prefs.c:330
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "涛嗔双燕"
 
-#: src/prefs.c:329
-#, fuzzy
-msgid "Save Window Size/Position"
-msgstr "隠贋蝶乂完笥寄弌才了崔"
-
-#: src/prefs.c:331
-#, fuzzy
-msgid "Automatically show buddy list on sign on"
-msgstr "徭強�幣涛嗔双燕"
-
-#: src/prefs.c:333
+#: src/prefs.c:342
 #, fuzzy
-msgid "Display Buddy List near applet"
-msgstr "壓 applet 現除�幣涛嗔双燕"
-
-#: src/prefs.c:340
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:341
-msgid "Show numbers in groups"
-msgstr "壓怏戦�幣催鷹"
-
-#: src/prefs.c:347
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "�幣涛嗔窃艶夕侘"
-
-#: src/prefs.c:348
-msgid "Show warning levels"
-msgstr ""
-
-#: src/prefs.c:349
-msgid "Show idle times"
-msgstr "�幣腎廬扮寂"
-
-#: src/prefs.c:355
+msgid "Buddy List Window"
+msgstr "涛嗔双燕"
+
+#: src/prefs.c:354
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
 #: src/prefs.c:356
+#, fuzzy
+msgid "Automatically show buddy list on sign on"
+msgstr "徭強�幣涛嗔双燕"
+
+#: src/prefs.c:359
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "隠贋蝶乂完笥寄弌才了崔"
+
+#: src/prefs.c:365
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:371
-msgid "Conversation Window Options"
+#: src/prefs.c:370
+#, fuzzy
+msgid "Display Buddy List near applet"
+msgstr "壓 applet 現除�幣涛嗔双燕"
+
+#: src/prefs.c:373
+msgid "Group Displays"
+msgstr ""
+
+#: src/prefs.c:385
+msgid "Hide groups with no online buddies"
 msgstr ""
 
-#: src/prefs.c:383
+#: src/prefs.c:391
+msgid "Show numbers in groups"
+msgstr "壓怏戦�幣催鷹"
+
+#: src/prefs.c:393
+#, fuzzy
+msgid "Buddy Displays"
+msgstr "涛嗔双燕"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Show buddy type icons"
+msgstr "�幣涛嗔窃艶夕侘"
+
+#: src/prefs.c:406
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:412
+msgid "Show idle times"
+msgstr "�幣腎廬扮寂"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Conversation Options"
+msgstr "芝村侭嗤斤三坪否"
+
+#: src/prefs.c:441
+#, fuzzy
+msgid "Keyboard Options"
+msgstr "僉�"
+
+#: src/prefs.c:453
 msgid "Enter sends message"
 msgstr "補秘窟僕佚連"
 
-#: src/prefs.c:384
+#: src/prefs.c:454
 #, fuzzy
 msgid "Control-Enter sends message"
 msgstr "補秘窟僕佚連"
 
-#: src/prefs.c:385
+#: src/prefs.c:455
 msgid "Escape closes window"
 msgstr ""
 
-#: src/prefs.c:386
+#: src/prefs.c:461
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:387
+#: src/prefs.c:462
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:388
+#: src/prefs.c:463
 msgid "F2 toggles timestamp display"
 msgstr ""
 
-#: src/prefs.c:394
+#: src/prefs.c:465
+#, fuzzy
+msgid "Display and General Options"
+msgstr "僉�"
+
+#: src/prefs.c:477
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "�幣夕侘丶然 �編刮竣粁�"
 
-#: src/prefs.c:395
+#: src/prefs.c:478
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "壓佚連戦�幣扮寂"
 
-#: src/prefs.c:396
-#, fuzzy
-msgid "Ignore colors"
-msgstr "音尖序栖議冲弼"
-
-#: src/prefs.c:397
+#: src/prefs.c:479
 #, fuzzy
-msgid "Ignore font faces"
-msgstr "奐寄忖悶"
-
-#: src/prefs.c:398
-#, fuzzy
-msgid "Ignore font sizes"
-msgstr "奐寄忖悶"
-
-#: src/prefs.c:404
+msgid "Show URLs as links"
+msgstr "委 URL 參銭俊圭塀僕竃"
+
+#: src/prefs.c:480
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "徭強融竃憧危議汽簡"
 
-#: src/prefs.c:405
-#, fuzzy
-msgid "Show URLs as links"
-msgstr "委 URL 參銭俊圭塀僕竃"
-
-#: src/prefs.c:406
+#: src/prefs.c:481 src/prefs.c:1611
 msgid "Sending messages removes away status"
 msgstr "窟竃佚連扮徭強函�壙扮宣蝕彜蓑"
 
-#: src/prefs.c:447 src/prefs.c:540
-msgid "Pictures and Text"
-msgstr ""
-
-#: src/prefs.c:453 src/prefs.c:546
-msgid "Pictures Only"
-msgstr ""
-
-#: src/prefs.c:459 src/prefs.c:552
+#: src/prefs.c:482 src/prefs.c:1618
+#, fuzzy
+msgid "Queue new messages when away"
+msgstr "壙扮宣蝕扮�策待仟議斤三"
+
+#: src/prefs.c:488
+#, fuzzy
+msgid "Ignore colors"
+msgstr "音尖序栖議冲弼"
+
+#: src/prefs.c:489
 #, fuzzy
-msgid "Text Only"
-msgstr "猟忖冲弼"
-
-#: src/prefs.c:483
+msgid "Ignore font faces"
+msgstr "奐寄忖悶"
+
+#: src/prefs.c:490
+#, fuzzy
+msgid "Ignore font sizes"
+msgstr "奐寄忖悶"
+
+#: src/prefs.c:491
+#, fuzzy
+msgid "Ignore TiK Automated Messages"
+msgstr "幹恬佚連"
+
+#: src/prefs.c:492 src/prefs.c:1609
+msgid "Ignore new conversations when away"
+msgstr "壙扮宣蝕扮�策待仟議斤三"
+
+#: src/prefs.c:630
 #, fuzzy
 msgid "IM Options"
 msgstr "僉�"
 
-#: src/prefs.c:495
-#, fuzzy
-msgid "Show all conversations in one tabbed window"
-msgstr "壓住霧完笥�幣鞠村�鞠竃佚連"
-
-#: src/prefs.c:496
-#, fuzzy
-msgid "Show logins in window"
-msgstr "壓住霧完笥�幣鞠村�鞠竃佚連"
-
-#: src/prefs.c:502 src/prefs.c:593
+#: src/prefs.c:642
+msgid "IM Window"
+msgstr ""
+
+#: src/prefs.c:654 src/prefs.c:687
 #, fuzzy
 msgid "Show buttons as "
 msgstr "�幣夕侘梓泥"
 
-#: src/prefs.c:511 src/prefs.c:603
-msgid "Show larger entry box on new windows"
+#: src/prefs.c:658 src/prefs.c:691
+msgid "Pictures And Text"
+msgstr ""
+
+#: src/prefs.c:659 src/prefs.c:692
+msgid "Pictures"
 msgstr ""
 
-#: src/prefs.c:513 src/prefs.c:605
+#: src/prefs.c:660 src/prefs.c:693
+#, fuzzy
+msgid "Text"
+msgstr "間悶猟忖"
+
+#: src/prefs.c:670
+#, fuzzy
+msgid "Show all conversations in one tabbed window"
+msgstr "壓住霧完笥�幣鞠村�鞠竃佚連"
+
+#: src/prefs.c:671 src/prefs.c:704
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "辺欺佚連扮幅軟完笥"
 
-#: src/prefs.c:514 src/prefs.c:1509
-msgid "Ignore new conversations when away"
-msgstr "壙扮宣蝕扮�策待仟議斤三"
-
-#: src/prefs.c:516
+#: src/prefs.c:672
 #, fuzzy
-msgid "Ignore TiK Automated Messages"
-msgstr "幹恬佚連"
-
-#: src/prefs.c:574
-#, fuzzy
-msgid "Chat Options"
-msgstr "僉�"
-
-#: src/prefs.c:586
+msgid "Show logins in window"
+msgstr "壓住霧完笥�幣鞠村�鞠竃佚連"
+
+#: src/prefs.c:673 src/prefs.c:706
+msgid "Show larger entry box on new windows"
+msgstr ""
+
+#: src/prefs.c:675
+msgid "Group Chat Window"
+msgstr ""
+
+#: src/prefs.c:703
 #, fuzzy
 msgid "Show all chats in one tabbed window"
 msgstr "壓住霧完笥�幣鞠村�鞠竃佚連"
 
-#: src/prefs.c:587
+#: src/prefs.c:705
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
+#: src/prefs.c:708
+#, fuzzy
+msgid "Tabbed Window Options"
+msgstr "隠贋蝶乂完笥寄弌才了崔"
+
+#: src/prefs.c:720
+msgid "IM Tab Placement:"
+msgstr ""
+
+#: src/prefs.c:732 src/prefs.c:766
+msgid "Top"
+msgstr ""
+
+#: src/prefs.c:734 src/prefs.c:768
+msgid "Bottom"
+msgstr ""
+
+#: src/prefs.c:741 src/prefs.c:775
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:743 src/prefs.c:777
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:754
+msgid "Chat Tab Placement:"
+msgstr ""
+
+#: src/prefs.c:809 src/prefs.c:811 src/prefs.c:1014 src/prefs.c:1016
 msgid "Gaim Chat"
 msgstr "Gaim 祖爺"
 
-#: src/prefs.c:779 src/prefs.c:2241
+#: src/prefs.c:952 src/prefs.c:2458
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:797
+#: src/prefs.c:970
 msgid "Refresh"
 msgstr "泡仟"
 
-#: src/prefs.c:822
+#: src/prefs.c:995
 msgid "List of available chats"
 msgstr "�嗤祖爺双燕"
 
-#: src/prefs.c:832
+#: src/prefs.c:1005
 msgid "List of subscribed chats"
 msgstr "匡堋議祖爺双燕"
 
-#: src/prefs.c:962 src/prefs.c:2246
+#.
+#. text[0] = _("Chat Window");
+#. node = gtk_ctree_insert_node(GTK_CTREE(preftree), parent, NULL,
+#. text, 5, NULL, NULL, NULL, NULL, 0, 1);
+#. gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node, chat_page);
+#.
+#: src/prefs.c:1135 src/prefs.c:2453
 #, fuzzy
 msgid "Font Options"
 msgstr "僉�"
 
-#: src/prefs.c:976
+#: src/prefs.c:1149
 msgid "Underlined Text"
 msgstr "和紗�猟忖"
 
-#: src/prefs.c:977
+#: src/prefs.c:1150
 msgid "Strike Text"
 msgstr "皿渠議猟忖"
 
-#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
+#: src/prefs.c:1163 src/prefs.c:1181 src/prefs.c:1202
 #, fuzzy
 msgid "Select"
 msgstr "僉夲忖侏"
 
-#: src/prefs.c:1027
+#: src/prefs.c:1200
 msgid "Font Face for Text"
 msgstr "猟忖議忖侏"
 
-#: src/prefs.c:1042
+#: src/prefs.c:1215
 #, fuzzy
 msgid "Font Size for Text"
 msgstr "猟忖議忖侏"
 
-#: src/prefs.c:1067
+#: src/prefs.c:1291
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - 芝村斤三坪否"
+
+#: src/prefs.c:1326
+#, fuzzy
+msgid "Reset"
+msgstr "廣過"
+
+#: src/prefs.c:1331
+#, fuzzy
+msgid "Choose..."
+msgstr "購液"
+
+#: src/prefs.c:1370
 #, fuzzy
 msgid "Sound Options"
 msgstr "僉�"
 
-#: src/prefs.c:1079
+#: src/prefs.c:1398
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "涛嗔鞠村蕗"
 
-#: src/prefs.c:1080 src/prefs.c:1511
+#: src/prefs.c:1399 src/prefs.c:1610
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1081
+#: src/prefs.c:1405
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1146
-#, fuzzy
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - 芝村斤三坪否"
-
-#: src/prefs.c:1181
-#, fuzzy
-msgid "Reset"
-msgstr "廣過"
-
-#: src/prefs.c:1186
-#, fuzzy
-msgid "Choose..."
-msgstr "購液"
-
-#: src/prefs.c:1222
-#, fuzzy
-msgid "Sound Events"
-msgstr "蕗咄"
-
-#: src/prefs.c:1234
+#: src/prefs.c:1415
+#, c-format
+msgid ""
+"Command to play sound files\n"
+"(%s for filename; internal if empty)"
+msgstr ""
+
+#: src/prefs.c:1426
+msgid "Events"
+msgstr ""
+
+#: src/prefs.c:1434
 msgid "Sound when buddy logs in"
 msgstr "涛嗔鞠村蕗"
 
-#: src/prefs.c:1235
+#: src/prefs.c:1435
 msgid "Sound when buddy logs out"
 msgstr "涛嗔鞠竃蕗"
 
-#: src/prefs.c:1241
+#: src/prefs.c:1441
+#, fuzzy
+msgid "Sound when received message begins conversation"
+msgstr "窟竃佚連蕗"
+
+#: src/prefs.c:1442
 msgid "Sound when message is received"
 msgstr "辺欺佚連蕗"
 
-#: src/prefs.c:1242
-#, fuzzy
-msgid "Sound when message is first received"
-msgstr "辺欺佚連蕗"
-
-#: src/prefs.c:1243
+#: src/prefs.c:1443
 msgid "Sound when message is sent"
 msgstr "窟竃佚連蕗"
 
-#: src/prefs.c:1249
+#: src/prefs.c:1449
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "祖爺片戦�涛嗔序秘�宣蝕蕗"
 
-#: src/prefs.c:1250
+#: src/prefs.c:1450
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "祖爺片戦�涛嗔序秘�宣蝕蕗"
 
-#: src/prefs.c:1251
+#: src/prefs.c:1451
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "祖爺片嗤繁傍三蕗"
 
-#: src/prefs.c:1252
+#: src/prefs.c:1452
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "祖爺片嗤繁傍三蕗"
 
-#: src/prefs.c:1262
-#, c-format
-msgid "Command to play sound files (%s for filename; internal if empty)"
-msgstr ""
-
-#: src/prefs.c:1408 src/prefs.c:2273
+#: src/prefs.c:1581 src/prefs.c:2480
 #, fuzzy
 msgid "Away Messages"
 msgstr "仟議壙扮宣蝕佚連"
 
-#: src/prefs.c:1420
+#: src/prefs.c:1617
+msgid "Don't send auto-response"
+msgstr ""
+
+#: src/prefs.c:1628
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1641
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1654
+#, fuzzy
+msgid "Messages"
+msgstr "幹恬佚連"
+
+#: src/prefs.c:1666
 #, fuzzy
 msgid "Title"
 msgstr "猟周"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1670
 #, fuzzy
 msgid "Message"
 msgstr "幹恬佚連"
 
-#: src/prefs.c:1464
+#: src/prefs.c:1709
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1468
+#: src/prefs.c:1713
 #, fuzzy
 msgid "Make Away"
 msgstr "羨軸譜協葎壙扮宣蝕"
 
-#: src/prefs.c:1512
-msgid "Don't send auto-response"
-msgstr ""
-
-#: src/prefs.c:1522
-msgid "Auto Away after"
-msgstr ""
-
-#: src/prefs.c:1535
-msgid "minutes using"
-msgstr ""
-
-#: src/prefs.c:1754
+#: src/prefs.c:1959
 #, fuzzy
 msgid "Privacy Options"
 msgstr "僉�"
 
-#: src/prefs.c:1770
+#: src/prefs.c:1975
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1789
+#: src/prefs.c:1994
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1790
+#: src/prefs.c:1995
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1792
+#: src/prefs.c:1997
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1823
+#: src/prefs.c:2028
 #, fuzzy
 msgid "Deny all users"
 msgstr "詳蒸蝶乂繁"
 
-#: src/prefs.c:1824
+#: src/prefs.c:2029
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1826
+#: src/prefs.c:2031
 #, fuzzy
 msgid "Block List"
 msgstr "翠"
 
-#: src/prefs.c:1921
+#: src/prefs.c:2126
 msgid "Gaim - Preferences"
 msgstr "Gaim - 單枠譜協"
 
-#: src/prefs.c:2001
+#: src/prefs.c:2206
 msgid "GAIM debug output window"
 msgstr "GAIM 茅恰補竃完笥"
 
-#: src/prefs.c:2192
+#: src/prefs.c:2400
 msgid "General"
 msgstr "匯違譜協"
 
-#: src/prefs.c:2197
-msgid "Browser"
-msgstr "箝誓匂"
-
-#: src/prefs.c:2226
+#: src/prefs.c:2436
 #, fuzzy
 msgid "Conversations"
 msgstr "芝村侭嗤斤三坪否"
 
-#: src/prefs.c:2231
-msgid "IM Window"
+#: src/prefs.c:2441
+msgid "Windows"
 msgstr ""
 
-#: src/prefs.c:2236
-msgid "Chat Window"
-msgstr ""
-
-#: src/prefs.c:2257
+#: src/prefs.c:2469
 msgid "Sounds"
 msgstr "蕗咄"
 
-#: src/prefs.c:2262
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2284
+#: src/prefs.c:2491
 msgid "Privacy"
 msgstr ""
 
@@ -2093,11 +2183,32 @@
 msgid "Register new user for"
 msgstr ""
 
-#: src/server.c:608
+#: src/server.c:56
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
+msgstr ""
+
+#: src/server.c:58
+#, fuzzy
+msgid "Login Error"
+msgstr "峨周危列"
+
+#: src/server.c:463
+#, fuzzy, c-format
+msgid "(%d messages)"
+msgstr "窟竃佚連蕗"
+
+#: src/server.c:469
+#, fuzzy
+msgid "(1 message)"
+msgstr "剱萩佚連�"
+
+#: src/server.c:763
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:609
+#: src/server.c:764
 msgid "No"
 msgstr ""
 
@@ -2174,6 +2285,30 @@
 msgid "%s requests you to send them a file"
 msgstr "%s 萩箔低公麿断窟僕匯倖猟周"
 
+#, fuzzy
+#~ msgid "Browser Options"
+#~ msgstr "僉�"
+
+#, fuzzy
+#~ msgid "Logging Options"
+#~ msgstr "銭俊欺� %s\n"
+
+#, fuzzy
+#~ msgid "Text Only"
+#~ msgstr "猟忖冲弼"
+
+#, fuzzy
+#~ msgid "Chat Options"
+#~ msgstr "僉�"
+
+#, fuzzy
+#~ msgid "Sound Events"
+#~ msgstr "蕗咄"
+
+#, fuzzy
+#~ msgid "Sound when message is first received"
+#~ msgstr "辺欺佚連蕗"
+
 #~ msgid "Offline"
 #~ msgstr "宣�"