changeset 926:e62e9a78d98d

[gaim-migrate @ 936] Blah committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Mon, 18 Sep 2000 18:07:38 +0000
parents 1ff824e6bc19
children 9b04a3419351
files po/de.po po/es.po po/fr.po po/ko.po po/zh_CN.po
diffstat 5 files changed, 2202 insertions(+), 1962 deletions(-) [+]
line wrap: on
line diff
--- a/po/de.po	Mon Sep 18 10:43:38 2000 +0000
+++ b/po/de.po	Mon Sep 18 18:07:38 2000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2000-09-11 02:08-0700\n"
+"POT-Creation-Date: 2000-09-15 18:12-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"
@@ -28,72 +28,72 @@
 msgid "You must give your password"
 msgstr "Bitte geben Sie ein Passwort ein"
 
-#: src/aim.c:231 src/buddy.c:1790
+#: src/aim.c:231 src/buddy.c:1849
 msgid "Signoff"
 msgstr "Abmelden"
 
-#: src/aim.c:329 src/aim.c:575 src/buddy.c:308
+#: src/aim.c:334 src/aim.c:579 src/buddy.c:318
 msgid "Signon"
 msgstr "Los"
 
-#: src/aim.c:330 src/buddy_chat.c:127 src/buddy_chat.c:219 src/dialogs.c:418
-#: src/dialogs.c:717 src/dialogs.c:873 src/dialogs.c:949 src/dialogs.c:1065
-#: src/dialogs.c:1196 src/dialogs.c:1382 src/dialogs.c:1486 src/dialogs.c:1567
-#: src/dialogs.c:1811 src/dialogs.c:1998 src/dialogs.c:2163 src/dialogs.c:2256
-#: src/dialogs.c:2981 src/dialogs.c:3240 src/oscar.c:647 src/rvous.c:279
-#: src/rvous.c:416 src/rvous.c:637
+#: src/aim.c:335 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:419
+#: src/dialogs.c:720 src/dialogs.c:877 src/dialogs.c:954 src/dialogs.c:1071
+#: src/dialogs.c:1203 src/dialogs.c:1390 src/dialogs.c:1495 src/dialogs.c:1576
+#: src/dialogs.c:1821 src/dialogs.c:2009 src/dialogs.c:2175 src/dialogs.c:2270
+#: src/dialogs.c:2996 src/dialogs.c:3257 src/oscar.c:651 src/rvous.c:279
+#: src/rvous.c:416 src/rvous.c:638
 msgid "Cancel"
 msgstr "Ende"
 
-#: src/aim.c:331 src/buddy.c:1787
+#: src/aim.c:336 src/buddy.c:1846
 msgid "Register"
 msgstr "Neu"
 
-#: src/aim.c:332
+#: src/aim.c:337
 msgid "Options"
 msgstr "Einstellungen"
 
-#: src/aim.c:334 src/aim.c:581 src/buddy.c:1853
+#: src/aim.c:339 src/aim.c:585 src/buddy.c:1912
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:408
+#: src/aim.c:413
 msgid "Screen Name: "
 msgstr "Benutzername: "
 
-#: src/aim.c:411
+#: src/aim.c:416
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/aim.c:414
+#: src/aim.c:419
 msgid "Remember Password"
 msgstr "Passwort Speichern"
 
-#: src/aim.c:461
+#: src/aim.c:466
 msgid "Gaim - Login"
 msgstr "Gaim - Anmeldung"
 
-#: src/aim.c:570 src/buddy.c:1850
+#: src/aim.c:574 src/buddy.c:1909
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/away.c:88 src/away.c:202
+#: src/away.c:88 src/away.c:203
 msgid "Back"
 msgstr "Zurück"
 
-#: src/away.c:98
+#: src/away.c:99
 msgid "I'm Back!"
 msgstr "Ich bin zurück"
 
-#: src/away.c:140
+#: src/away.c:141
 msgid "Gaim - Away!"
 msgstr "Gaim - Abwesenheit!"
 
-#: src/away.c:243 src/gnome_applet_mgr.c:198
+#: src/away.c:244 src/gnome_applet_mgr.c:198
 msgid "New Away Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/away.c:262
+#: src/away.c:263
 msgid "Remove Away Message"
 msgstr "Abwesenheits-Mitteilung löschen"
 
@@ -103,108 +103,109 @@
 msgstr "%d/%d Buddies Online"
 
 #. Put the buttons in the box
-#: src/buddy.c:250 src/buddy.c:1922 src/conversation.c:447
-#: src/conversation.c:1664 src/dialogs.c:871 src/dialogs.c:948
-#: src/dialogs.c:1810 src/dialogs.c:1832 src/dialogs.c:3238 src/prefs.c:587
-#: src/prefs.c:901 src/prefs.c:1358
+#: src/buddy.c:259 src/buddy.c:1981 src/buddy_chat.c:816
+#: src/conversation.c:440 src/conversation.c:1650 src/dialogs.c:875
+#: src/dialogs.c:953 src/dialogs.c:1820 src/dialogs.c:1842 src/dialogs.c:3255
+#: src/prefs.c:628 src/prefs.c:1069 src/prefs.c:1526
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/buddy.c:251 src/buddy.c:1923 src/dialogs.c:881 src/dialogs.c:964
+#: src/buddy.c:260 src/buddy.c:1982 src/dialogs.c:885 src/dialogs.c:969
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:252 src/buddy.c:1924 src/conversation.c:1662 src/dialogs.c:780
-#: src/prefs.c:591 src/prefs.c:902 src/prefs.c:1370
+#: src/buddy.c:261 src/buddy.c:1983 src/buddy_chat.c:818
+#: src/conversation.c:1648 src/dialogs.c:783 src/prefs.c:632 src/prefs.c:1070
+#: src/prefs.c:1538
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/buddy.c:255 src/buddy.c:1696
+#: src/buddy.c:264 src/buddy.c:1753
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:256 src/buddy.c:395 src/buddy.c:1694 src/buddy_chat.c:545
+#: src/buddy.c:265 src/buddy.c:405 src/buddy.c:1751 src/buddy_chat.c:543
 msgid "IM"
 msgstr "Telegramm"
 
-#: src/buddy.c:257 src/buddy.c:401 src/buddy.c:1695 src/buddy_chat.c:547
-#: src/conversation.c:1658 src/rvous.c:635
+#: src/buddy.c:266 src/buddy.c:411 src/buddy.c:1752 src/buddy_chat.c:545
+#: src/buddy_chat.c:824 src/conversation.c:1644 src/rvous.c:636
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:407 src/dialogs.c:3252
+#: src/buddy.c:417 src/dialogs.c:3269
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:414
+#: src/buddy.c:424
 msgid "Dir Info"
 msgstr "Profil"
 
-#: src/buddy.c:421
+#: src/buddy.c:431
 #, fuzzy
 msgid "Direct IM"
 msgstr "Profil"
 
-#: src/buddy.c:427
+#: src/buddy.c:437
 msgid "Away Msg"
 msgstr "Abwesenht."
 
-#: src/buddy.c:434
+#: src/buddy.c:444
 msgid "Toggle Logging"
 msgstr "Mitschnitt ein"
 
-#: src/buddy.c:440
+#: src/buddy.c:450
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alert Hinzufügen"
 
-#: src/buddy.c:1204
+#: src/buddy.c:1246
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alert"
 
-#: src/buddy.c:1222
+#: src/buddy.c:1264
 msgid "Remove Buddy Pounce"
 msgstr "Lösche Buddy-Alert"
 
-#: src/buddy.c:1297
+#: src/buddy.c:1352
 #, fuzzy, c-format
 msgid "%sBuddy Icon"
 msgstr "Buddy-Alert"
 
-#: src/buddy.c:1300
+#: src/buddy.c:1355
 #, c-format
 msgid "%sVoice"
 msgstr ""
 
-#: src/buddy.c:1303
+#: src/buddy.c:1358
 #, c-format
 msgid "%sIM Image"
 msgstr ""
 
-#: src/buddy.c:1306
+#: src/buddy.c:1361
 #, c-format
 msgid "%sChat"
 msgstr ""
 
-#: src/buddy.c:1309
+#: src/buddy.c:1364
 #, c-format
 msgid "%sGet File"
 msgstr ""
 
-#: src/buddy.c:1312
+#: src/buddy.c:1367
 #, c-format
 msgid "%sSend File"
 msgstr ""
 
-#: src/buddy.c:1367
+#: src/buddy.c:1422
 msgid "Warnings: %d%%\n"
 msgstr "Warnungen: %d%%\n"
 
-#: src/buddy.c:1373
+#: src/buddy.c:1428
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1377
+#: src/buddy.c:1432
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -216,372 +217,373 @@
 "Angemeldet seit: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1377
+#: src/buddy.c:1432
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-#: src/buddy.c:1422
+#: src/buddy.c:1477
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr ""
 
-#: src/buddy.c:1563
+#: src/buddy.c:1620
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr ""
 
-#: src/buddy.c:1721
+#: src/buddy.c:1778
 msgid "Information on selected Buddy"
 msgstr "Info über gewählten Buddy"
 
-#: src/buddy.c:1722 src/dialogs.c:708
+#: src/buddy.c:1779 src/dialogs.c:711
 msgid "Send Instant Message"
 msgstr "Telegramm"
 
-#: src/buddy.c:1723
+#: src/buddy.c:1780
 msgid "Start/join a Buddy Chat"
 msgstr "Chat starten"
 
-#: src/buddy.c:1774
+#: src/buddy.c:1833
 msgid "File"
 msgstr "Datei"
 
-#: src/buddy.c:1778 src/buddy.c:1779
+#: src/buddy.c:1837 src/buddy.c:1838
 msgid "Add A Buddy"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:1780
+#: src/buddy.c:1839
 msgid "Join A Chat"
 msgstr ""
 
-#: src/buddy.c:1782
+#: src/buddy.c:1841
 msgid "Import Buddy List"
 msgstr "Buddy-Liste importieren"
 
-#: src/buddy.c:1783
+#: src/buddy.c:1842
 msgid "Export Buddy List"
 msgstr "Buddy-Liste exportieren"
 
-#: src/buddy.c:1793
+#: src/buddy.c:1852
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/buddy.c:1795 src/buddy_chat.c:539 src/buddy_chat.c:787
-#: src/conversation.c:1660 src/dialogs.c:495 src/plugins.c:317
-#: src/prefs.c:1597
+#: src/buddy.c:1854 src/buddy_chat.c:537 src/buddy_chat.c:791
+#: src/buddy_chat.c:812 src/conversation.c:1646 src/dialogs.c:496
+#: src/plugins.c:318 src/prefs.c:1768
 msgid "Close"
 msgstr "Schließen"
 
-#: src/buddy.c:1800
+#: src/buddy.c:1859
 msgid "Tools"
 msgstr "Tools"
 
-#: src/buddy.c:1805 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:1864 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
 msgid "Away"
 msgstr "Abwesenheit"
 
-#: src/buddy.c:1810
+#: src/buddy.c:1869
 msgid "Buddy Pounce"
 msgstr "Buddy-Alert"
 
-#: src/buddy.c:1818 src/dialogs.c:1992 src/dialogs.c:2148
+#: src/buddy.c:1877 src/dialogs.c:2003 src/dialogs.c:2160
 msgid "Search for Buddy"
 msgstr "Buddies suchen"
 
-#: src/buddy.c:1821
+#: src/buddy.c:1880
 msgid "by Email"
 msgstr "nach Email"
 
-#: src/buddy.c:1825
+#: src/buddy.c:1884
 msgid "by Dir Info"
 msgstr "nach Profil"
 
-#: src/buddy.c:1832 src/buddy.c:1833
+#: src/buddy.c:1891 src/buddy.c:1892
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/buddy.c:1836
+#: src/buddy.c:1895
 msgid "User Info"
 msgstr "Benutzer-Info"
 
-#: src/buddy.c:1840 src/dialogs.c:1190
+#: src/buddy.c:1899 src/dialogs.c:1197
 msgid "Directory Info"
 msgstr "Profil"
 
-#: src/buddy.c:1844 src/dialogs.c:1376
+#: src/buddy.c:1903 src/dialogs.c:1384
 msgid "Change Password"
 msgstr ""
 
-#: src/buddy.c:1858
+#: src/buddy.c:1917
 #, fuzzy
 msgid "Perl"
 msgstr "Zulassen"
 
-#: src/buddy.c:1861
+#: src/buddy.c:1920
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1865
+#: src/buddy.c:1924
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1869
+#: src/buddy.c:1928
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1877
+#: src/buddy.c:1936
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/buddy.c:1882
+#: src/buddy.c:1941
 #, fuzzy
 msgid "About Gaim"
 msgstr "Info Über"
 
-#: src/buddy.c:1901 src/prefs.c:1794
+#: src/buddy.c:1960 src/prefs.c:1990
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: src/buddy.c:1953
+#: src/buddy.c:2012
 msgid "Add a new Buddy"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:1954
+#: src/buddy.c:2013
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:1955
+#: src/buddy.c:2014
 msgid "Remove selected Buddy"
 msgstr "Gewählten Buddy entfernen"
 
-#: src/buddy.c:1980
+#: src/buddy.c:2039
 msgid "Online"
 msgstr "Online"
 
-#: src/buddy.c:1982
+#: src/buddy.c:2041
 msgid "Edit Buddies"
 msgstr "Budies bearbeiten"
 
-#: src/buddy.c:2019
+#: src/buddy.c:2078
 msgid "Gaim - Buddy List"
 msgstr "gAIM - Buddy-Liste"
 
-#: src/buddy_chat.c:124 src/buddy_chat.c:729 src/buddy_chat.c:741
+#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
 msgid "Buddy Chat"
 msgstr "Buddy-Chat"
 
-#: src/buddy_chat.c:126
+#: src/buddy_chat.c:123
 msgid "Join"
 msgstr "Teilnehmen"
 
-#: src/buddy_chat.c:132
+#: src/buddy_chat.c:129
 msgid "Join what group:"
 msgstr "An wlecher Gruppe teinlnehmen:"
 
-#: src/buddy_chat.c:138
+#: src/buddy_chat.c:135
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:146
+#: src/buddy_chat.c:143
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:175
+#: src/buddy_chat.c:172
 msgid "Join Chat"
 msgstr ""
 
-#: src/buddy_chat.c:220 src/buddy_chat.c:541 src/buddy_chat.c:786
+#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/buddy_chat.c:237
+#: src/buddy_chat.c:234
 msgid "Invite who?"
 msgstr "Wen einladen"
 
-#: src/buddy_chat.c:241
+#: src/buddy_chat.c:238
 msgid "With message:"
 msgstr "Mit Nachricht:"
 
-#: src/buddy_chat.c:268
+#: src/buddy_chat.c:265
 msgid "Invite to Buddy Chat"
 msgstr "Zum Buddy-Chat einladen"
 
-#: src/buddy_chat.c:427
+#: src/buddy_chat.c:424
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:455
+#: src/buddy_chat.c:452
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:542 src/buddy_chat.c:785
+#: src/buddy_chat.c:540 src/buddy_chat.c:789
 msgid "Whisper"
 msgstr "Flüstern"
 
-#: src/buddy_chat.c:543 src/buddy_chat.c:784 src/conversation.c:1657
-#: src/dialogs.c:1568
+#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
+#: src/conversation.c:1643 src/dialogs.c:1577
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:546
+#: src/buddy_chat.c:544
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: src/conversation.c:181
+#: src/buddy_chat.c:820 src/conversation.c:1651
+msgid "Block"
+msgstr "Sperren"
+
+#: src/buddy_chat.c:822 src/conversation.c:1645 src/dialogs.c:415
+#: src/dialogs.c:417 src/rvous.c:637
+msgid "Warn"
+msgstr "Warnen"
+
+#: src/conversation.c:171
 #, c-format
 msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
 msgstr ""
 
-#: src/conversation.c:188
+#: src/conversation.c:178
 #, c-format
 msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
 msgstr ""
 
-#: src/conversation.c:442
+#: src/conversation.c:435
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr ""
 
-#: src/conversation.c:695
+#: src/conversation.c:688
 msgid "Message too long, some data truncated."
 msgstr "Nachricht zu lange. Sie wurde gekürzt."
 
-#: src/conversation.c:695 src/dialogs.c:2709 src/dialogs.c:2779
+#: src/conversation.c:688 src/dialogs.c:2723 src/dialogs.c:2793
 #: src/rvous.c:221 src/rvous.c:492
 msgid "Error"
 msgstr "Fehler"
 
-#: src/conversation.c:883
+#: src/conversation.c:875
 #, c-format
 msgid "Currently at %d, "
 msgstr ""
 
-#: src/conversation.c:892
+#: src/conversation.c:884
 #, c-format
 msgid "Setting position to %d\n"
 msgstr ""
 
-#: src/conversation.c:1489
+#: src/conversation.c:1481
 msgid "Bold"
 msgstr "Fetter"
 
-#: src/conversation.c:1489 src/prefs.c:1085
+#: src/conversation.c:1481 src/prefs.c:1253
 msgid "Bold Text"
 msgstr "Fetter Text"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1485 src/conversation.c:1486
 msgid "Italics"
 msgstr "Kursiver"
 
-#: src/conversation.c:1493 src/prefs.c:1086
+#: src/conversation.c:1485 src/prefs.c:1254
 msgid "Italics Text"
 msgstr "Kursiver Text"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1489 src/conversation.c:1490
 msgid "Underline"
 msgstr "Unterstrichener"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1489
 msgid "Underline Text"
 msgstr "Unterstrichener Text"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1493 src/conversation.c:1494
 msgid "Strike"
 msgstr "Durchgestrichener through"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1493
 msgid "Strike through Text"
 msgstr "Durchgestrichener through Text"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1497
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:1505
+#: src/conversation.c:1497
 msgid "Decrease font size"
 msgstr "Schrift kleiner"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1500
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1500
 msgid "Normal font size"
 msgstr "Schrift normal"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1503
 msgid "Big"
 msgstr "Groß"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1503
 msgid "Increase font size"
 msgstr "Schrift größer"
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1510 src/conversation.c:1511
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/conversation.c:1518 src/dialogs.c:2608 src/dialogs.c:2624
+#: src/conversation.c:1510 src/dialogs.c:2622 src/dialogs.c:2638
 msgid "Select Font"
 msgstr "Schriftart wählen "
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1514 src/conversation.c:1515 src/conversation.c:1518
+#: src/conversation.c:1519
 msgid "Color"
 msgstr "Farbe"
 
-#: src/conversation.c:1522 src/prefs.c:1099
+#: src/conversation.c:1514 src/prefs.c:1267
 msgid "Text Color"
 msgstr "Text-Farbe"
 
-#: src/conversation.c:1526 src/prefs.c:1116
+#: src/conversation.c:1518 src/prefs.c:1284
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1525 src/conversation.c:1526
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:1533 src/dialogs.c:2250
+#: src/conversation.c:1525 src/dialogs.c:2264
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1529
 #, fuzzy
 msgid "Smiley"
 msgstr "Datei"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1529
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1536 src/conversation.c:1537
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1536
 msgid "Enable logging"
 msgstr "Mitschnitt ein"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1540 src/conversation.c:1541
 msgid "Sound"
 msgstr "Klänge"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1540
 msgid "Enable sounds"
 msgstr "Klänge aktivieren"
 
-#: src/conversation.c:1659 src/dialogs.c:414 src/dialogs.c:416 src/rvous.c:636
-msgid "Warn"
-msgstr "Warnen"
-
-#: src/conversation.c:1665
-msgid "Block"
-msgstr "Sperren"
-
 #: src/dialogs.c:224
 msgid "Error Resolving Mail Server.\n"
 msgstr "Konnte Mail-Server nicht finden.\n"
@@ -590,131 +592,131 @@
 msgid "Error Connecting to Socket.\n"
 msgstr "Fehler beim Verbinden mit Socket.\n"
 
-#: src/dialogs.c:431
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Wollen Sie %s wirklich verwarnen?"
 
-#: src/dialogs.c:435
+#: src/dialogs.c:436
 msgid "Warn anonymously?"
 msgstr "Anonym warnen?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:439
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyme Warnungen sind weniger wirkungsvoll"
 
-#: src/dialogs.c:463
+#: src/dialogs.c:464
 msgid "Gaim - Warn user?"
 msgstr "gAIM - Benutzer warnen?"
 
-#: src/dialogs.c:531
+#: src/dialogs.c:532
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Konnte Datei %s nicht schrieben."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:535
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Konnte Datei %s nicht lesen."
 
-#: src/dialogs.c:537
+#: src/dialogs.c:538
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Nachricht zu lange, letzten %s Bytes abgeschnitten."
 
-#: src/dialogs.c:540
+#: src/dialogs.c:541
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ist zur Zeit nicht online."
 
-#: src/dialogs.c:543
+#: src/dialogs.c:544
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Verwarnung von %s nicht erlaubt."
 
-#: src/dialogs.c:546
+#: src/dialogs.c:547
 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:549
+#: src/dialogs.c:550
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s ist nicht verfügbar."
 
-#: src/dialogs.c:552
+#: src/dialogs.c:553
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: src/dialogs.c:555
+#: src/dialogs.c:556
 #, 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:558
+#: src/dialogs.c:559
 #, 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:561
+#: src/dialogs.c:562
 msgid "Failure."
 msgstr "Fehler."
 
-#: src/dialogs.c:564
+#: src/dialogs.c:565
 msgid "Too many matches."
 msgstr "Zu viele Übereinstimmungen."
 
-#: src/dialogs.c:567
+#: src/dialogs.c:568
 msgid "Need more qualifiers."
 msgstr "Benötige mehr Angaben."
 
-#: src/dialogs.c:570
+#: src/dialogs.c:571
 msgid "Dir service temporarily unavailable."
 msgstr "Profil-Service ist zur Zeit nicht verfügbar."
 
-#: src/dialogs.c:573
+#: src/dialogs.c:574
 msgid "Email lookup restricted."
 msgstr "eMail-Suche eingeschränkt."
 
-#: src/dialogs.c:576
+#: src/dialogs.c:577
 msgid "Keyword ignored."
 msgstr "Stichwort ignoriert."
 
-#: src/dialogs.c:579
+#: src/dialogs.c:580
 msgid "No keywords."
 msgstr "Keine Stichwörter."
 
-#: src/dialogs.c:582
+#: src/dialogs.c:583
 msgid "User has no directory information."
 msgstr "Der Benutzer hat kein Profil."
 
-#: src/dialogs.c:586
+#: src/dialogs.c:587
 msgid "Country not supported."
 msgstr "Land nicht unterstützt."
 
-#: src/dialogs.c:589
+#: src/dialogs.c:590
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Unbekannter Fehler: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:592 src/oscar.c:315
+#: src/dialogs.c:593 src/oscar.c:318
 msgid "Incorrect nickname or password."
 msgstr "Ungülter Benutzername oder Passwort."
 
-#: src/dialogs.c:595
+#: src/dialogs.c:596
 msgid "The service is temporarily unavailable."
 msgstr "Der Service ist zur Zeit nicht erreichbar."
 
-#: src/dialogs.c:598
+#: src/dialogs.c:599
 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:601
+#: src/dialogs.c:602
 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."
@@ -722,271 +724,271 @@
 "Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
 "versuchen Sie es noch einmal."
 
-#: src/dialogs.c:604
+#: src/dialogs.c:605
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Unbekannter Anmeldungsfehler: %s."
 
-#: src/dialogs.c:607
+#: src/dialogs.c:608
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Unbekannter Fehler: %d. Info: %s"
 
-#: src/dialogs.c:610
+#: src/dialogs.c:611
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "gAIM - Fehler %d"
 
 #. Build OK Button
-#: src/dialogs.c:649 src/dialogs.c:712 src/dialogs.c:1060 src/dialogs.c:1381
-#: src/dialogs.c:1665 src/dialogs.c:1997 src/dialogs.c:2158 src/dialogs.c:2255
+#: src/dialogs.c:650 src/dialogs.c:715 src/dialogs.c:1066 src/dialogs.c:1389
+#: src/dialogs.c:1675 src/dialogs.c:2008 src/dialogs.c:2170 src/dialogs.c:2269
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:722
+#: src/dialogs.c:725
 msgid "IM who: "
 msgstr "Telegramm an:"
 
-#: src/dialogs.c:746
+#: src/dialogs.c:749
 msgid "Gaim - IM user"
 msgstr "gAIM - Telegramm"
 
-#: src/dialogs.c:828
+#: src/dialogs.c:831
 msgid "Buddies"
 msgstr "Buddies"
 
-#: src/dialogs.c:879
+#: src/dialogs.c:883
 #, fuzzy
 msgid "Add Group"
 msgstr "Gruppe"
 
-#: src/dialogs.c:909
+#: src/dialogs.c:913
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "gAIM - Buddy hinzufügen"
 
-#: src/dialogs.c:955
+#: src/dialogs.c:960
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
 
-#: src/dialogs.c:957 src/dialogs.c:3248
+#: src/dialogs.c:962 src/dialogs.c:3265
 msgid "Buddy"
 msgstr "Buddy"
 
-#: src/dialogs.c:996
+#: src/dialogs.c:1001
 msgid "Gaim - Add Buddy"
 msgstr "gAIM - Buddy hinzufügen"
 
 #. Put the buttons in the box
-#: src/dialogs.c:1071
+#: src/dialogs.c:1077
 msgid "Buddy To Pounce:"
 msgstr "Buddy-Alert für:"
 
-#: src/dialogs.c:1076
+#: src/dialogs.c:1082
 msgid "Open IM Window on Buddy Logon"
 msgstr "Öffne Telegrammfenster wenn Buddy sich anmeldet"
 
-#: src/dialogs.c:1079
+#: src/dialogs.c:1085
 msgid "Send IM on Buddy Logon"
 msgstr "Schicke Telegramm wenn Buddy sich anmeldet"
 
-#: src/dialogs.c:1087
+#: src/dialogs.c:1093
 msgid "Message to send:"
 msgstr "Nachricht:"
 
-#: src/dialogs.c:1108
+#: src/dialogs.c:1114
 msgid "Gaim - New Buddy Pounce"
 msgstr "gAIM - Neuer Buddy-Alert"
 
 #. Build Save Button
-#: src/dialogs.c:1194 src/dialogs.c:1485 src/dialogs.c:2976
+#: src/dialogs.c:1201 src/dialogs.c:1494 src/dialogs.c:2991
 msgid "Save"
 msgstr "Speichern"
 
-#: src/dialogs.c:1212
+#: src/dialogs.c:1219
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Ermöglicht Personen Ihr Profil im Web zu finden"
 
 #. Line 1
-#: src/dialogs.c:1215 src/dialogs.c:2015
+#: src/dialogs.c:1222 src/dialogs.c:2026
 msgid "First Name"
 msgstr "Vorname"
 
 #. Line 2
-#: src/dialogs.c:1226 src/dialogs.c:2027
+#: src/dialogs.c:1233 src/dialogs.c:2038
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
 #. Line 3
-#: src/dialogs.c:1238 src/dialogs.c:2039
+#: src/dialogs.c:1245 src/dialogs.c:2050
 msgid "Last Name"
 msgstr "Nachname"
 
 #. Line 4
-#: src/dialogs.c:1249 src/dialogs.c:2051
+#: src/dialogs.c:1256 src/dialogs.c:2062
 msgid "Maiden Name"
 msgstr "Mädchenname"
 
 #. Line 5
-#: src/dialogs.c:1260 src/dialogs.c:2063
+#: src/dialogs.c:1267 src/dialogs.c:2074
 msgid "City"
 msgstr "Stadt"
 
 #. Line 6
-#: src/dialogs.c:1271 src/dialogs.c:2074
+#: src/dialogs.c:1278 src/dialogs.c:2085
 msgid "State"
 msgstr "Provinz/Bundesland"
 
 #. Line 7
-#: src/dialogs.c:1282 src/dialogs.c:2085
+#: src/dialogs.c:1289 src/dialogs.c:2096
 msgid "Country"
 msgstr "Land"
 
-#: src/dialogs.c:1327
+#: src/dialogs.c:1334
 msgid "Gaim - Set Dir Info"
 msgstr "gAIM - Profil anlegen"
 
-#: src/dialogs.c:1344
+#: src/dialogs.c:1351
 msgid "New Passwords Do Not Match"
 msgstr "Die neuen Passwörter stimmen nicht überein"
 
-#: src/dialogs.c:1344 src/dialogs.c:1349
+#: src/dialogs.c:1351 src/dialogs.c:1356
 msgid "Gaim - Change Password Error"
 msgstr "gAIM - Fehler Passwort ändern"
 
-#: src/dialogs.c:1349
+#: src/dialogs.c:1356
 msgid "Fill out all fields completely"
 msgstr "Bitte alle Felder komplett ausfüllen"
 
-#: src/dialogs.c:1390
+#: src/dialogs.c:1398
 msgid "Original Password"
 msgstr "Altes Passwort"
 
-#: src/dialogs.c:1406
+#: src/dialogs.c:1414
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: src/dialogs.c:1420
+#: src/dialogs.c:1428
 msgid "New Password (again)"
 msgstr "Neues Passwort (Wiederholen)"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1465
 msgid "Gaim - Password Change"
 msgstr "gAIM - Password Änderung"
 
-#: src/dialogs.c:1519
+#: src/dialogs.c:1528
 msgid "Gaim - Set User Info"
 msgstr "gAIM - Mitgliederinfo"
 
-#: src/dialogs.c:1674
+#: src/dialogs.c:1684
 msgid "Below are the results of your search: "
 msgstr "Das Resultat Ihrer Suche:"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1816
 #, fuzzy
 msgid "Permit / Deny"
 msgstr "Bestimmte zulassen"
 
-#: src/dialogs.c:1817 src/prefs.c:391
+#: src/dialogs.c:1827 src/prefs.c:432
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: src/dialogs.c:1822 src/prefs.c:375 src/prefs.c:432
+#: src/dialogs.c:1832 src/prefs.c:416 src/prefs.c:473
 msgid "Permit"
 msgstr "Zulassen"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1873
 msgid "Gaim - Add Permit/Deny"
 msgstr "gAIM - Sperren/Zulassen hinzufügen"
 
-#: src/dialogs.c:1917
+#: src/dialogs.c:1927
 msgid "Gaim - Log Conversation"
 msgstr "gAIM - Telegramm-Mitschnitt"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2133
 msgid "Gaim - Find Buddy By Info"
 msgstr "gAIM - Buddy nach Profil finden"
 
-#: src/dialogs.c:2168
+#: src/dialogs.c:2180
 msgid "Email"
 msgstr "eMail"
 
-#: src/dialogs.c:2187
+#: src/dialogs.c:2199
 msgid "Gaim - Find Buddy By Email"
 msgstr "gAIM - Buddy nach eMail-Adresse suchen"
 
-#: src/dialogs.c:2269
+#: src/dialogs.c:2283
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2277
+#: src/dialogs.c:2291
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/dialogs.c:2303
+#: src/dialogs.c:2317
 msgid "GAIM - Add URL"
 msgstr "gAIM - Url hinzufügen"
 
-#: src/dialogs.c:2446 src/dialogs.c:2459 src/dialogs.c:2496
+#: src/dialogs.c:2460 src/dialogs.c:2473 src/dialogs.c:2510
 msgid "Select Text Color"
 msgstr "Textfarbe wählen"
 
-#: src/dialogs.c:2483
+#: src/dialogs.c:2497
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Textfarbe wählen"
 
-#: src/dialogs.c:2708 src/rvous.c:220
+#: src/dialogs.c:2722 src/rvous.c:220
 #, c-format
 msgid "Error writing file %s"
 msgstr "Fehler beim Schreiben von %s"
 
-#: src/dialogs.c:2725
+#: src/dialogs.c:2739
 msgid "Gaim - Export Buddy List"
 msgstr "gAIM - Buddy-Liste speichern"
 
-#: src/dialogs.c:2778 src/rvous.c:491
+#: src/dialogs.c:2792 src/rvous.c:491
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: src/dialogs.c:2857
+#: src/dialogs.c:2871
 msgid "Gaim - Import Buddy List"
 msgstr "gAIM - Buddy-Liste laden"
 
-#: src/dialogs.c:2938
+#: src/dialogs.c:2952
 msgid "Gaim - New away message"
 msgstr "gAIM - Neue Abwesenheits-Mitteilung"
 
 #. Set up our frame
-#: src/dialogs.c:2944
+#: src/dialogs.c:2959
 #, fuzzy
 msgid "New away message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
 #. Make a label for away entry
-#: src/dialogs.c:2954
+#: src/dialogs.c:2969
 msgid "Away title: "
 msgstr "Abwesenheits-Titel:"
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3004
+#: src/dialogs.c:3019
 #, fuzzy
 msgid "Make Away Now"
 msgstr "Jetzt abwesend"
 
 #. show everything
-#: src/dialogs.c:3180
+#: src/dialogs.c:3196
 #, fuzzy
 msgid "Smile!"
 msgstr "Datei"
 
-#: src/dialogs.c:3246
+#: src/dialogs.c:3263
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Buddy hinzufügen"
 
-#: src/dialogs.c:3284
+#: src/dialogs.c:3301
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "gAIM - Buddy hinzufügen"
@@ -1024,19 +1026,19 @@
 msgid "About..."
 msgstr "Über..."
 
-#: src/gtkhtml.c:1382
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "HTML-Link"
 
-#: src/gtkhtml.c:1791
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "URL in bestehendem Fenster öffnen."
 
-#: src/gtkhtml.c:1800
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "URL in neuem Fenstern öffnen."
 
-#: src/gtkhtml.c:1808
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "URL als Bookmark hinzufügen"
 
@@ -1062,71 +1064,71 @@
 msgid "Receieved: '%s'\n"
 msgstr "Empfangen: '%s'\n"
 
-#: src/oscar.c:154 src/oscar.c:181
+#: src/oscar.c:157 src/oscar.c:184
 msgid "Disconnected."
 msgstr "Verbindung unterbrochen"
 
-#: src/oscar.c:162
+#: src/oscar.c:165
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/oscar.c:179
+#: src/oscar.c:182
 #, fuzzy
 msgid "major connection error\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/oscar.c:193
+#: src/oscar.c:196
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:194
+#: src/oscar.c:197
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Fehler"
 
-#: src/oscar.c:217
+#: src/oscar.c:220
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Melde an %s\n"
 
-#: src/oscar.c:227
+#: src/oscar.c:230
 #, c-format
 msgid "Looking up %s"
 msgstr "Suche %s"
 
-#: src/oscar.c:232
+#: src/oscar.c:235
 msgid "internal connection error\n"
 msgstr "Interner Verbindungsfehler\n"
 
-#: src/oscar.c:237
+#: src/oscar.c:240
 msgid "Unable to login to AIM"
 msgstr "Anmeldung nicht möglich"
 
-#: src/oscar.c:245
+#: src/oscar.c:248
 msgid "couldn't resolve host\n"
 msgstr "Konnte Server nicht finden\n"
 
-#: src/oscar.c:249
+#: src/oscar.c:252
 msgid "couldn't connect to host\n"
 msgstr "Keine Verbindung zum Server\n"
 
-#: src/oscar.c:255
+#: src/oscar.c:258
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: src/oscar.c:280
+#: src/oscar.c:283
 msgid "Password sent, waiting for response\n"
 msgstr "Passwort übertragen, warte auf Antwort\n"
 
-#: src/oscar.c:296
+#: src/oscar.c:299
 msgid "Signed off.\n"
 msgstr "Abgemeldet.\n"
 
 #. connecting too frequently
-#: src/oscar.c:310
+#: src/oscar.c:313
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1135,13 +1137,13 @@
 "Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
 "versuchen Sie es noch einmal."
 
-#: src/oscar.c:310 src/oscar.c:315 src/oscar.c:320 src/oscar.c:753
-#: src/oscar.c:758 src/oscar.c:780 src/oscar.c:799 src/oscar.c:823
+#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:757
+#: src/oscar.c:762 src/oscar.c:784 src/oscar.c:803 src/oscar.c:827
 msgid "Gaim - Error"
 msgstr "gAIM - Fehler"
 
 #. client too old
-#: src/oscar.c:320
+#: src/oscar.c:323
 #, fuzzy
 msgid ""
 "The client version you are using is too old. Please upgrade at "
@@ -1150,66 +1152,66 @@
 "Ihre AIM-Software ist zu alt. Aktuelle Software finden Sie auf "
 "http://www.aim.de"
 
-#: src/oscar.c:335
+#: src/oscar.c:338
 msgid "Authentication Failed"
 msgstr ""
 
-#: src/oscar.c:355
+#: src/oscar.c:358
 msgid "Internal Error"
 msgstr ""
 
-#: src/oscar.c:363
+#: src/oscar.c:366
 msgid "Could Not Connect"
 msgstr ""
 
-#: src/oscar.c:394
+#: src/oscar.c:397
 msgid "Connection established, cookie sent"
 msgstr ""
 
-#: src/oscar.c:625
+#: src/oscar.c:628
 msgid "Accept Direct IM?"
 msgstr ""
 
-#: src/oscar.c:634
+#: src/oscar.c:638
 #, c-format
 msgid "%s has requested to directly connect to your computer. Do you accept?"
 msgstr ""
 
-#: src/oscar.c:644 src/rvous.c:634
+#: src/oscar.c:648 src/rvous.c:635
 msgid "Accept"
 msgstr ""
 
 #. message too large
-#: src/oscar.c:752
+#: src/oscar.c:756
 #, 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:757
+#: src/oscar.c:761
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:778
+#: src/oscar.c:782
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:779 src/oscar.c:798
+#: src/oscar.c:783 src/oscar.c:802
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:797
+#: src/oscar.c:801
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:822
+#: src/oscar.c:826
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:828
+#: src/oscar.c:832
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1217,11 +1219,11 @@
 "<BR><HR><BR>%s\n"
 msgstr ""
 
-#: src/oscar.c:861
+#: src/oscar.c:865
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:862
+#: src/oscar.c:866
 msgid "AOL error"
 msgstr ""
 
@@ -1238,156 +1240,185 @@
 msgid "Plugin Error"
 msgstr ""
 
-#: src/plugins.c:268
+#: src/plugins.c:269
 msgid "Gaim - Plugins"
 msgstr ""
 
-#: src/plugins.c:297
+#: src/plugins.c:298
 msgid "Load Plugin"
 msgstr ""
 
-#: src/plugins.c:304
+#: src/plugins.c:305
 msgid "Configure Plugin"
 msgstr ""
 
-#: src/plugins.c:310
+#: src/plugins.c:311
 msgid "Unload Plugin"
 msgstr ""
 
-#: src/prefs.c:89
+#: src/prefs.c:90
 #, fuzzy
 msgid "General Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:96 src/prefs.c:209 src/prefs.c:335 src/prefs.c:534
-#: src/prefs.c:621 src/prefs.c:672 src/prefs.c:702 src/prefs.c:1081
-#: src/prefs.c:1166 src/prefs.c:1197 src/prefs.c:1484
+#: src/prefs.c:97 src/prefs.c:349 src/prefs.c:375 src/prefs.c:575
+#: src/prefs.c:662 src/prefs.c:771 src/prefs.c:856 src/prefs.c:1249
+#: src/prefs.c:1334 src/prefs.c:1365 src/prefs.c:1652
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:100
+#: src/prefs.c:101
 #, fuzzy
 msgid "Remember password"
 msgstr "Passwort Speichern"
 
-#: src/prefs.c:102
+#: src/prefs.c:103
 msgid "Auto-login"
 msgstr ""
 
-#: src/prefs.c:108
-msgid "Use borderless buttons (requires restart for some buttons)"
-msgstr ""
-
 #: src/prefs.c:109
+msgid "Use borderless buttons (requires restart for some buttons)"
+msgstr ""
+
+#: src/prefs.c:110
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:112
+#: src/prefs.c:113
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:120
+#: src/prefs.c:121
 msgid "Report Idle Times"
 msgstr ""
 
-#: src/prefs.c:201
+#: src/prefs.c:198 src/prefs.c:230 src/prefs.c:1974
 #, fuzzy
-msgid "Connection Options"
-msgstr "Verbindungsfehler!\n"
+msgid "TOC Options"
+msgstr "Einstellungen"
 
-#: src/prefs.c:213
-msgid "Use Oscar Protocol (experimental; only takes effect before signon)"
+#: src/prefs.c:206
+msgid ""
+"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
+"other is TOC.\n"
+"\n"
+"TOC is a published protocol; AOL allows people to use the TOC protocol in "
+"their clients to connect. It is a simplified version of Oscar; it is capable "
+"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
+"is published, using TOC in gaim tends to be more stable and reliable.\n"
+"\n"
+"Oscar is a proprietary protocol. AOL has not published any information about "
+"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
+"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
+"or implemented all of the functions of Oscar, it is still able to perform "
+"most functions TOC provides as well as several others. However, using Oscar "
+"in gaim tends to be less reliable, though more usable.\n"
+"\n"
+"Changing this option takes effect at signon time."
 msgstr ""
 
-#: src/prefs.c:219
-msgid "The following options do not apply if you use Oscar."
+#: src/prefs.c:212
+msgid "Use Oscar Protocol"
 msgstr ""
 
-#: src/prefs.c:227
+#: src/prefs.c:242
 msgid "TOC Host:"
 msgstr ""
 
-#: src/prefs.c:237 src/prefs.c:262 src/prefs.c:296
+#: src/prefs.c:252 src/prefs.c:277 src/prefs.c:311
 msgid "Port:"
 msgstr ""
 
-#: src/prefs.c:252
+#: src/prefs.c:267
 msgid "Login Host:"
 msgstr ""
 
-#: src/prefs.c:273
+#: src/prefs.c:288
 msgid "No Proxy"
 msgstr ""
 
-#: src/prefs.c:274
+#: src/prefs.c:289
 msgid "HTTP Proxy"
 msgstr ""
 
-#: src/prefs.c:275
+#: src/prefs.c:290
 msgid "Socks 4 Proxy"
 msgstr ""
 
-#: src/prefs.c:276
+#: src/prefs.c:291
 msgid "Socks 5 Proxy"
 msgstr ""
 
-#: src/prefs.c:282
+#: src/prefs.c:297
 msgid "Proxy Host:"
 msgstr ""
 
-#: src/prefs.c:328
+#: src/prefs.c:342 src/prefs.c:1979
+#, fuzzy
+msgid "Oscar Options"
+msgstr "Einstellungen"
+
+#: src/prefs.c:353
+msgid "Send Keep-Alive Packet (6 bytes/minute)"
+msgstr ""
+
+#: src/prefs.c:368
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Buddy-Liste"
 
-#: src/prefs.c:339
+#: src/prefs.c:379
 msgid "Show numbers in groups"
 msgstr ""
 
-#: src/prefs.c:340
+#: src/prefs.c:380
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:381
 msgid "Show idle times"
 msgstr ""
 
-#: src/prefs.c:341
+#: src/prefs.c:382
 msgid "Show buddy type icons"
 msgstr ""
 
-#: src/prefs.c:347
+#: src/prefs.c:388
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
-#: src/prefs.c:348
+#: src/prefs.c:389
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:354
+#: src/prefs.c:395
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "Fensterposition und -größe speichern"
 
-#: src/prefs.c:356
+#: src/prefs.c:397
 msgid "Automatically show buddy list on sign on"
 msgstr ""
 
-#: src/prefs.c:506
+#: src/prefs.c:547
 msgid "Please sign on before editing the permit/deny lists."
 msgstr ""
 
-#: src/prefs.c:507
+#: src/prefs.c:548
 msgid "Please sign on"
 msgstr ""
 
-#: src/prefs.c:527
+#: src/prefs.c:568
 msgid "Permit/Deny List Options"
 msgstr ""
 
-#: src/prefs.c:542
+#: src/prefs.c:583
 msgid ""
 "The permit/deny configuration will change between users,\n"
 "and changes while you are signed off will not be saved."
 msgstr ""
 
-#: src/prefs.c:555
+#: src/prefs.c:596
 #, fuzzy
 msgid "Allow Anyone"
 msgstr "Jeden zulassen"
@@ -1395,312 +1426,325 @@
 #. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
 #. * and merging the two would be very difficult at best, most likely
 #. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:560
+#: src/prefs.c:601
 msgid "Allow only users on Buddy List"
 msgstr ""
 
-#: src/prefs.c:562
+#: src/prefs.c:603
 msgid "Allow only the users in \"Permit\""
 msgstr ""
 
-#: src/prefs.c:568
+#: src/prefs.c:609
 msgid "Block all users"
 msgstr ""
 
-#: src/prefs.c:569
+#: src/prefs.c:610
 msgid "Block the users in \"Deny\""
 msgstr ""
 
-#: src/prefs.c:614
+#: src/prefs.c:655
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:625
+#: src/prefs.c:666
 msgid "Enter sends message"
 msgstr "Enter verschickt Nachricht"
 
-#: src/prefs.c:626
+#: src/prefs.c:667
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:627
+#: src/prefs.c:668
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:633
+#: src/prefs.c:674
 msgid "Show graphical smileys"
 msgstr ""
 
-#: src/prefs.c:634
+#: src/prefs.c:675
 msgid "Show timestamp on messages"
 msgstr ""
 
-#: src/prefs.c:635
+#: src/prefs.c:676
 msgid "Ignore incoming colors"
 msgstr ""
 
-#: src/prefs.c:636
+#: src/prefs.c:677
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:642
+#: src/prefs.c:683
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Alles Mitschneiten"
 
-#: src/prefs.c:643
+#: src/prefs.c:684
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "HTML aus Mitschnitt entfernen"
 
-#: src/prefs.c:649
+#: src/prefs.c:690
 msgid "Highlight misspelled words"
 msgstr ""
 
-#: src/prefs.c:650
+#: src/prefs.c:691
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "URLs als Link verschicken"
 
-#: src/prefs.c:651
+#: src/prefs.c:692
 #, fuzzy
 msgid "Sending messages removes away status"
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: src/prefs.c:665
+#: src/prefs.c:733 src/prefs.c:818
+msgid "Pictures and Text"
+msgstr ""
+
+#: src/prefs.c:738 src/prefs.c:823
+msgid "Pictures Only"
+msgstr ""
+
+#: src/prefs.c:743 src/prefs.c:828
+#, fuzzy
+msgid "Text Only"
+msgstr "Text-Farbe"
+
+#: src/prefs.c:764
 #, fuzzy
 msgid "IM Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:676
+#: src/prefs.c:775
 msgid "Show logins in window"
 msgstr ""
 
-#: src/prefs.c:677 src/prefs.c:707
-msgid "Show buttons with text"
+#: src/prefs.c:781 src/prefs.c:866
+msgid "Show buttons as "
 msgstr ""
 
-#: src/prefs.c:678 src/prefs.c:708
+#: src/prefs.c:790 src/prefs.c:876
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:679 src/prefs.c:709
+#: src/prefs.c:791 src/prefs.c:877
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:680 src/prefs.c:1404
+#: src/prefs.c:792 src/prefs.c:1572
 msgid "Ignore new conversations when away"
 msgstr "Neue Telegramme bei Abwesenheit ignorieren"
 
-#: src/prefs.c:681
+#: src/prefs.c:793
 msgid "Ignore TiK Automated Messages"
 msgstr ""
 
-#: src/prefs.c:695 src/prefs.c:883
+#: src/prefs.c:849 src/prefs.c:1051
 #, fuzzy
 msgid "Chat Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:706
+#: src/prefs.c:860
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:740 src/prefs.c:742 src/prefs.c:954 src/prefs.c:956
+#: src/prefs.c:908 src/prefs.c:910 src/prefs.c:1122 src/prefs.c:1124
 msgid "Gaim Chat"
 msgstr ""
 
-#: src/prefs.c:900
+#: src/prefs.c:1068
 msgid "Refresh"
 msgstr ""
 
-#: src/prefs.c:928
+#: src/prefs.c:1096
 msgid "List of available chats"
 msgstr ""
 
-#: src/prefs.c:942
+#: src/prefs.c:1110
 msgid "List of subscribed chats"
 msgstr ""
 
-#: src/prefs.c:1074 src/prefs.c:1831
+#: src/prefs.c:1242 src/prefs.c:2027
 #, fuzzy
 msgid "Font Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:1087
+#: src/prefs.c:1255
 msgid "Underlined Text"
 msgstr ""
 
-#: src/prefs.c:1088
+#: src/prefs.c:1256
 msgid "Strike Text"
 msgstr ""
 
-#: src/prefs.c:1101 src/prefs.c:1118 src/prefs.c:1138
+#: src/prefs.c:1269 src/prefs.c:1286 src/prefs.c:1306
 #, fuzzy
 msgid "Select"
 msgstr "Schriftart wählen "
 
-#: src/prefs.c:1136
+#: src/prefs.c:1304
 msgid "Font Face for Text"
 msgstr ""
 
-#: src/prefs.c:1159
+#: src/prefs.c:1327
 #, fuzzy
 msgid "Sound Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:1171
+#: src/prefs.c:1339
 msgid "Sounds go through GNOME"
 msgstr ""
 
-#: src/prefs.c:1173
+#: src/prefs.c:1341
 msgid "No sounds when you log in"
 msgstr ""
 
-#: src/prefs.c:1174 src/prefs.c:1405
+#: src/prefs.c:1342 src/prefs.c:1573
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1175
+#: src/prefs.c:1343
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1190
+#: src/prefs.c:1358
 msgid "Sound Events"
 msgstr ""
 
-#: src/prefs.c:1201
+#: src/prefs.c:1369
 msgid "Sound when buddy logs in"
 msgstr ""
 
-#: src/prefs.c:1202
+#: src/prefs.c:1370
 msgid "Sound when buddy logs out"
 msgstr ""
 
-#: src/prefs.c:1208
+#: src/prefs.c:1376
 msgid "Sound when message is received"
 msgstr ""
 
-#: src/prefs.c:1209
+#: src/prefs.c:1377
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1210
+#: src/prefs.c:1378
 msgid "Sound when message is sent"
 msgstr ""
 
-#: src/prefs.c:1216
+#: src/prefs.c:1384
 #, fuzzy
 msgid "Sound in chat rooms when people enter/leave"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1217
+#: src/prefs.c:1385
 #, fuzzy
 msgid "Sound in chat rooms when people talk"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1302 src/prefs.c:1858
+#: src/prefs.c:1470 src/prefs.c:2054
 #, fuzzy
 msgid "Away Messages"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/prefs.c:1318
+#: src/prefs.c:1486
 #, fuzzy
 msgid "Title"
 msgstr "Datei"
 
-#: src/prefs.c:1322
+#: src/prefs.c:1490
 #, fuzzy
 msgid "Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/prefs.c:1362
+#: src/prefs.c:1530
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1366
+#: src/prefs.c:1534
 #, fuzzy
 msgid "Make Away"
 msgstr "Jetzt abwesend"
 
-#: src/prefs.c:1477
+#: src/prefs.c:1645
 #, fuzzy
 msgid "Browser Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:1488
+#: src/prefs.c:1656
 msgid "Netscape"
 msgstr ""
 
-#: src/prefs.c:1489
+#: src/prefs.c:1657
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1491
+#: src/prefs.c:1659
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1493
+#: src/prefs.c:1661
 msgid "Internal HTML Widget (Quite likely a bad idea!)"
 msgstr ""
 
-#: src/prefs.c:1494
+#: src/prefs.c:1662
 msgid "Manual"
 msgstr ""
 
-#: src/prefs.c:1503
+#: src/prefs.c:1671
 msgid "Pop up new window by default"
 msgstr ""
 
-#: src/prefs.c:1547
+#: src/prefs.c:1716
 msgid "Gaim - Preferences"
 msgstr ""
 
-#: src/prefs.c:1630
+#: src/prefs.c:1801
 msgid "GAIM debug output window"
 msgstr ""
 
-#: src/prefs.c:1772
+#: src/prefs.c:1956
 msgid "General"
 msgstr ""
 
-#: src/prefs.c:1783
+#: src/prefs.c:1969
 msgid "Connection"
 msgstr ""
 
 #. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:1800
+#: src/prefs.c:1996
 #, fuzzy
 msgid "Permit/Deny"
 msgstr "Bestimmte zulassen"
 
-#: src/prefs.c:1811
+#: src/prefs.c:2007
 #, fuzzy
 msgid "Conversations"
 msgstr "Alles Mitschneiten"
 
-#: src/prefs.c:1816
+#: src/prefs.c:2012
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:1821
+#: src/prefs.c:2017
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:1826
+#: src/prefs.c:2022
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:1842
+#: src/prefs.c:2038
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:1847
+#: src/prefs.c:2043
 msgid "Events"
 msgstr ""
 
-#: src/prefs.c:1869
+#: src/prefs.c:2065
 msgid "Browser"
 msgstr ""
 
@@ -1722,20 +1766,24 @@
 msgid "Sending %s to %s"
 msgstr ""
 
-#: src/rvous.c:661
+#: src/rvous.c:662
 #, c-format
 msgid "%s requests you to accept the file: %s (%d bytes)"
 msgstr ""
 
-#: src/rvous.c:664
+#: src/rvous.c:665
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
 
-#: src/rvous.c:674
+#: src/rvous.c:675
 msgid "Gaim - File Transfer?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Connection Options"
+#~ msgstr "Verbindungsfehler!\n"
+
 #~ msgid "Permit some"
 #~ msgstr "Bestimmte zulassen"
 
--- a/po/es.po	Mon Sep 18 10:43:38 2000 +0000
+++ b/po/es.po	Mon Sep 18 18:07:38 2000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 02:08-0700\n"
+"POT-Creation-Date: 2000-09-15 18:12-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"
@@ -28,72 +28,72 @@
 msgid "You must give your password"
 msgstr "Tiene que introduzir su contraseña"
 
-#: src/aim.c:231 src/buddy.c:1790
+#: src/aim.c:231 src/buddy.c:1849
 msgid "Signoff"
 msgstr "Desconectar"
 
-#: src/aim.c:329 src/aim.c:575 src/buddy.c:308
+#: src/aim.c:334 src/aim.c:579 src/buddy.c:318
 msgid "Signon"
 msgstr "Conectar"
 
-#: src/aim.c:330 src/buddy_chat.c:127 src/buddy_chat.c:219 src/dialogs.c:418
-#: src/dialogs.c:717 src/dialogs.c:873 src/dialogs.c:949 src/dialogs.c:1065
-#: src/dialogs.c:1196 src/dialogs.c:1382 src/dialogs.c:1486 src/dialogs.c:1567
-#: src/dialogs.c:1811 src/dialogs.c:1998 src/dialogs.c:2163 src/dialogs.c:2256
-#: src/dialogs.c:2981 src/dialogs.c:3240 src/oscar.c:647 src/rvous.c:279
-#: src/rvous.c:416 src/rvous.c:637
+#: src/aim.c:335 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:419
+#: src/dialogs.c:720 src/dialogs.c:877 src/dialogs.c:954 src/dialogs.c:1071
+#: src/dialogs.c:1203 src/dialogs.c:1390 src/dialogs.c:1495 src/dialogs.c:1576
+#: src/dialogs.c:1821 src/dialogs.c:2009 src/dialogs.c:2175 src/dialogs.c:2270
+#: src/dialogs.c:2996 src/dialogs.c:3257 src/oscar.c:651 src/rvous.c:279
+#: src/rvous.c:416 src/rvous.c:638
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/aim.c:331 src/buddy.c:1787
+#: src/aim.c:336 src/buddy.c:1846
 msgid "Register"
 msgstr "Registrar"
 
-#: src/aim.c:332
+#: src/aim.c:337
 msgid "Options"
 msgstr "Opciones"
 
-#: src/aim.c:334 src/aim.c:581 src/buddy.c:1853
+#: src/aim.c:339 src/aim.c:585 src/buddy.c:1912
 msgid "Plugins"
 msgstr "Aditivos"
 
-#: src/aim.c:408
+#: src/aim.c:413
 msgid "Screen Name: "
 msgstr "Nomre de Usuario:"
 
-#: src/aim.c:411
+#: src/aim.c:416
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: src/aim.c:414
+#: src/aim.c:419
 msgid "Remember Password"
 msgstr "Acordarse de la Constraseña"
 
-#: src/aim.c:461
+#: src/aim.c:466
 msgid "Gaim - Login"
 msgstr "Conectación - Gaim"
 
-#: src/aim.c:570 src/buddy.c:1850
+#: src/aim.c:574 src/buddy.c:1909
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/away.c:88 src/away.c:202
+#: src/away.c:88 src/away.c:203
 msgid "Back"
 msgstr "Retroceder"
 
-#: src/away.c:98
+#: src/away.c:99
 msgid "I'm Back!"
 msgstr "Ya regrese"
 
-#: src/away.c:140
+#: src/away.c:141
 msgid "Gaim - Away!"
 msgstr "Gaim - Ausente!"
 
-#: src/away.c:243 src/gnome_applet_mgr.c:198
+#: src/away.c:244 src/gnome_applet_mgr.c:198
 msgid "New Away Message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/away.c:262
+#: src/away.c:263
 msgid "Remove Away Message"
 msgstr "Quitar Mensaje de Ausencia"
 
@@ -103,108 +103,109 @@
 msgstr "%d/%d Amigos en línea"
 
 #. Put the buttons in the box
-#: src/buddy.c:250 src/buddy.c:1922 src/conversation.c:447
-#: src/conversation.c:1664 src/dialogs.c:871 src/dialogs.c:948
-#: src/dialogs.c:1810 src/dialogs.c:1832 src/dialogs.c:3238 src/prefs.c:587
-#: src/prefs.c:901 src/prefs.c:1358
+#: src/buddy.c:259 src/buddy.c:1981 src/buddy_chat.c:816
+#: src/conversation.c:440 src/conversation.c:1650 src/dialogs.c:875
+#: src/dialogs.c:953 src/dialogs.c:1820 src/dialogs.c:1842 src/dialogs.c:3255
+#: src/prefs.c:628 src/prefs.c:1069 src/prefs.c:1526
 msgid "Add"
 msgstr "Agregar"
 
-#: src/buddy.c:251 src/buddy.c:1923 src/dialogs.c:881 src/dialogs.c:964
+#: src/buddy.c:260 src/buddy.c:1982 src/dialogs.c:885 src/dialogs.c:969
 msgid "Group"
 msgstr "Grupo"
 
-#: src/buddy.c:252 src/buddy.c:1924 src/conversation.c:1662 src/dialogs.c:780
-#: src/prefs.c:591 src/prefs.c:902 src/prefs.c:1370
+#: src/buddy.c:261 src/buddy.c:1983 src/buddy_chat.c:818
+#: src/conversation.c:1648 src/dialogs.c:783 src/prefs.c:632 src/prefs.c:1070
+#: src/prefs.c:1538
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/buddy.c:255 src/buddy.c:1696
+#: src/buddy.c:264 src/buddy.c:1753
 msgid "Chat"
 msgstr "Hablar"
 
-#: src/buddy.c:256 src/buddy.c:395 src/buddy.c:1694 src/buddy_chat.c:545
+#: src/buddy.c:265 src/buddy.c:405 src/buddy.c:1751 src/buddy_chat.c:543
 msgid "IM"
 msgstr "Mensaje"
 
-#: src/buddy.c:257 src/buddy.c:401 src/buddy.c:1695 src/buddy_chat.c:547
-#: src/conversation.c:1658 src/rvous.c:635
+#: src/buddy.c:266 src/buddy.c:411 src/buddy.c:1752 src/buddy_chat.c:545
+#: src/buddy_chat.c:824 src/conversation.c:1644 src/rvous.c:636
 msgid "Info"
 msgstr "Información"
 
-#: src/buddy.c:407 src/dialogs.c:3252
+#: src/buddy.c:417 src/dialogs.c:3269
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:414
+#: src/buddy.c:424
 msgid "Dir Info"
 msgstr "Información del Directorio"
 
-#: src/buddy.c:421
+#: src/buddy.c:431
 #, fuzzy
 msgid "Direct IM"
 msgstr "Información del Directorio"
 
-#: src/buddy.c:427
+#: src/buddy.c:437
 msgid "Away Msg"
 msgstr "Mensaje de ausencia"
 
-#: src/buddy.c:434
+#: src/buddy.c:444
 msgid "Toggle Logging"
 msgstr "Prender/Apagar Diario"
 
-#: src/buddy.c:440
+#: src/buddy.c:450
 msgid "Add Buddy Pounce"
 msgstr "Agregar Calada de Amigo"
 
-#: src/buddy.c:1204
+#: src/buddy.c:1246
 msgid "New Buddy Pounce"
 msgstr "Nueva Calada de Amigo"
 
-#: src/buddy.c:1222
+#: src/buddy.c:1264
 msgid "Remove Buddy Pounce"
 msgstr "Quitar Calada de Amigo"
 
-#: src/buddy.c:1297
+#: src/buddy.c:1352
 #, fuzzy, c-format
 msgid "%sBuddy Icon"
 msgstr "Calada de Amigo"
 
-#: src/buddy.c:1300
+#: src/buddy.c:1355
 #, c-format
 msgid "%sVoice"
 msgstr ""
 
-#: src/buddy.c:1303
+#: src/buddy.c:1358
 #, c-format
 msgid "%sIM Image"
 msgstr ""
 
-#: src/buddy.c:1306
+#: src/buddy.c:1361
 #, fuzzy, c-format
 msgid "%sChat"
 msgstr "Hablar"
 
-#: src/buddy.c:1309
+#: src/buddy.c:1364
 #, c-format
 msgid "%sGet File"
 msgstr ""
 
-#: src/buddy.c:1312
+#: src/buddy.c:1367
 #, c-format
 msgid "%sSend File"
 msgstr ""
 
-#: src/buddy.c:1367
+#: src/buddy.c:1422
 msgid "Warnings: %d%%\n"
 msgstr "Advertencias: %d%%\n"
 
-#: src/buddy.c:1373
+#: src/buddy.c:1428
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1377
+#: src/buddy.c:1432
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -216,373 +217,374 @@
 "Connectado en: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1377
+#: src/buddy.c:1432
 msgid "Idle: "
 msgstr "Inactivo: "
 
-#: src/buddy.c:1422
+#: src/buddy.c:1477
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
-#: src/buddy.c:1563
+#: src/buddy.c:1620
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s desconectado%s%s.</B><BR><HR>"
 
-#: src/buddy.c:1721
+#: src/buddy.c:1778
 msgid "Information on selected Buddy"
 msgstr "Informacion sobre Amigo Escogido"
 
-#: src/buddy.c:1722 src/dialogs.c:708
+#: src/buddy.c:1779 src/dialogs.c:711
 msgid "Send Instant Message"
 msgstr "Mandar Mensaje Instantaneo"
 
-#: src/buddy.c:1723
+#: src/buddy.c:1780
 msgid "Start/join a Buddy Chat"
 msgstr "Empezar/Unirse a Conversación de Amigos"
 
-#: src/buddy.c:1774
+#: src/buddy.c:1833
 msgid "File"
 msgstr "Archivo"
 
-#: src/buddy.c:1778 src/buddy.c:1779
+#: src/buddy.c:1837 src/buddy.c:1838
 msgid "Add A Buddy"
 msgstr "Agregar Amigo"
 
-#: src/buddy.c:1780
+#: src/buddy.c:1839
 #, fuzzy
 msgid "Join A Chat"
 msgstr "Unirse a conversación"
 
-#: src/buddy.c:1782
+#: src/buddy.c:1841
 msgid "Import Buddy List"
 msgstr "Importar Lista de Amigos"
 
-#: src/buddy.c:1783
+#: src/buddy.c:1842
 msgid "Export Buddy List"
 msgstr "Exportar Lista de Amigos"
 
-#: src/buddy.c:1793
+#: src/buddy.c:1852
 msgid "Quit"
 msgstr "Salir"
 
-#: src/buddy.c:1795 src/buddy_chat.c:539 src/buddy_chat.c:787
-#: src/conversation.c:1660 src/dialogs.c:495 src/plugins.c:317
-#: src/prefs.c:1597
+#: src/buddy.c:1854 src/buddy_chat.c:537 src/buddy_chat.c:791
+#: src/buddy_chat.c:812 src/conversation.c:1646 src/dialogs.c:496
+#: src/plugins.c:318 src/prefs.c:1768
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/buddy.c:1800
+#: src/buddy.c:1859
 msgid "Tools"
 msgstr "Herramientas"
 
-#: src/buddy.c:1805 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:1864 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
 msgid "Away"
 msgstr "Ausente"
 
-#: src/buddy.c:1810
+#: src/buddy.c:1869
 msgid "Buddy Pounce"
 msgstr "Calada de Amigo"
 
-#: src/buddy.c:1818 src/dialogs.c:1992 src/dialogs.c:2148
+#: src/buddy.c:1877 src/dialogs.c:2003 src/dialogs.c:2160
 msgid "Search for Buddy"
 msgstr "Buscar un Amigo"
 
-#: src/buddy.c:1821
+#: src/buddy.c:1880
 msgid "by Email"
 msgstr "por Correo Electronico"
 
-#: src/buddy.c:1825
+#: src/buddy.c:1884
 msgid "by Dir Info"
 msgstr "por Información de Directorio"
 
-#: src/buddy.c:1832 src/buddy.c:1833
+#: src/buddy.c:1891 src/buddy.c:1892
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/buddy.c:1836
+#: src/buddy.c:1895
 msgid "User Info"
 msgstr "Información de Usuario"
 
-#: src/buddy.c:1840 src/dialogs.c:1190
+#: src/buddy.c:1899 src/dialogs.c:1197
 msgid "Directory Info"
 msgstr "Información del Directorio"
 
-#: src/buddy.c:1844 src/dialogs.c:1376
+#: src/buddy.c:1903 src/dialogs.c:1384
 msgid "Change Password"
 msgstr "Cambiar Contraseña"
 
-#: src/buddy.c:1858
+#: src/buddy.c:1917
 #, fuzzy
 msgid "Perl"
 msgstr "Permitir"
 
-#: src/buddy.c:1861
+#: src/buddy.c:1920
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1865
+#: src/buddy.c:1924
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1869
+#: src/buddy.c:1928
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1877
+#: src/buddy.c:1936
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/buddy.c:1882
+#: src/buddy.c:1941
 #, fuzzy
 msgid "About Gaim"
 msgstr "Sobre"
 
-#: src/buddy.c:1901 src/prefs.c:1794
+#: src/buddy.c:1960 src/prefs.c:1990
 msgid "Buddy List"
 msgstr "Lista de Amigos"
 
-#: src/buddy.c:1953
+#: src/buddy.c:2012
 msgid "Add a new Buddy"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:1954
+#: src/buddy.c:2013
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:1955
+#: src/buddy.c:2014
 msgid "Remove selected Buddy"
 msgstr "Quitar Amigo Escogido"
 
-#: src/buddy.c:1980
+#: src/buddy.c:2039
 msgid "Online"
 msgstr "En Linea"
 
-#: src/buddy.c:1982
+#: src/buddy.c:2041
 msgid "Edit Buddies"
 msgstr "Corregir Amigos["
 
-#: src/buddy.c:2019
+#: src/buddy.c:2078
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista de Amigos"
 
-#: src/buddy_chat.c:124 src/buddy_chat.c:729 src/buddy_chat.c:741
+#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
 msgid "Buddy Chat"
 msgstr "Conversación de Amigos"
 
-#: src/buddy_chat.c:126
+#: src/buddy_chat.c:123
 msgid "Join"
 msgstr "Unirse"
 
-#: src/buddy_chat.c:132
+#: src/buddy_chat.c:129
 msgid "Join what group:"
 msgstr "Unirse a que grupo:"
 
-#: src/buddy_chat.c:138
+#: src/buddy_chat.c:135
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:146
+#: src/buddy_chat.c:143
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:175
+#: src/buddy_chat.c:172
 msgid "Join Chat"
 msgstr "Unirse a conversación"
 
-#: src/buddy_chat.c:220 src/buddy_chat.c:541 src/buddy_chat.c:786
+#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/buddy_chat.c:237
+#: src/buddy_chat.c:234
 msgid "Invite who?"
 msgstr "Invitar a quien?"
 
-#: src/buddy_chat.c:241
+#: src/buddy_chat.c:238
 msgid "With message:"
 msgstr "Con el mensaje:"
 
-#: src/buddy_chat.c:268
+#: src/buddy_chat.c:265
 msgid "Invite to Buddy Chat"
 msgstr "Invitar un Amigo a la conversación"
 
-#: src/buddy_chat.c:427
+#: src/buddy_chat.c:424
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:455
+#: src/buddy_chat.c:452
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:542 src/buddy_chat.c:785
+#: src/buddy_chat.c:540 src/buddy_chat.c:789
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/buddy_chat.c:543 src/buddy_chat.c:784 src/conversation.c:1657
-#: src/dialogs.c:1568
+#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
+#: src/conversation.c:1643 src/dialogs.c:1577
 msgid "Send"
 msgstr "Mandar"
 
-#: src/buddy_chat.c:546
+#: src/buddy_chat.c:544
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: src/conversation.c:181
+#: src/buddy_chat.c:820 src/conversation.c:1651
+msgid "Block"
+msgstr "Bloquear"
+
+#: src/buddy_chat.c:822 src/conversation.c:1645 src/dialogs.c:415
+#: src/dialogs.c:417 src/rvous.c:637
+msgid "Warn"
+msgstr "Advertir"
+
+#: src/conversation.c:171
 #, fuzzy, c-format
 msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
-#: src/conversation.c:188
+#: src/conversation.c:178
 #, fuzzy, c-format
 msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
-#: src/conversation.c:442
+#: src/conversation.c:435
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Quitando '%s' de la lista.\n"
 
-#: src/conversation.c:695
+#: src/conversation.c:688
 msgid "Message too long, some data truncated."
 msgstr "Mensaje demasiado largo, algunas partes fueron cortadas."
 
-#: src/conversation.c:695 src/dialogs.c:2709 src/dialogs.c:2779
+#: src/conversation.c:688 src/dialogs.c:2723 src/dialogs.c:2793
 #: src/rvous.c:221 src/rvous.c:492
 msgid "Error"
 msgstr "Error"
 
-#: src/conversation.c:883
+#: src/conversation.c:875
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Presentemente en %d\n"
 
-#: src/conversation.c:892
+#: src/conversation.c:884
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Moviendo posición a %d\n"
 
-#: src/conversation.c:1489
+#: src/conversation.c:1481
 msgid "Bold"
 msgstr "Negritas"
 
-#: src/conversation.c:1489 src/prefs.c:1085
+#: src/conversation.c:1481 src/prefs.c:1253
 msgid "Bold Text"
 msgstr "Texto en Negritas"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1485 src/conversation.c:1486
 msgid "Italics"
 msgstr "Inclinados"
 
-#: src/conversation.c:1493 src/prefs.c:1086
+#: src/conversation.c:1485 src/prefs.c:1254
 msgid "Italics Text"
 msgstr "Texto Inclinado"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1489 src/conversation.c:1490
 msgid "Underline"
 msgstr "Subrayar"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1489
 msgid "Underline Text"
 msgstr "Subrayar Texto"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1493 src/conversation.c:1494
 msgid "Strike"
 msgstr "Cruzar"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1493
 msgid "Strike through Text"
 msgstr "Cruzar el Texto"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1497
 msgid "Small"
 msgstr "Pequeño"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1497
 msgid "Decrease font size"
 msgstr "Hacer texto mas pequeño"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1500
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1500
 msgid "Normal font size"
 msgstr "Texto normal"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1503
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1503
 msgid "Increase font size"
 msgstr "Hacer el texto mas grande "
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1510 src/conversation.c:1511
 msgid "Font"
 msgstr "Texto"
 
-#: src/conversation.c:1518 src/dialogs.c:2608 src/dialogs.c:2624
+#: src/conversation.c:1510 src/dialogs.c:2622 src/dialogs.c:2638
 msgid "Select Font"
 msgstr "Seleccionar un Texto"
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1514 src/conversation.c:1515 src/conversation.c:1518
+#: src/conversation.c:1519
 msgid "Color"
 msgstr "Color"
 
-#: src/conversation.c:1522 src/prefs.c:1099
+#: src/conversation.c:1514 src/prefs.c:1267
 msgid "Text Color"
 msgstr "Color del texto"
 
-#: src/conversation.c:1526 src/prefs.c:1116
+#: src/conversation.c:1518 src/prefs.c:1284
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1525 src/conversation.c:1526
 msgid "Link"
 msgstr "Dirección"
 
-#: src/conversation.c:1533 src/dialogs.c:2250
+#: src/conversation.c:1525 src/dialogs.c:2264
 msgid "Insert Link"
 msgstr "Insertar una Dirección"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1529
 #, fuzzy
 msgid "Smiley"
 msgstr "Archivo"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1529
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1536 src/conversation.c:1537
 msgid "Logging"
 msgstr "Diario"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1536
 msgid "Enable logging"
 msgstr "Usar Diario"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1540 src/conversation.c:1541
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1540
 msgid "Enable sounds"
 msgstr "Usar Sonidos"
 
-#: src/conversation.c:1659 src/dialogs.c:414 src/dialogs.c:416 src/rvous.c:636
-msgid "Warn"
-msgstr "Advertir"
-
-#: src/conversation.c:1665
-msgid "Block"
-msgstr "Bloquear"
-
 #: src/dialogs.c:224
 msgid "Error Resolving Mail Server.\n"
 msgstr "Error Resolviendo el Servidor de correo.\n"
@@ -591,129 +593,129 @@
 msgid "Error Connecting to Socket.\n"
 msgstr "Error Connectando al encaje. \n"
 
-#: src/dialogs.c:431
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "¿Deveras quiere advertirle a %s?"
 
-#: src/dialogs.c:435
+#: src/dialogs.c:436
 msgid "Warn anonymously?"
 msgstr "¿Advertirle anonimamente?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:439
 msgid "Anonymous warnings are less harsh."
 msgstr "Las advertencias anonimas son menos duras."
 
-#: src/dialogs.c:463
+#: src/dialogs.c:464
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Advertir usuario?"
 
-#: src/dialogs.c:531
+#: src/dialogs.c:532
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No se pudo escribir archivo %s."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:535
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No se pudo leer archivo %s."
 
-#: src/dialogs.c:537
+#: src/dialogs.c:538
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensaje demasiado largo, ultimos %s bytes fueron borrados."
 
-#: src/dialogs.c:540
+#: src/dialogs.c:541
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s no esta en linea ahorita."
 
-#: src/dialogs.c:543
+#: src/dialogs.c:544
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Advertencias para %s estan prohibidas."
 
-#: src/dialogs.c:546
+#: src/dialogs.c:547
 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:549
+#: src/dialogs.c:550
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Conversación en %s no esta disponible."
 
-#: src/dialogs.c:552
+#: src/dialogs.c:553
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esta mandando los mensajes demasiado rapido a %s."
 
-#: src/dialogs.c:555
+#: src/dialogs.c:556
 #, 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:558
+#: src/dialogs.c:559
 #, 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:561
+#: src/dialogs.c:562
 msgid "Failure."
 msgstr "Falla"
 
-#: src/dialogs.c:564
+#: src/dialogs.c:565
 msgid "Too many matches."
 msgstr "Demasiados resultados"
 
-#: src/dialogs.c:567
+#: src/dialogs.c:568
 msgid "Need more qualifiers."
 msgstr "Necesito mas calificadores"
 
-#: src/dialogs.c:570
+#: src/dialogs.c:571
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio no esta disponible ahorita."
 
-#: src/dialogs.c:573
+#: src/dialogs.c:574
 msgid "Email lookup restricted."
 msgstr "Busqueda de correos electronicos es restringida."
 
-#: src/dialogs.c:576
+#: src/dialogs.c:577
 msgid "Keyword ignored."
 msgstr "Palabra ignorada"
 
-#: src/dialogs.c:579
+#: src/dialogs.c:580
 msgid "No keywords."
 msgstr "Sin palabras"
 
-#: src/dialogs.c:582
+#: src/dialogs.c:583
 msgid "User has no directory information."
 msgstr "El usuario no tiene información en el directorio."
 
-#: src/dialogs.c:586
+#: src/dialogs.c:587
 msgid "Country not supported."
 msgstr "País no apoyado"
 
-#: src/dialogs.c:589
+#: src/dialogs.c:590
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Falla desconocida: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:592 src/oscar.c:315
+#: src/dialogs.c:593 src/oscar.c:318
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contraseña incorrecta."
 
-#: src/dialogs.c:595
+#: src/dialogs.c:596
 msgid "The service is temporarily unavailable."
 msgstr "Este servicio no esta disponible en este momento."
 
-#: src/dialogs.c:598
+#: src/dialogs.c:599
 msgid "Your warning level is currently too high to log in."
 msgstr "Su nivel de advertencias es demasiado alto para conectarse."
 
-#: src/dialogs.c:601
+#: src/dialogs.c:602
 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."
@@ -721,271 +723,271 @@
 "Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
 "intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
 
-#: src/dialogs.c:604
+#: src/dialogs.c:605
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Un error al conectarse ha ocurrido: %s."
 
-#: src/dialogs.c:607
+#: src/dialogs.c:608
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Un error desconocido, %d, ha ocurrido.  Informacion: %s"
 
-#: src/dialogs.c:610
+#: src/dialogs.c:611
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - Error %d"
 
 #. Build OK Button
-#: src/dialogs.c:649 src/dialogs.c:712 src/dialogs.c:1060 src/dialogs.c:1381
-#: src/dialogs.c:1665 src/dialogs.c:1997 src/dialogs.c:2158 src/dialogs.c:2255
+#: src/dialogs.c:650 src/dialogs.c:715 src/dialogs.c:1066 src/dialogs.c:1389
+#: src/dialogs.c:1675 src/dialogs.c:2008 src/dialogs.c:2170 src/dialogs.c:2269
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:722
+#: src/dialogs.c:725
 msgid "IM who: "
 msgstr "Quien: "
 
-#: src/dialogs.c:746
+#: src/dialogs.c:749
 msgid "Gaim - IM user"
 msgstr "Gaim - Usuario"
 
-#: src/dialogs.c:828
+#: src/dialogs.c:831
 msgid "Buddies"
 msgstr "Amigos"
 
-#: src/dialogs.c:879
+#: src/dialogs.c:883
 #, fuzzy
 msgid "Add Group"
 msgstr "Grupo"
 
-#: src/dialogs.c:909
+#: src/dialogs.c:913
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:955
+#: src/dialogs.c:960
 msgid "Add Buddy"
 msgstr "Agregar Amigo"
 
-#: src/dialogs.c:957 src/dialogs.c:3248
+#: src/dialogs.c:962 src/dialogs.c:3265
 msgid "Buddy"
 msgstr "Amigo"
 
-#: src/dialogs.c:996
+#: src/dialogs.c:1001
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Agregar Amigo"
 
 #. Put the buttons in the box
-#: src/dialogs.c:1071
+#: src/dialogs.c:1077
 msgid "Buddy To Pounce:"
 msgstr "Amigo a calar:"
 
-#: src/dialogs.c:1076
+#: src/dialogs.c:1082
 msgid "Open IM Window on Buddy Logon"
 msgstr "Abrir Ventana de Mensage cuando se conecte este amigo"
 
-#: src/dialogs.c:1079
+#: src/dialogs.c:1085
 msgid "Send IM on Buddy Logon"
 msgstr "Mandar un mensaje cuando se conecte este amigo"
 
-#: src/dialogs.c:1087
+#: src/dialogs.c:1093
 msgid "Message to send:"
 msgstr "Mensaje a mandar:"
 
-#: src/dialogs.c:1108
+#: src/dialogs.c:1114
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuevo amigo a calar"
 
 #. Build Save Button
-#: src/dialogs.c:1194 src/dialogs.c:1485 src/dialogs.c:2976
+#: src/dialogs.c:1201 src/dialogs.c:1494 src/dialogs.c:2991
 msgid "Save"
 msgstr "Guardar"
 
-#: src/dialogs.c:1212
+#: src/dialogs.c:1219
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dejar que busquedas en el Web encuentren su informacion"
 
 #. Line 1
-#: src/dialogs.c:1215 src/dialogs.c:2015
+#: src/dialogs.c:1222 src/dialogs.c:2026
 msgid "First Name"
 msgstr "Nombre"
 
 #. Line 2
-#: src/dialogs.c:1226 src/dialogs.c:2027
+#: src/dialogs.c:1233 src/dialogs.c:2038
 msgid "Middle Name"
 msgstr "Segundo Nombre"
 
 #. Line 3
-#: src/dialogs.c:1238 src/dialogs.c:2039
+#: src/dialogs.c:1245 src/dialogs.c:2050
 msgid "Last Name"
 msgstr "Apellido"
 
 #. Line 4
-#: src/dialogs.c:1249 src/dialogs.c:2051
+#: src/dialogs.c:1256 src/dialogs.c:2062
 msgid "Maiden Name"
 msgstr "Apellido Materno"
 
 #. Line 5
-#: src/dialogs.c:1260 src/dialogs.c:2063
+#: src/dialogs.c:1267 src/dialogs.c:2074
 msgid "City"
 msgstr "Ciudad"
 
 #. Line 6
-#: src/dialogs.c:1271 src/dialogs.c:2074
+#: src/dialogs.c:1278 src/dialogs.c:2085
 msgid "State"
 msgstr "Estado"
 
 #. Line 7
-#: src/dialogs.c:1282 src/dialogs.c:2085
+#: src/dialogs.c:1289 src/dialogs.c:2096
 msgid "Country"
 msgstr "País"
 
-#: src/dialogs.c:1327
+#: src/dialogs.c:1334
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Crear Información del directorio"
 
-#: src/dialogs.c:1344
+#: src/dialogs.c:1351
 msgid "New Passwords Do Not Match"
 msgstr "Las contraseñas nuevas no son iguales"
 
-#: src/dialogs.c:1344 src/dialogs.c:1349
+#: src/dialogs.c:1351 src/dialogs.c:1356
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Error sobre el cambio de contraseña"
 
-#: src/dialogs.c:1349
+#: src/dialogs.c:1356
 msgid "Fill out all fields completely"
 msgstr "Llene todos los campos completamente"
 
-#: src/dialogs.c:1390
+#: src/dialogs.c:1398
 msgid "Original Password"
 msgstr "Contraseña Original"
 
-#: src/dialogs.c:1406
+#: src/dialogs.c:1414
 msgid "New Password"
 msgstr "Contraseña Nueva"
 
-#: src/dialogs.c:1420
+#: src/dialogs.c:1428
 msgid "New Password (again)"
 msgstr "Contraseña Nueva (de nuevo)"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1465
 msgid "Gaim - Password Change"
 msgstr "Gaim - Cambiar Contraseña"
 
-#: src/dialogs.c:1519
+#: src/dialogs.c:1528
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Crear Información del Usuario"
 
-#: src/dialogs.c:1674
+#: src/dialogs.c:1684
 msgid "Below are the results of your search: "
 msgstr "Siguientemente estan los resultados de su búsqueda: "
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1816
 #, fuzzy
 msgid "Permit / Deny"
 msgstr "Permitir algunos"
 
-#: src/dialogs.c:1817 src/prefs.c:391
+#: src/dialogs.c:1827 src/prefs.c:432
 msgid "Deny"
 msgstr "Negar"
 
-#: src/dialogs.c:1822 src/prefs.c:375 src/prefs.c:432
+#: src/dialogs.c:1832 src/prefs.c:416 src/prefs.c:473
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1873
 msgid "Gaim - Add Permit/Deny"
 msgstr "Gaim - Agregar Autorizar/Negar"
 
-#: src/dialogs.c:1917
+#: src/dialogs.c:1927
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2133
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Encontrar amgio por información"
 
-#: src/dialogs.c:2168
+#: src/dialogs.c:2180
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: src/dialogs.c:2187
+#: src/dialogs.c:2199
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electrónico"
 
-#: src/dialogs.c:2269
+#: src/dialogs.c:2283
 msgid "URL"
 msgstr "Dirección"
 
-#: src/dialogs.c:2277
+#: src/dialogs.c:2291
 msgid "Description"
 msgstr "Descripción"
 
-#: src/dialogs.c:2303
+#: src/dialogs.c:2317
 msgid "GAIM - Add URL"
 msgstr "GAIM - Agregar dirección"
 
-#: src/dialogs.c:2446 src/dialogs.c:2459 src/dialogs.c:2496
+#: src/dialogs.c:2460 src/dialogs.c:2473 src/dialogs.c:2510
 msgid "Select Text Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2483
+#: src/dialogs.c:2497
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2708 src/rvous.c:220
+#: src/dialogs.c:2722 src/rvous.c:220
 #, c-format
 msgid "Error writing file %s"
 msgstr "Error creando el archivo %s"
 
-#: src/dialogs.c:2725
+#: src/dialogs.c:2739
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Exportar lista de amigos"
 
-#: src/dialogs.c:2778 src/rvous.c:491
+#: src/dialogs.c:2792 src/rvous.c:491
 #, c-format
 msgid "Error reading file %s"
 msgstr "Error leyendo el archivo %s"
 
-#: src/dialogs.c:2857
+#: src/dialogs.c:2871
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar lista de amigos"
 
-#: src/dialogs.c:2938
+#: src/dialogs.c:2952
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo mensaje de ausencia"
 
 #. Set up our frame
-#: src/dialogs.c:2944
+#: src/dialogs.c:2959
 #, fuzzy
 msgid "New away message"
 msgstr "Nuevo Mensaje de Ausencia"
 
 #. Make a label for away entry
-#: src/dialogs.c:2954
+#: src/dialogs.c:2969
 msgid "Away title: "
 msgstr "Titulo del mensaje: "
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3004
+#: src/dialogs.c:3019
 #, fuzzy
 msgid "Make Away Now"
 msgstr "Hacerme ausente ahora"
 
 #. show everything
-#: src/dialogs.c:3180
+#: src/dialogs.c:3196
 #, fuzzy
 msgid "Smile!"
 msgstr "Archivo"
 
-#: src/dialogs.c:3246
+#: src/dialogs.c:3263
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Agregar Amigo"
 
-#: src/dialogs.c:3284
+#: src/dialogs.c:3301
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Agregar Amigo"
@@ -1023,19 +1025,19 @@
 msgid "About..."
 msgstr "Sobre..."
 
-#: src/gtkhtml.c:1382
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "Dirección:"
 
-#: src/gtkhtml.c:1791
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "Abrir dirección en ventana existente"
 
-#: src/gtkhtml.c:1800
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "Abrir dirección en nueva ventana"
 
-#: src/gtkhtml.c:1808
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "Agregar dirección como favorito"
 
@@ -1061,71 +1063,71 @@
 msgid "Receieved: '%s'\n"
 msgstr "Recibido: '%s'\n"
 
-#: src/oscar.c:154 src/oscar.c:181
+#: src/oscar.c:157 src/oscar.c:184
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: src/oscar.c:162
+#: src/oscar.c:165
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "error de conección!\n"
 
-#: src/oscar.c:179
+#: src/oscar.c:182
 #, fuzzy
 msgid "major connection error\n"
 msgstr "error de conección!\n"
 
-#: src/oscar.c:193
+#: src/oscar.c:196
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:194
+#: src/oscar.c:197
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Error"
 
-#: src/oscar.c:217
+#: src/oscar.c:220
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Connectando %s\n"
 
-#: src/oscar.c:227
+#: src/oscar.c:230
 #, c-format
 msgid "Looking up %s"
 msgstr "Buscando %s"
 
-#: src/oscar.c:232
+#: src/oscar.c:235
 msgid "internal connection error\n"
 msgstr "error interno de conección\n"
 
-#: src/oscar.c:237
+#: src/oscar.c:240
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/oscar.c:245
+#: src/oscar.c:248
 msgid "couldn't resolve host\n"
 msgstr "no se pudo resolver patrón\n"
 
-#: src/oscar.c:249
+#: src/oscar.c:252
 msgid "couldn't connect to host\n"
 msgstr "no se pudo conectar al patrón\n"
 
-#: src/oscar.c:255
+#: src/oscar.c:258
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/oscar.c:280
+#: src/oscar.c:283
 msgid "Password sent, waiting for response\n"
 msgstr "Contraseña mandada, esperando respuesta\n"
 
-#: src/oscar.c:296
+#: src/oscar.c:299
 msgid "Signed off.\n"
 msgstr "Desconectado.\n"
 
 #. connecting too frequently
-#: src/oscar.c:310
+#: src/oscar.c:313
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1134,79 +1136,79 @@
 "Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
 "intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
 
-#: src/oscar.c:310 src/oscar.c:315 src/oscar.c:320 src/oscar.c:753
-#: src/oscar.c:758 src/oscar.c:780 src/oscar.c:799 src/oscar.c:823
+#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:757
+#: src/oscar.c:762 src/oscar.c:784 src/oscar.c:803 src/oscar.c:827
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - Error %d"
 
 #. client too old
-#: src/oscar.c:320
+#: src/oscar.c:323
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:335
+#: src/oscar.c:338
 msgid "Authentication Failed"
 msgstr "Autorización no optenida"
 
-#: src/oscar.c:355
+#: src/oscar.c:358
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/oscar.c:363
+#: src/oscar.c:366
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/oscar.c:394
+#: src/oscar.c:397
 msgid "Connection established, cookie sent"
 msgstr "Conección establesida, cookie enviado"
 
-#: src/oscar.c:625
+#: src/oscar.c:628
 msgid "Accept Direct IM?"
 msgstr ""
 
-#: src/oscar.c:634
+#: src/oscar.c:638
 #, c-format
 msgid "%s has requested to directly connect to your computer. Do you accept?"
 msgstr ""
 
-#: src/oscar.c:644 src/rvous.c:634
+#: src/oscar.c:648 src/rvous.c:635
 msgid "Accept"
 msgstr "Aceptar"
 
 #. message too large
-#: src/oscar.c:752
+#: src/oscar.c:756
 #, 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:757
+#: src/oscar.c:761
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:778
+#: src/oscar.c:782
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:779 src/oscar.c:798
+#: src/oscar.c:783 src/oscar.c:802
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:797
+#: src/oscar.c:801
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:822
+#: src/oscar.c:826
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:828
+#: src/oscar.c:832
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1218,11 +1220,11 @@
 "<BR>En línea desde : <B>%s</B><BR>Minutos Desocupados : <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/oscar.c:861
+#: src/oscar.c:865
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:862
+#: src/oscar.c:866
 msgid "AOL error"
 msgstr ""
 
@@ -1239,161 +1241,190 @@
 msgid "Plugin Error"
 msgstr "Error de aditivo"
 
-#: src/plugins.c:268
+#: src/plugins.c:269
 msgid "Gaim - Plugins"
 msgstr "Gaim - Aditivos"
 
-#: src/plugins.c:297
+#: src/plugins.c:298
 msgid "Load Plugin"
 msgstr "Usar Aditivo"
 
-#: src/plugins.c:304
+#: src/plugins.c:305
 msgid "Configure Plugin"
 msgstr "Configurar Aditivo"
 
-#: src/plugins.c:310
+#: src/plugins.c:311
 msgid "Unload Plugin"
 msgstr "Desocupar Aditivo"
 
-#: src/prefs.c:89
+#: src/prefs.c:90
 #, fuzzy
 msgid "General Options"
 msgstr "Opciones"
 
-#: src/prefs.c:96 src/prefs.c:209 src/prefs.c:335 src/prefs.c:534
-#: src/prefs.c:621 src/prefs.c:672 src/prefs.c:702 src/prefs.c:1081
-#: src/prefs.c:1166 src/prefs.c:1197 src/prefs.c:1484
+#: src/prefs.c:97 src/prefs.c:349 src/prefs.c:375 src/prefs.c:575
+#: src/prefs.c:662 src/prefs.c:771 src/prefs.c:856 src/prefs.c:1249
+#: src/prefs.c:1334 src/prefs.c:1365 src/prefs.c:1652
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:100
+#: src/prefs.c:101
 #, fuzzy
 msgid "Remember password"
 msgstr "Acordarse de la Constraseña"
 
-#: src/prefs.c:102
+#: src/prefs.c:103
 msgid "Auto-login"
 msgstr "Auto-conectar"
 
-#: src/prefs.c:108
+#: src/prefs.c:109
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:109
+#: src/prefs.c:110
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:112
+#: src/prefs.c:113
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:120
+#: src/prefs.c:121
 #, fuzzy
 msgid "Report Idle Times"
 msgstr "Demostrar el tiempo de inactividad de los amigos"
 
-#: src/prefs.c:201
+#: src/prefs.c:198 src/prefs.c:230 src/prefs.c:1974
 #, fuzzy
-msgid "Connection Options"
-msgstr "Connección"
+msgid "TOC Options"
+msgstr "Opciones"
 
-#: src/prefs.c:213
-msgid "Use Oscar Protocol (experimental; only takes effect before signon)"
+#: src/prefs.c:206
+msgid ""
+"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
+"other is TOC.\n"
+"\n"
+"TOC is a published protocol; AOL allows people to use the TOC protocol in "
+"their clients to connect. It is a simplified version of Oscar; it is capable "
+"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
+"is published, using TOC in gaim tends to be more stable and reliable.\n"
+"\n"
+"Oscar is a proprietary protocol. AOL has not published any information about "
+"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
+"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
+"or implemented all of the functions of Oscar, it is still able to perform "
+"most functions TOC provides as well as several others. However, using Oscar "
+"in gaim tends to be less reliable, though more usable.\n"
+"\n"
+"Changing this option takes effect at signon time."
 msgstr ""
 
-#: src/prefs.c:219
-msgid "The following options do not apply if you use Oscar."
+#: src/prefs.c:212
+msgid "Use Oscar Protocol"
 msgstr ""
 
-#: src/prefs.c:227
+#: src/prefs.c:242
 msgid "TOC Host:"
 msgstr "Patrón TOC: "
 
-#: src/prefs.c:237 src/prefs.c:262 src/prefs.c:296
+#: src/prefs.c:252 src/prefs.c:277 src/prefs.c:311
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/prefs.c:252
+#: src/prefs.c:267
 msgid "Login Host:"
 msgstr "Patrón de Conección"
 
-#: src/prefs.c:273
+#: src/prefs.c:288
 msgid "No Proxy"
 msgstr "No Proxy"
 
-#: src/prefs.c:274
+#: src/prefs.c:289
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: src/prefs.c:275
+#: src/prefs.c:290
 #, fuzzy
 msgid "Socks 4 Proxy"
 msgstr "No Proxy"
 
-#: src/prefs.c:276
+#: src/prefs.c:291
 #, fuzzy
 msgid "Socks 5 Proxy"
 msgstr "No Proxy"
 
-#: src/prefs.c:282
+#: src/prefs.c:297
 msgid "Proxy Host:"
 msgstr "Patrón Proxy:"
 
-#: src/prefs.c:328
+#: src/prefs.c:342 src/prefs.c:1979
+#, fuzzy
+msgid "Oscar Options"
+msgstr "Opciones"
+
+#: src/prefs.c:353
+msgid "Send Keep-Alive Packet (6 bytes/minute)"
+msgstr ""
+
+#: src/prefs.c:368
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Lista de Amigos"
 
-#: src/prefs.c:339
+#: src/prefs.c:379
 msgid "Show numbers in groups"
 msgstr "Demostrar los numeros en grupos"
 
-#: src/prefs.c:340
+#: src/prefs.c:380
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:381
 msgid "Show idle times"
 msgstr "Demostrar el tiempo de inactividad de los amigos"
 
-#: src/prefs.c:341
+#: src/prefs.c:382
 #, fuzzy
 msgid "Show buddy type icons"
 msgstr "Demostrar dibujos de los tipos de amigos"
 
-#: src/prefs.c:347
+#: src/prefs.c:388
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
-#: src/prefs.c:348
+#: src/prefs.c:389
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:354
+#: src/prefs.c:395
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "Guardar algunas configuraciones de tamaño/posicion de ventanas"
 
-#: src/prefs.c:356
+#: src/prefs.c:397
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "Automaticamente demuestre la lista de amigos"
 
-#: src/prefs.c:506
+#: src/prefs.c:547
 msgid "Please sign on before editing the permit/deny lists."
 msgstr ""
 
-#: src/prefs.c:507
+#: src/prefs.c:548
 msgid "Please sign on"
 msgstr ""
 
-#: src/prefs.c:527
+#: src/prefs.c:568
 msgid "Permit/Deny List Options"
 msgstr ""
 
-#: src/prefs.c:542
+#: src/prefs.c:583
 msgid ""
 "The permit/deny configuration will change between users,\n"
 "and changes while you are signed off will not be saved."
 msgstr ""
 
-#: src/prefs.c:555
+#: src/prefs.c:596
 #, fuzzy
 msgid "Allow Anyone"
 msgstr "Permitir a todos"
@@ -1401,323 +1432,336 @@
 #. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
 #. * and merging the two would be very difficult at best, most likely
 #. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:560
+#: src/prefs.c:601
 msgid "Allow only users on Buddy List"
 msgstr ""
 
-#: src/prefs.c:562
+#: src/prefs.c:603
 msgid "Allow only the users in \"Permit\""
 msgstr ""
 
-#: src/prefs.c:568
+#: src/prefs.c:609
 msgid "Block all users"
 msgstr ""
 
-#: src/prefs.c:569
+#: src/prefs.c:610
 msgid "Block the users in \"Deny\""
 msgstr ""
 
-#: src/prefs.c:614
+#: src/prefs.c:655
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:625
+#: src/prefs.c:666
 msgid "Enter sends message"
 msgstr "Enter manda el mensaje"
 
-#: src/prefs.c:626
+#: src/prefs.c:667
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:627
+#: src/prefs.c:668
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:633
+#: src/prefs.c:674
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "Demostrar caritas gráficas (experimental)"
 
-#: src/prefs.c:634
+#: src/prefs.c:675
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "Demostrar la hora de los mensajes"
 
-#: src/prefs.c:635
+#: src/prefs.c:676
 #, fuzzy
 msgid "Ignore incoming colors"
 msgstr "Ignorar los colores de los amigos"
 
-#: src/prefs.c:636
+#: src/prefs.c:677
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:642
+#: src/prefs.c:683
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:643
+#: src/prefs.c:684
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "Quitar HTML de todas las conversaciones guardadas"
 
-#: src/prefs.c:649
+#: src/prefs.c:690
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Automagicamente destaque las faltas de ortografía"
 
-#: src/prefs.c:650
+#: src/prefs.c:691
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "Mandar direcciones como enlaze"
 
-#: src/prefs.c:651
+#: src/prefs.c:692
 msgid "Sending messages removes away status"
 msgstr "Mandando un mensaje quita el estado de ausente"
 
-#: src/prefs.c:665
+#: src/prefs.c:733 src/prefs.c:818
+msgid "Pictures and Text"
+msgstr ""
+
+#: src/prefs.c:738 src/prefs.c:823
+msgid "Pictures Only"
+msgstr ""
+
+#: src/prefs.c:743 src/prefs.c:828
+#, fuzzy
+msgid "Text Only"
+msgstr "Color del texto"
+
+#: src/prefs.c:764
 #, fuzzy
 msgid "IM Options"
 msgstr "Opciones"
 
-#: src/prefs.c:676
+#: src/prefs.c:775
 #, fuzzy
 msgid "Show logins in window"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:677 src/prefs.c:707
+#: src/prefs.c:781 src/prefs.c:866
 #, fuzzy
-msgid "Show buttons with text"
+msgid "Show buttons as "
 msgstr "Demostrar los dibujos en los botonoes"
 
-#: src/prefs.c:678 src/prefs.c:708
+#: src/prefs.c:790 src/prefs.c:876
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:679 src/prefs.c:709
+#: src/prefs.c:791 src/prefs.c:877
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Alzar ventanas cuando un mensaje sea recibido"
 
-#: src/prefs.c:680 src/prefs.c:1404
+#: src/prefs.c:792 src/prefs.c:1572
 msgid "Ignore new conversations when away"
 msgstr "Ignorar nuevas conversaciones mientras este ausente"
 
-#: src/prefs.c:681
+#: src/prefs.c:793
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "Crear Mensaje"
 
-#: src/prefs.c:695 src/prefs.c:883
+#: src/prefs.c:849 src/prefs.c:1051
 #, fuzzy
 msgid "Chat Options"
 msgstr "Opciones"
 
-#: src/prefs.c:706
+#: src/prefs.c:860
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:740 src/prefs.c:742 src/prefs.c:954 src/prefs.c:956
+#: src/prefs.c:908 src/prefs.c:910 src/prefs.c:1122 src/prefs.c:1124
 msgid "Gaim Chat"
 msgstr "Gaim Conversaciones"
 
-#: src/prefs.c:900
+#: src/prefs.c:1068
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/prefs.c:928
+#: src/prefs.c:1096
 msgid "List of available chats"
 msgstr "Lista de conversaciones disponibles"
 
-#: src/prefs.c:942
+#: src/prefs.c:1110
 msgid "List of subscribed chats"
 msgstr "Lista de conversaciones subscritas"
 
-#: src/prefs.c:1074 src/prefs.c:1831
+#: src/prefs.c:1242 src/prefs.c:2027
 #, fuzzy
 msgid "Font Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1087
+#: src/prefs.c:1255
 msgid "Underlined Text"
 msgstr "Texto Subrayado"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1256
 msgid "Strike Text"
 msgstr "Texto cruzado por una linea"
 
-#: src/prefs.c:1101 src/prefs.c:1118 src/prefs.c:1138
+#: src/prefs.c:1269 src/prefs.c:1286 src/prefs.c:1306
 #, fuzzy
 msgid "Select"
 msgstr "Seleccionar un Texto"
 
-#: src/prefs.c:1136
+#: src/prefs.c:1304
 msgid "Font Face for Text"
 msgstr "Tipo de texto"
 
-#: src/prefs.c:1159
+#: src/prefs.c:1327
 #, fuzzy
 msgid "Sound Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1171
+#: src/prefs.c:1339
 msgid "Sounds go through GNOME"
 msgstr "Sonidos pasan por GNOME"
 
-#: src/prefs.c:1173
+#: src/prefs.c:1341
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:1174 src/prefs.c:1405
+#: src/prefs.c:1342 src/prefs.c:1573
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1175
+#: src/prefs.c:1343
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1190
+#: src/prefs.c:1358
 #, fuzzy
 msgid "Sound Events"
 msgstr "Sonidos"
 
-#: src/prefs.c:1201
+#: src/prefs.c:1369
 msgid "Sound when buddy logs in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:1202
+#: src/prefs.c:1370
 msgid "Sound when buddy logs out"
 msgstr "Sonido cuando un amigo se desconecte"
 
-#: src/prefs.c:1208
+#: src/prefs.c:1376
 msgid "Sound when message is received"
 msgstr "Sonido cuando un mensaje es recibido"
 
-#: src/prefs.c:1209
+#: src/prefs.c:1377
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "Sonido cuando un mensaje es recibido"
 
-#: src/prefs.c:1210
+#: src/prefs.c:1378
 msgid "Sound when message is sent"
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/prefs.c:1216
+#: src/prefs.c:1384
 #, fuzzy
 msgid "Sound in chat rooms when people enter/leave"
 msgstr "Sonidos en conversaciones cuando gente entra o sale"
 
-#: src/prefs.c:1217
+#: src/prefs.c:1385
 #, fuzzy
 msgid "Sound in chat rooms when people talk"
 msgstr "Sonidos en conversaciones cuando getne habla"
 
-#: src/prefs.c:1302 src/prefs.c:1858
+#: src/prefs.c:1470 src/prefs.c:2054
 #, fuzzy
 msgid "Away Messages"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/prefs.c:1318
+#: src/prefs.c:1486
 #, fuzzy
 msgid "Title"
 msgstr "Archivo"
 
-#: src/prefs.c:1322
+#: src/prefs.c:1490
 #, fuzzy
 msgid "Message"
 msgstr "Crear Mensaje"
 
-#: src/prefs.c:1362
+#: src/prefs.c:1530
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1366
+#: src/prefs.c:1534
 #, fuzzy
 msgid "Make Away"
 msgstr "Hacerme ausente ahora"
 
-#: src/prefs.c:1477
+#: src/prefs.c:1645
 #, fuzzy
 msgid "Browser Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1488
+#: src/prefs.c:1656
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:1489
+#: src/prefs.c:1657
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1491
+#: src/prefs.c:1659
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1493
+#: src/prefs.c:1661
 #, fuzzy
 msgid "Internal HTML Widget (Quite likely a bad idea!)"
 msgstr "Programa de HTML Interno (Probablemente una idea mala!)"
 
-#: src/prefs.c:1494
+#: src/prefs.c:1662
 msgid "Manual"
 msgstr "Manual"
 
-#: src/prefs.c:1503
+#: src/prefs.c:1671
 msgid "Pop up new window by default"
 msgstr "Crear una nueva ventana por omisión"
 
-#: src/prefs.c:1547
+#: src/prefs.c:1716
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
-#: src/prefs.c:1630
+#: src/prefs.c:1801
 msgid "GAIM debug output window"
 msgstr "GAIM ventana de respuestas del programa"
 
-#: src/prefs.c:1772
+#: src/prefs.c:1956
 msgid "General"
 msgstr "General"
 
-#: src/prefs.c:1783
+#: src/prefs.c:1969
 msgid "Connection"
 msgstr "Connección"
 
 #. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:1800
+#: src/prefs.c:1996
 #, fuzzy
 msgid "Permit/Deny"
 msgstr "Permitir algunos"
 
-#: src/prefs.c:1811
+#: src/prefs.c:2007
 #, fuzzy
 msgid "Conversations"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:1816
+#: src/prefs.c:2012
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:1821
+#: src/prefs.c:2017
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:1826
+#: src/prefs.c:2022
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:1842
+#: src/prefs.c:2038
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/prefs.c:1847
+#: src/prefs.c:2043
 msgid "Events"
 msgstr ""
 
-#: src/prefs.c:1869
+#: src/prefs.c:2065
 msgid "Browser"
 msgstr "Navegador"
 
@@ -1739,20 +1783,24 @@
 msgid "Sending %s to %s"
 msgstr "Mandando %s a %s"
 
-#: src/rvous.c:661
+#: src/rvous.c:662
 #, c-format
 msgid "%s requests you to accept the file: %s (%d bytes)"
 msgstr "%s le pide que acepte el archivo: %s (%d bytes)"
 
-#: src/rvous.c:664
+#: src/rvous.c:665
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s le pide que les mande un archivo"
 
-#: src/rvous.c:674
+#: src/rvous.c:675
 msgid "Gaim - File Transfer?"
 msgstr "¿Gaim - Transferir Archivos?"
 
+#, fuzzy
+#~ msgid "Connection Options"
+#~ msgstr "Connección"
+
 #~ msgid "Permit some"
 #~ msgstr "Permitir algunos"
 
--- a/po/fr.po	Mon Sep 18 10:43:38 2000 +0000
+++ b/po/fr.po	Mon Sep 18 18:07:38 2000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2000-09-11 02:08-0700\n"
+"POT-Creation-Date: 2000-09-15 18:12-0700\n"
 "PO-Revision-Date: 2000-06-13 22:26-0700\n"
 "Last-Translator: Seb Carpe\n"
 "MIME-Version: 1.0\n"
@@ -27,72 +27,72 @@
 msgid "You must give your password"
 msgstr "Vous devez indiquer votre mot de passe"
 
-#: src/aim.c:231 src/buddy.c:1790
+#: src/aim.c:231 src/buddy.c:1849
 msgid "Signoff"
 msgstr "Deconnection"
 
-#: src/aim.c:329 src/aim.c:575 src/buddy.c:308
+#: src/aim.c:334 src/aim.c:579 src/buddy.c:318
 msgid "Signon"
 msgstr "Connection"
 
-#: src/aim.c:330 src/buddy_chat.c:127 src/buddy_chat.c:219 src/dialogs.c:418
-#: src/dialogs.c:717 src/dialogs.c:873 src/dialogs.c:949 src/dialogs.c:1065
-#: src/dialogs.c:1196 src/dialogs.c:1382 src/dialogs.c:1486 src/dialogs.c:1567
-#: src/dialogs.c:1811 src/dialogs.c:1998 src/dialogs.c:2163 src/dialogs.c:2256
-#: src/dialogs.c:2981 src/dialogs.c:3240 src/oscar.c:647 src/rvous.c:279
-#: src/rvous.c:416 src/rvous.c:637
+#: src/aim.c:335 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:419
+#: src/dialogs.c:720 src/dialogs.c:877 src/dialogs.c:954 src/dialogs.c:1071
+#: src/dialogs.c:1203 src/dialogs.c:1390 src/dialogs.c:1495 src/dialogs.c:1576
+#: src/dialogs.c:1821 src/dialogs.c:2009 src/dialogs.c:2175 src/dialogs.c:2270
+#: src/dialogs.c:2996 src/dialogs.c:3257 src/oscar.c:651 src/rvous.c:279
+#: src/rvous.c:416 src/rvous.c:638
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/aim.c:331 src/buddy.c:1787
+#: src/aim.c:336 src/buddy.c:1846
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: src/aim.c:332
+#: src/aim.c:337
 msgid "Options"
 msgstr "Options"
 
-#: src/aim.c:334 src/aim.c:581 src/buddy.c:1853
+#: src/aim.c:339 src/aim.c:585 src/buddy.c:1912
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:408
+#: src/aim.c:413
 msgid "Screen Name: "
 msgstr "Pseudonyme: "
 
-#: src/aim.c:411
+#: src/aim.c:416
 msgid "Password: "
 msgstr "Mot de Passe: "
 
-#: src/aim.c:414
+#: src/aim.c:419
 msgid "Remember Password"
 msgstr "Mémoriser le mot de passe"
 
-#: src/aim.c:461
+#: src/aim.c:466
 msgid "Gaim - Login"
 msgstr "Gaim - Connection"
 
-#: src/aim.c:570 src/buddy.c:1850
+#: src/aim.c:574 src/buddy.c:1909
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/away.c:88 src/away.c:202
+#: src/away.c:88 src/away.c:203
 msgid "Back"
 msgstr "De retour"
 
-#: src/away.c:98
+#: src/away.c:99
 msgid "I'm Back!"
 msgstr "Je suis de Retour!!"
 
-#: src/away.c:140
+#: src/away.c:141
 msgid "Gaim - Away!"
 msgstr "Gaim - Absent!"
 
-#: src/away.c:243 src/gnome_applet_mgr.c:198
+#: src/away.c:244 src/gnome_applet_mgr.c:198
 msgid "New Away Message"
 msgstr "Nouveau Message d'absence"
 
-#: src/away.c:262
+#: src/away.c:263
 msgid "Remove Away Message"
 msgstr "Enlever le message d'absence"
 
@@ -102,108 +102,109 @@
 msgstr "%d/%d potes en ligne"
 
 #. Put the buttons in the box
-#: src/buddy.c:250 src/buddy.c:1922 src/conversation.c:447
-#: src/conversation.c:1664 src/dialogs.c:871 src/dialogs.c:948
-#: src/dialogs.c:1810 src/dialogs.c:1832 src/dialogs.c:3238 src/prefs.c:587
-#: src/prefs.c:901 src/prefs.c:1358
+#: src/buddy.c:259 src/buddy.c:1981 src/buddy_chat.c:816
+#: src/conversation.c:440 src/conversation.c:1650 src/dialogs.c:875
+#: src/dialogs.c:953 src/dialogs.c:1820 src/dialogs.c:1842 src/dialogs.c:3255
+#: src/prefs.c:628 src/prefs.c:1069 src/prefs.c:1526
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/buddy.c:251 src/buddy.c:1923 src/dialogs.c:881 src/dialogs.c:964
+#: src/buddy.c:260 src/buddy.c:1982 src/dialogs.c:885 src/dialogs.c:969
 msgid "Group"
 msgstr "Groupe"
 
-#: src/buddy.c:252 src/buddy.c:1924 src/conversation.c:1662 src/dialogs.c:780
-#: src/prefs.c:591 src/prefs.c:902 src/prefs.c:1370
+#: src/buddy.c:261 src/buddy.c:1983 src/buddy_chat.c:818
+#: src/conversation.c:1648 src/dialogs.c:783 src/prefs.c:632 src/prefs.c:1070
+#: src/prefs.c:1538
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/buddy.c:255 src/buddy.c:1696
+#: src/buddy.c:264 src/buddy.c:1753
 msgid "Chat"
 msgstr "Forum"
 
-#: src/buddy.c:256 src/buddy.c:395 src/buddy.c:1694 src/buddy_chat.c:545
+#: src/buddy.c:265 src/buddy.c:405 src/buddy.c:1751 src/buddy_chat.c:543
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:257 src/buddy.c:401 src/buddy.c:1695 src/buddy_chat.c:547
-#: src/conversation.c:1658 src/rvous.c:635
+#: src/buddy.c:266 src/buddy.c:411 src/buddy.c:1752 src/buddy_chat.c:545
+#: src/buddy_chat.c:824 src/conversation.c:1644 src/rvous.c:636
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:407 src/dialogs.c:3252
+#: src/buddy.c:417 src/dialogs.c:3269
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:414
+#: src/buddy.c:424
 msgid "Dir Info"
 msgstr "Info Personnelle"
 
-#: src/buddy.c:421
+#: src/buddy.c:431
 #, fuzzy
 msgid "Direct IM"
 msgstr "Information Personnelle"
 
-#: src/buddy.c:427
+#: src/buddy.c:437
 msgid "Away Msg"
 msgstr "Message d'absence"
 
-#: src/buddy.c:434
+#: src/buddy.c:444
 msgid "Toggle Logging"
 msgstr "Activer le Traçage"
 
-#: src/buddy.c:440
+#: src/buddy.c:450
 msgid "Add Buddy Pounce"
 msgstr "Ajouter une Alerte"
 
-#: src/buddy.c:1204
+#: src/buddy.c:1246
 msgid "New Buddy Pounce"
 msgstr "Nouvelle Alerte"
 
-#: src/buddy.c:1222
+#: src/buddy.c:1264
 msgid "Remove Buddy Pounce"
 msgstr "Enlever une Alerte"
 
-#: src/buddy.c:1297
+#: src/buddy.c:1352
 #, fuzzy, c-format
 msgid "%sBuddy Icon"
 msgstr "Alerte"
 
-#: src/buddy.c:1300
+#: src/buddy.c:1355
 #, c-format
 msgid "%sVoice"
 msgstr ""
 
-#: src/buddy.c:1303
+#: src/buddy.c:1358
 #, c-format
 msgid "%sIM Image"
 msgstr ""
 
-#: src/buddy.c:1306
+#: src/buddy.c:1361
 #, fuzzy, c-format
 msgid "%sChat"
 msgstr "Forum"
 
-#: src/buddy.c:1309
+#: src/buddy.c:1364
 #, c-format
 msgid "%sGet File"
 msgstr ""
 
-#: src/buddy.c:1312
+#: src/buddy.c:1367
 #, c-format
 msgid "%sSend File"
 msgstr ""
 
-#: src/buddy.c:1367
+#: src/buddy.c:1422
 msgid "Warnings: %d%%\n"
 msgstr "Attention: %d%%\n"
 
-#: src/buddy.c:1373
+#: src/buddy.c:1428
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1377
+#: src/buddy.c:1432
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -215,373 +216,374 @@
 "Connecté depuis: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1377
+#: src/buddy.c:1432
 msgid "Idle: "
 msgstr "Inactif: "
 
-#: src/buddy.c:1422
+#: src/buddy.c:1477
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s s'est connecté%s%s.</B><BR><HR>"
 
-#: src/buddy.c:1563
+#: src/buddy.c:1620
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "HR><B>%s s'est déconnecté%s%s.</B><BR><HR>"
 
-#: src/buddy.c:1721
+#: src/buddy.c:1778
 msgid "Information on selected Buddy"
 msgstr "Information sur le pote sélectionné"
 
-#: src/buddy.c:1722 src/dialogs.c:708
+#: src/buddy.c:1779 src/dialogs.c:711
 msgid "Send Instant Message"
 msgstr "Envoyer un message"
 
-#: src/buddy.c:1723
+#: src/buddy.c:1780
 msgid "Start/join a Buddy Chat"
 msgstr "Ouvrir/Rallier un Forum"
 
-#: src/buddy.c:1774
+#: src/buddy.c:1833
 msgid "File"
 msgstr "Fichier"
 
-#: src/buddy.c:1778 src/buddy.c:1779
+#: src/buddy.c:1837 src/buddy.c:1838
 msgid "Add A Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/buddy.c:1780
+#: src/buddy.c:1839
 #, fuzzy
 msgid "Join A Chat"
 msgstr "Rallier le forum"
 
-#: src/buddy.c:1782
+#: src/buddy.c:1841
 msgid "Import Buddy List"
 msgstr "Importer une Liste de Potes"
 
-#: src/buddy.c:1783
+#: src/buddy.c:1842
 msgid "Export Buddy List"
 msgstr "Exporter une Liste de Potes"
 
-#: src/buddy.c:1793
+#: src/buddy.c:1852
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/buddy.c:1795 src/buddy_chat.c:539 src/buddy_chat.c:787
-#: src/conversation.c:1660 src/dialogs.c:495 src/plugins.c:317
-#: src/prefs.c:1597
+#: src/buddy.c:1854 src/buddy_chat.c:537 src/buddy_chat.c:791
+#: src/buddy_chat.c:812 src/conversation.c:1646 src/dialogs.c:496
+#: src/plugins.c:318 src/prefs.c:1768
 msgid "Close"
 msgstr "Fermer"
 
-#: src/buddy.c:1800
+#: src/buddy.c:1859
 msgid "Tools"
 msgstr "Outils"
 
-#: src/buddy.c:1805 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:1864 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
 msgid "Away"
 msgstr "Absent"
 
-#: src/buddy.c:1810
+#: src/buddy.c:1869
 msgid "Buddy Pounce"
 msgstr "Alerte"
 
-#: src/buddy.c:1818 src/dialogs.c:1992 src/dialogs.c:2148
+#: src/buddy.c:1877 src/dialogs.c:2003 src/dialogs.c:2160
 msgid "Search for Buddy"
 msgstr "Rechercher un Pote"
 
-#: src/buddy.c:1821
+#: src/buddy.c:1880
 msgid "by Email"
 msgstr "Par son Email"
 
-#: src/buddy.c:1825
+#: src/buddy.c:1884
 msgid "by Dir Info"
 msgstr "Par ses Informations Personnelles"
 
-#: src/buddy.c:1832 src/buddy.c:1833
+#: src/buddy.c:1891 src/buddy.c:1892
 msgid "Settings"
 msgstr "Préférences"
 
-#: src/buddy.c:1836
+#: src/buddy.c:1895
 msgid "User Info"
 msgstr "Message d'Information"
 
-#: src/buddy.c:1840 src/dialogs.c:1190
+#: src/buddy.c:1899 src/dialogs.c:1197
 msgid "Directory Info"
 msgstr "Information Personnelle"
 
-#: src/buddy.c:1844 src/dialogs.c:1376
+#: src/buddy.c:1903 src/dialogs.c:1384
 msgid "Change Password"
 msgstr "Changer de Mot de Passe"
 
-#: src/buddy.c:1858
+#: src/buddy.c:1917
 #, fuzzy
 msgid "Perl"
 msgstr "Autoriser"
 
-#: src/buddy.c:1861
+#: src/buddy.c:1920
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1865
+#: src/buddy.c:1924
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1869
+#: src/buddy.c:1928
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1877
+#: src/buddy.c:1936
 msgid "Help"
 msgstr "Aide"
 
-#: src/buddy.c:1882
+#: src/buddy.c:1941
 #, fuzzy
 msgid "About Gaim"
 msgstr "A propos..."
 
-#: src/buddy.c:1901 src/prefs.c:1794
+#: src/buddy.c:1960 src/prefs.c:1990
 msgid "Buddy List"
 msgstr "Liste de Potes"
 
-#: src/buddy.c:1953
+#: src/buddy.c:2012
 msgid "Add a new Buddy"
 msgstr "Ajouter un Nouveau Pote"
 
-#: src/buddy.c:1954
+#: src/buddy.c:2013
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Ajouter un Nouveau Pote"
 
-#: src/buddy.c:1955
+#: src/buddy.c:2014
 msgid "Remove selected Buddy"
 msgstr "Supprimer le Pote sélectionné"
 
-#: src/buddy.c:1980
+#: src/buddy.c:2039
 msgid "Online"
 msgstr "En Ligne"
 
-#: src/buddy.c:1982
+#: src/buddy.c:2041
 msgid "Edit Buddies"
 msgstr "Editer ses amis"
 
-#: src/buddy.c:2019
+#: src/buddy.c:2078
 msgid "Gaim - Buddy List"
 msgstr "GAIM - Liste des Potes"
 
-#: src/buddy_chat.c:124 src/buddy_chat.c:729 src/buddy_chat.c:741
+#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
 msgid "Buddy Chat"
 msgstr "Forum"
 
-#: src/buddy_chat.c:126
+#: src/buddy_chat.c:123
 msgid "Join"
 msgstr "Joindre"
 
-#: src/buddy_chat.c:132
+#: src/buddy_chat.c:129
 msgid "Join what group:"
 msgstr "Joindre le groupe: "
 
-#: src/buddy_chat.c:138
+#: src/buddy_chat.c:135
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:146
+#: src/buddy_chat.c:143
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:175
+#: src/buddy_chat.c:172
 msgid "Join Chat"
 msgstr "Rallier le forum"
 
-#: src/buddy_chat.c:220 src/buddy_chat.c:541 src/buddy_chat.c:786
+#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/buddy_chat.c:237
+#: src/buddy_chat.c:234
 msgid "Invite who?"
 msgstr "Inviter qui ?"
 
-#: src/buddy_chat.c:241
+#: src/buddy_chat.c:238
 msgid "With message:"
 msgstr "En utilisant le message:"
 
-#: src/buddy_chat.c:268
+#: src/buddy_chat.c:265
 msgid "Invite to Buddy Chat"
 msgstr "Inviter à un Forum"
 
-#: src/buddy_chat.c:427
+#: src/buddy_chat.c:424
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:455
+#: src/buddy_chat.c:452
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:542 src/buddy_chat.c:785
+#: src/buddy_chat.c:540 src/buddy_chat.c:789
 msgid "Whisper"
 msgstr "Murmurer"
 
-#: src/buddy_chat.c:543 src/buddy_chat.c:784 src/conversation.c:1657
-#: src/dialogs.c:1568
+#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
+#: src/conversation.c:1643 src/dialogs.c:1577
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/buddy_chat.c:546
+#: src/buddy_chat.c:544
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: src/conversation.c:181
+#: src/buddy_chat.c:820 src/conversation.c:1651
+msgid "Block"
+msgstr "Bloquer"
+
+#: src/buddy_chat.c:822 src/conversation.c:1645 src/dialogs.c:415
+#: src/dialogs.c:417 src/rvous.c:637
+msgid "Warn"
+msgstr "Donner un Avertissement"
+
+#: src/conversation.c:171
 #, fuzzy, c-format
 msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
 msgstr "<HR><B>%s s'est connecté%s%s.</B><BR><HR>"
 
-#: src/conversation.c:188
+#: src/conversation.c:178
 #, fuzzy, c-format
 msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
 msgstr "<HR><B>%s s'est connecté%s%s.</B><BR><HR>"
 
-#: src/conversation.c:442
+#: src/conversation.c:435
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Suppression de '%s' de la Liste\n"
 
-#: src/conversation.c:695
+#: src/conversation.c:688
 msgid "Message too long, some data truncated."
 msgstr "Message trop long, données tronquées"
 
-#: src/conversation.c:695 src/dialogs.c:2709 src/dialogs.c:2779
+#: src/conversation.c:688 src/dialogs.c:2723 src/dialogs.c:2793
 #: src/rvous.c:221 src/rvous.c:492
 msgid "Error"
 msgstr "Erreur"
 
-#: src/conversation.c:883
+#: src/conversation.c:875
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Actuellement à %d\n"
 
-#: src/conversation.c:892
+#: src/conversation.c:884
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Positionné à %d\n"
 
-#: src/conversation.c:1489
+#: src/conversation.c:1481
 msgid "Bold"
 msgstr "Gras"
 
-#: src/conversation.c:1489 src/prefs.c:1085
+#: src/conversation.c:1481 src/prefs.c:1253
 msgid "Bold Text"
 msgstr "Texte en Gras"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1485 src/conversation.c:1486
 msgid "Italics"
 msgstr "Italique"
 
-#: src/conversation.c:1493 src/prefs.c:1086
+#: src/conversation.c:1485 src/prefs.c:1254
 msgid "Italics Text"
 msgstr "Texte en Italique"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1489 src/conversation.c:1490
 msgid "Underline"
 msgstr "Souligné"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1489
 msgid "Underline Text"
 msgstr "Texte Souligné"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1493 src/conversation.c:1494
 msgid "Strike"
 msgstr "Barré"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1493
 msgid "Strike through Text"
 msgstr "Texte Barré"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1497
 msgid "Small"
 msgstr "Petit"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1497
 msgid "Decrease font size"
 msgstr "Fonte plus Petite"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1500
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1500
 msgid "Normal font size"
 msgstr "Fonte Normale"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1503
 msgid "Big"
 msgstr "Grand"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1503
 msgid "Increase font size"
 msgstr "Fonte plus Grande"
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1510 src/conversation.c:1511
 msgid "Font"
 msgstr "Fonte"
 
-#: src/conversation.c:1518 src/dialogs.c:2608 src/dialogs.c:2624
+#: src/conversation.c:1510 src/dialogs.c:2622 src/dialogs.c:2638
 msgid "Select Font"
 msgstr "Sectionner une fonte"
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1514 src/conversation.c:1515 src/conversation.c:1518
+#: src/conversation.c:1519
 msgid "Color"
 msgstr "Couleur"
 
-#: src/conversation.c:1522 src/prefs.c:1099
+#: src/conversation.c:1514 src/prefs.c:1267
 msgid "Text Color"
 msgstr "Couleur de texte"
 
-#: src/conversation.c:1526 src/prefs.c:1116
+#: src/conversation.c:1518 src/prefs.c:1284
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1525 src/conversation.c:1526
 msgid "Link"
 msgstr "Lien"
 
-#: src/conversation.c:1533 src/dialogs.c:2250
+#: src/conversation.c:1525 src/dialogs.c:2264
 msgid "Insert Link"
 msgstr "Insérer un Lien"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1529
 #, fuzzy
 msgid "Smiley"
 msgstr "Fichier"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1529
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1536 src/conversation.c:1537
 msgid "Logging"
 msgstr "Connection"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1536
 msgid "Enable logging"
 msgstr "Activer la Connection"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1540 src/conversation.c:1541
 msgid "Sound"
 msgstr "Son"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1540
 msgid "Enable sounds"
 msgstr "Activer le son"
 
-#: src/conversation.c:1659 src/dialogs.c:414 src/dialogs.c:416 src/rvous.c:636
-msgid "Warn"
-msgstr "Donner un Avertissement"
-
-#: src/conversation.c:1665
-msgid "Block"
-msgstr "Bloquer"
-
 #: src/dialogs.c:224
 msgid "Error Resolving Mail Server.\n"
 msgstr "Erreur à la résolution du serveur de mail\n"
@@ -590,130 +592,130 @@
 msgid "Error Connecting to Socket.\n"
 msgstr "Erreur à la connection socket\n"
 
-#: src/dialogs.c:431
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Voulez-vous réellement donner un avertissement à %s?"
 
-#: src/dialogs.c:435
+#: src/dialogs.c:436
 msgid "Warn anonymously?"
 msgstr "Donner un avertissement anonyme?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:439
 msgid "Anonymous warnings are less harsh."
 msgstr "Les avertissements anonymes sont moins durs."
 
-#: src/dialogs.c:463
+#: src/dialogs.c:464
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Donner un Avertissement?"
 
-#: src/dialogs.c:531
+#: src/dialogs.c:532
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossible d'ecrire dans le fichier %s."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:535
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossible de lire le fichier %s."
 
-#: src/dialogs.c:537
+#: src/dialogs.c:538
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message trop long, perte des %d derniers octets."
 
-#: src/dialogs.c:540
+#: src/dialogs.c:541
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s n'est pas en ligne."
 
-#: src/dialogs.c:543
+#: src/dialogs.c:544
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Les Avertissements à %s ne sont pas permis."
 
-#: src/dialogs.c:546
+#: src/dialogs.c:547
 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:549
+#: src/dialogs.c:550
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Le forum %s est inaccessible."
 
-#: src/dialogs.c:552
+#: src/dialogs.c:553
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Vous envoyez vos messages trop vite à %s."
 
-#: src/dialogs.c:555
+#: src/dialogs.c:556
 #, 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:558
+#: src/dialogs.c:559
 #, 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:561
+#: src/dialogs.c:562
 msgid "Failure."
 msgstr "Echec"
 
-#: src/dialogs.c:564
+#: src/dialogs.c:565
 msgid "Too many matches."
 msgstr "Trop de réponses"
 
-#: src/dialogs.c:567
+#: src/dialogs.c:568
 msgid "Need more qualifiers."
 msgstr "Besoin de plus de critères."
 
-#: src/dialogs.c:570
+#: src/dialogs.c:571
 msgid "Dir service temporarily unavailable."
 msgstr "Le repertoire est temporairement indisponible."
 
-#: src/dialogs.c:573
+#: src/dialogs.c:574
 msgid "Email lookup restricted."
 msgstr "La recherche par Email est restreinte."
 
-#: src/dialogs.c:576
+#: src/dialogs.c:577
 msgid "Keyword ignored."
 msgstr "Mot clé ignoré."
 
-#: src/dialogs.c:579
+#: src/dialogs.c:580
 msgid "No keywords."
 msgstr "Pas de mot-clé."
 
-#: src/dialogs.c:582
+#: src/dialogs.c:583
 msgid "User has no directory information."
 msgstr "L'utilisateur n'a pas d'information personnelle."
 
-#: src/dialogs.c:586
+#: src/dialogs.c:587
 msgid "Country not supported."
 msgstr "Pays non supporté."
 
-#: src/dialogs.c:589
+#: src/dialogs.c:590
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Echec inconnu: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:592 src/oscar.c:315
+#: src/dialogs.c:593 src/oscar.c:318
 msgid "Incorrect nickname or password."
 msgstr "Pseudonye ou Mot de Passe incorrect."
 
-#: src/dialogs.c:595
+#: src/dialogs.c:596
 msgid "The service is temporarily unavailable."
 msgstr "Le service est termporairement indisponible."
 
-#: src/dialogs.c:598
+#: src/dialogs.c:599
 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:601
+#: src/dialogs.c:602
 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."
@@ -722,271 +724,271 @@
 "etRéessayez. Si vous continuez d'essayer, il vous faudra attendre encore "
 "plus longtemps."
 
-#: src/dialogs.c:604
+#: src/dialogs.c:605
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Une erreur inconnue est survenue à la connection: %s."
 
-#: src/dialogs.c:607
+#: src/dialogs.c:608
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Une erreur inconnue, %d, s'est produite. Info:%s"
 
-#: src/dialogs.c:610
+#: src/dialogs.c:611
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - Erreur %d"
 
 #. Build OK Button
-#: src/dialogs.c:649 src/dialogs.c:712 src/dialogs.c:1060 src/dialogs.c:1381
-#: src/dialogs.c:1665 src/dialogs.c:1997 src/dialogs.c:2158 src/dialogs.c:2255
+#: src/dialogs.c:650 src/dialogs.c:715 src/dialogs.c:1066 src/dialogs.c:1389
+#: src/dialogs.c:1675 src/dialogs.c:2008 src/dialogs.c:2170 src/dialogs.c:2269
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:722
+#: src/dialogs.c:725
 msgid "IM who: "
 msgstr "Envoyer un message à qui: "
 
-#: src/dialogs.c:746
+#: src/dialogs.c:749
 msgid "Gaim - IM user"
 msgstr "Gaim - IM Utilisateur"
 
-#: src/dialogs.c:828
+#: src/dialogs.c:831
 msgid "Buddies"
 msgstr "Potes"
 
-#: src/dialogs.c:879
+#: src/dialogs.c:883
 #, fuzzy
 msgid "Add Group"
 msgstr "Groupe"
 
-#: src/dialogs.c:909
+#: src/dialogs.c:913
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "GAIM - Ajouter un Pote"
 
-#: src/dialogs.c:955
+#: src/dialogs.c:960
 msgid "Add Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/dialogs.c:957 src/dialogs.c:3248
+#: src/dialogs.c:962 src/dialogs.c:3265
 msgid "Buddy"
 msgstr "Pote"
 
-#: src/dialogs.c:996
+#: src/dialogs.c:1001
 msgid "Gaim - Add Buddy"
 msgstr "GAIM - Ajouter un Pote"
 
 #. Put the buttons in the box
-#: src/dialogs.c:1071
+#: src/dialogs.c:1077
 msgid "Buddy To Pounce:"
 msgstr "Pote à attendre:"
 
-#: src/dialogs.c:1076
+#: src/dialogs.c:1082
 msgid "Open IM Window on Buddy Logon"
 msgstr "Ouvrir la fenetre des messages à la connection"
 
-#: src/dialogs.c:1079
+#: src/dialogs.c:1085
 msgid "Send IM on Buddy Logon"
 msgstr "Envoyer un message à la connection"
 
-#: src/dialogs.c:1087
+#: src/dialogs.c:1093
 msgid "Message to send:"
 msgstr "Message à envoyer"
 
-#: src/dialogs.c:1108
+#: src/dialogs.c:1114
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nouvelle Alerte"
 
 #. Build Save Button
-#: src/dialogs.c:1194 src/dialogs.c:1485 src/dialogs.c:2976
+#: src/dialogs.c:1201 src/dialogs.c:1494 src/dialogs.c:2991
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/dialogs.c:1212
+#: src/dialogs.c:1219
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Autoriser les recherches sur le web à trouver vos informations"
 
 #. Line 1
-#: src/dialogs.c:1215 src/dialogs.c:2015
+#: src/dialogs.c:1222 src/dialogs.c:2026
 msgid "First Name"
 msgstr "Prénom"
 
 #. Line 2
-#: src/dialogs.c:1226 src/dialogs.c:2027
+#: src/dialogs.c:1233 src/dialogs.c:2038
 msgid "Middle Name"
 msgstr "Surnom"
 
 #. Line 3
-#: src/dialogs.c:1238 src/dialogs.c:2039
+#: src/dialogs.c:1245 src/dialogs.c:2050
 msgid "Last Name"
 msgstr "Nom"
 
 #. Line 4
-#: src/dialogs.c:1249 src/dialogs.c:2051
+#: src/dialogs.c:1256 src/dialogs.c:2062
 msgid "Maiden Name"
 msgstr "Nom de jeune-fille"
 
 #. Line 5
-#: src/dialogs.c:1260 src/dialogs.c:2063
+#: src/dialogs.c:1267 src/dialogs.c:2074
 msgid "City"
 msgstr "Ville"
 
 #. Line 6
-#: src/dialogs.c:1271 src/dialogs.c:2074
+#: src/dialogs.c:1278 src/dialogs.c:2085
 msgid "State"
 msgstr "Etat"
 
 #. Line 7
-#: src/dialogs.c:1282 src/dialogs.c:2085
+#: src/dialogs.c:1289 src/dialogs.c:2096
 msgid "Country"
 msgstr "Pays"
 
-#: src/dialogs.c:1327
+#: src/dialogs.c:1334
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Donner vos informations personnelles"
 
-#: src/dialogs.c:1344
+#: src/dialogs.c:1351
 msgid "New Passwords Do Not Match"
 msgstr "Les nouveaux password diffèrent"
 
-#: src/dialogs.c:1344 src/dialogs.c:1349
+#: src/dialogs.c:1351 src/dialogs.c:1356
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Erreur au changement de Mot de Passe"
 
-#: src/dialogs.c:1349
+#: src/dialogs.c:1356
 msgid "Fill out all fields completely"
 msgstr "Remplissez tous les champs"
 
-#: src/dialogs.c:1390
+#: src/dialogs.c:1398
 msgid "Original Password"
 msgstr "Mot de Passe courrant"
 
-#: src/dialogs.c:1406
+#: src/dialogs.c:1414
 msgid "New Password"
 msgstr "Nouveau Mot de Passe"
 
-#: src/dialogs.c:1420
+#: src/dialogs.c:1428
 msgid "New Password (again)"
 msgstr "Nouveau Mot de passe (confirmation)"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1465
 msgid "Gaim - Password Change"
 msgstr "Gaim - Changement de mot de passe"
 
-#: src/dialogs.c:1519
+#: src/dialogs.c:1528
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Message d'information"
 
-#: src/dialogs.c:1674
+#: src/dialogs.c:1684
 msgid "Below are the results of your search: "
 msgstr "Résultats de votre recherche: "
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1816
 #, fuzzy
 msgid "Permit / Deny"
 msgstr "Autoriser certains"
 
-#: src/dialogs.c:1817 src/prefs.c:391
+#: src/dialogs.c:1827 src/prefs.c:432
 msgid "Deny"
 msgstr "Interdire"
 
-#: src/dialogs.c:1822 src/prefs.c:375 src/prefs.c:432
+#: src/dialogs.c:1832 src/prefs.c:416 src/prefs.c:473
 msgid "Permit"
 msgstr "Autoriser"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1873
 msgid "Gaim - Add Permit/Deny"
 msgstr "Gaim - Ajouter des autorisation/Permission"
 
-#: src/dialogs.c:1917
+#: src/dialogs.c:1927
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2133
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - trouver un pote d'après ses Infos."
 
-#: src/dialogs.c:2168
+#: src/dialogs.c:2180
 msgid "Email"
 msgstr "Email"
 
-#: src/dialogs.c:2187
+#: src/dialogs.c:2199
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Trouver un ami d'après son Email"
 
-#: src/dialogs.c:2269
+#: src/dialogs.c:2283
 msgid "URL"
 msgstr "Site Web"
 
-#: src/dialogs.c:2277
+#: src/dialogs.c:2291
 msgid "Description"
 msgstr "Description"
 
-#: src/dialogs.c:2303
+#: src/dialogs.c:2317
 msgid "GAIM - Add URL"
 msgstr "Gaim - Ajouter un site Web"
 
-#: src/dialogs.c:2446 src/dialogs.c:2459 src/dialogs.c:2496
+#: src/dialogs.c:2460 src/dialogs.c:2473 src/dialogs.c:2510
 msgid "Select Text Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2483
+#: src/dialogs.c:2497
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2708 src/rvous.c:220
+#: src/dialogs.c:2722 src/rvous.c:220
 #, c-format
 msgid "Error writing file %s"
 msgstr "Erreur à l'écriture du fichier %s"
 
-#: src/dialogs.c:2725
+#: src/dialogs.c:2739
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Exporter la liste de Potes"
 
-#: src/dialogs.c:2778 src/rvous.c:491
+#: src/dialogs.c:2792 src/rvous.c:491
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erreur à la lecture du fichier %s"
 
-#: src/dialogs.c:2857
+#: src/dialogs.c:2871
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importer la liste de Potes"
 
-#: src/dialogs.c:2938
+#: src/dialogs.c:2952
 msgid "Gaim - New away message"
 msgstr "Gaim - Nouveau message d'absence"
 
 #. Set up our frame
-#: src/dialogs.c:2944
+#: src/dialogs.c:2959
 #, fuzzy
 msgid "New away message"
 msgstr "Nouveau Message d'absence"
 
 #. Make a label for away entry
-#: src/dialogs.c:2954
+#: src/dialogs.c:2969
 msgid "Away title: "
 msgstr "Intitulé: "
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3004
+#: src/dialogs.c:3019
 #, fuzzy
 msgid "Make Away Now"
 msgstr "Etre absent maintenant"
 
 #. show everything
-#: src/dialogs.c:3180
+#: src/dialogs.c:3196
 #, fuzzy
 msgid "Smile!"
 msgstr "Fichier"
 
-#: src/dialogs.c:3246
+#: src/dialogs.c:3263
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/dialogs.c:3284
+#: src/dialogs.c:3301
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "GAIM - Ajouter un Pote"
@@ -1024,19 +1026,19 @@
 msgid "About..."
 msgstr "A Propos..."
 
-#: src/gtkhtml.c:1382
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "Lien HTML:"
 
-#: src/gtkhtml.c:1791
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "Ouvrir l'URL dans une fenêtre existante"
 
-#: src/gtkhtml.c:1800
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "Ouvrir l'URL dans une nouvelle fenêtre"
 
-#: src/gtkhtml.c:1808
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "Ajouter l'URL aux favoris/bookmarks"
 
@@ -1062,71 +1064,71 @@
 msgid "Receieved: '%s'\n"
 msgstr "Reçu: '%s'\n"
 
-#: src/oscar.c:154 src/oscar.c:181
+#: src/oscar.c:157 src/oscar.c:184
 msgid "Disconnected."
 msgstr "Déconnecté."
 
-#: src/oscar.c:162
+#: src/oscar.c:165
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "erreur à la connection!\n"
 
-#: src/oscar.c:179
+#: src/oscar.c:182
 #, fuzzy
 msgid "major connection error\n"
 msgstr "erreur à la connection!\n"
 
-#: src/oscar.c:193
+#: src/oscar.c:196
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:194
+#: src/oscar.c:197
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Erreur"
 
-#: src/oscar.c:217
+#: src/oscar.c:220
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Connection de %s.\n"
 
-#: src/oscar.c:227
+#: src/oscar.c:230
 #, c-format
 msgid "Looking up %s"
 msgstr "Résolution de %s"
 
-#: src/oscar.c:232
+#: src/oscar.c:235
 msgid "internal connection error\n"
 msgstr "erreur interne de connection\n"
 
-#: src/oscar.c:237
+#: src/oscar.c:240
 msgid "Unable to login to AIM"
 msgstr "Impossible de se connecter à AIM."
 
-#: src/oscar.c:245
+#: src/oscar.c:248
 msgid "couldn't resolve host\n"
 msgstr "incapable de résoudre l'adresse\n"
 
-#: src/oscar.c:249
+#: src/oscar.c:252
 msgid "couldn't connect to host\n"
 msgstr "incapable de se connecter au serveur\n"
 
-#: src/oscar.c:255
+#: src/oscar.c:258
 #, c-format
 msgid "Signon: %s"
 msgstr "Connection: %s"
 
-#: src/oscar.c:280
+#: src/oscar.c:283
 msgid "Password sent, waiting for response\n"
 msgstr "Mot de passe envoyé, en attente de réponse\n"
 
-#: src/oscar.c:296
+#: src/oscar.c:299
 msgid "Signed off.\n"
 msgstr "Hors Ligne.\n"
 
 #. connecting too frequently
-#: src/oscar.c:310
+#: src/oscar.c:313
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1136,80 +1138,80 @@
 "etRéessayez. Si vous continuez d'essayer, il vous faudra attendre encore "
 "plus longtemps."
 
-#: src/oscar.c:310 src/oscar.c:315 src/oscar.c:320 src/oscar.c:753
-#: src/oscar.c:758 src/oscar.c:780 src/oscar.c:799 src/oscar.c:823
+#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:757
+#: src/oscar.c:762 src/oscar.c:784 src/oscar.c:803 src/oscar.c:827
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - Erreur %d"
 
 #. client too old
-#: src/oscar.c:320
+#: src/oscar.c:323
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:335
+#: src/oscar.c:338
 msgid "Authentication Failed"
 msgstr "Echec de Vérification."
 
-#: src/oscar.c:355
+#: src/oscar.c:358
 msgid "Internal Error"
 msgstr "Erreur Interne"
 
-#: src/oscar.c:363
+#: src/oscar.c:366
 msgid "Could Not Connect"
 msgstr "Impossible de se Connecter"
 
-#: src/oscar.c:394
+#: src/oscar.c:397
 msgid "Connection established, cookie sent"
 msgstr "Connection établie, cookie envoyé"
 
-#: src/oscar.c:625
+#: src/oscar.c:628
 msgid "Accept Direct IM?"
 msgstr ""
 
-#: src/oscar.c:634
+#: src/oscar.c:638
 #, c-format
 msgid "%s has requested to directly connect to your computer. Do you accept?"
 msgstr ""
 
-#: src/oscar.c:644 src/rvous.c:634
+#: src/oscar.c:648 src/rvous.c:635
 msgid "Accept"
 msgstr "Accepter"
 
 #. message too large
-#: src/oscar.c:752
+#: src/oscar.c:756
 #, 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:757
+#: src/oscar.c:761
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:778
+#: src/oscar.c:782
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:779 src/oscar.c:798
+#: src/oscar.c:783 src/oscar.c:802
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:797
+#: src/oscar.c:801
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:822
+#: src/oscar.c:826
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:828
+#: src/oscar.c:832
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1221,11 +1223,11 @@
 "<BR>En Ligne depuis : <B>%s</B><BR>Minutes d'inactivité : <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/oscar.c:861
+#: src/oscar.c:865
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:862
+#: src/oscar.c:866
 msgid "AOL error"
 msgstr ""
 
@@ -1242,161 +1244,190 @@
 msgid "Plugin Error"
 msgstr "Erreur de Plugin"
 
-#: src/plugins.c:268
+#: src/plugins.c:269
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
-#: src/plugins.c:297
+#: src/plugins.c:298
 msgid "Load Plugin"
 msgstr "Charger le Plugin"
 
-#: src/plugins.c:304
+#: src/plugins.c:305
 msgid "Configure Plugin"
 msgstr "Configurer le Plugin"
 
-#: src/plugins.c:310
+#: src/plugins.c:311
 msgid "Unload Plugin"
 msgstr "Décharger le Plugin"
 
-#: src/prefs.c:89
+#: src/prefs.c:90
 #, fuzzy
 msgid "General Options"
 msgstr "Options"
 
-#: src/prefs.c:96 src/prefs.c:209 src/prefs.c:335 src/prefs.c:534
-#: src/prefs.c:621 src/prefs.c:672 src/prefs.c:702 src/prefs.c:1081
-#: src/prefs.c:1166 src/prefs.c:1197 src/prefs.c:1484
+#: src/prefs.c:97 src/prefs.c:349 src/prefs.c:375 src/prefs.c:575
+#: src/prefs.c:662 src/prefs.c:771 src/prefs.c:856 src/prefs.c:1249
+#: src/prefs.c:1334 src/prefs.c:1365 src/prefs.c:1652
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:100
+#: src/prefs.c:101
 #, fuzzy
 msgid "Remember password"
 msgstr "Mémoriser le mot de passe"
 
-#: src/prefs.c:102
+#: src/prefs.c:103
 msgid "Auto-login"
 msgstr "Connection automatique"
 
-#: src/prefs.c:108
+#: src/prefs.c:109
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:109
+#: src/prefs.c:110
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:112
+#: src/prefs.c:113
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:120
+#: src/prefs.c:121
 #, fuzzy
 msgid "Report Idle Times"
 msgstr "Afficher les temps d'inactivité"
 
-#: src/prefs.c:201
+#: src/prefs.c:198 src/prefs.c:230 src/prefs.c:1974
 #, fuzzy
-msgid "Connection Options"
-msgstr "Connection"
+msgid "TOC Options"
+msgstr "Options"
 
-#: src/prefs.c:213
-msgid "Use Oscar Protocol (experimental; only takes effect before signon)"
+#: src/prefs.c:206
+msgid ""
+"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
+"other is TOC.\n"
+"\n"
+"TOC is a published protocol; AOL allows people to use the TOC protocol in "
+"their clients to connect. It is a simplified version of Oscar; it is capable "
+"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
+"is published, using TOC in gaim tends to be more stable and reliable.\n"
+"\n"
+"Oscar is a proprietary protocol. AOL has not published any information about "
+"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
+"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
+"or implemented all of the functions of Oscar, it is still able to perform "
+"most functions TOC provides as well as several others. However, using Oscar "
+"in gaim tends to be less reliable, though more usable.\n"
+"\n"
+"Changing this option takes effect at signon time."
 msgstr ""
 
-#: src/prefs.c:219
-msgid "The following options do not apply if you use Oscar."
+#: src/prefs.c:212
+msgid "Use Oscar Protocol"
 msgstr ""
 
-#: src/prefs.c:227
+#: src/prefs.c:242
 msgid "TOC Host:"
 msgstr "Serveur TOC:"
 
-#: src/prefs.c:237 src/prefs.c:262 src/prefs.c:296
+#: src/prefs.c:252 src/prefs.c:277 src/prefs.c:311
 msgid "Port:"
 msgstr "Port:"
 
-#: src/prefs.c:252
+#: src/prefs.c:267
 msgid "Login Host:"
 msgstr "Connection au serveur:"
 
-#: src/prefs.c:273
+#: src/prefs.c:288
 msgid "No Proxy"
 msgstr "Pas de proxy"
 
-#: src/prefs.c:274
+#: src/prefs.c:289
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: src/prefs.c:275
+#: src/prefs.c:290
 #, fuzzy
 msgid "Socks 4 Proxy"
 msgstr "Pas de proxy"
 
-#: src/prefs.c:276
+#: src/prefs.c:291
 #, fuzzy
 msgid "Socks 5 Proxy"
 msgstr "Pas de proxy"
 
-#: src/prefs.c:282
+#: src/prefs.c:297
 msgid "Proxy Host:"
 msgstr "Proxy"
 
-#: src/prefs.c:328
+#: src/prefs.c:342 src/prefs.c:1979
+#, fuzzy
+msgid "Oscar Options"
+msgstr "Options"
+
+#: src/prefs.c:353
+msgid "Send Keep-Alive Packet (6 bytes/minute)"
+msgstr ""
+
+#: src/prefs.c:368
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Liste de Potes"
 
-#: src/prefs.c:339
+#: src/prefs.c:379
 msgid "Show numbers in groups"
 msgstr "Afficher le nombre dans les groupes"
 
-#: src/prefs.c:340
+#: src/prefs.c:380
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:381
 msgid "Show idle times"
 msgstr "Afficher les temps d'inactivité"
 
-#: src/prefs.c:341
+#: src/prefs.c:382
 #, fuzzy
 msgid "Show buddy type icons"
 msgstr "afficher les images des potes"
 
-#: src/prefs.c:347
+#: src/prefs.c:388
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
-#: src/prefs.c:348
+#: src/prefs.c:389
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:354
+#: src/prefs.c:395
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "Mémoriser la taille et la position de certaines fenetres"
 
-#: src/prefs.c:356
+#: src/prefs.c:397
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "Afficher la liste des potes automagiquement"
 
-#: src/prefs.c:506
+#: src/prefs.c:547
 msgid "Please sign on before editing the permit/deny lists."
 msgstr ""
 
-#: src/prefs.c:507
+#: src/prefs.c:548
 msgid "Please sign on"
 msgstr ""
 
-#: src/prefs.c:527
+#: src/prefs.c:568
 msgid "Permit/Deny List Options"
 msgstr ""
 
-#: src/prefs.c:542
+#: src/prefs.c:583
 msgid ""
 "The permit/deny configuration will change between users,\n"
 "and changes while you are signed off will not be saved."
 msgstr ""
 
-#: src/prefs.c:555
+#: src/prefs.c:596
 #, fuzzy
 msgid "Allow Anyone"
 msgstr "Autoriser tout le monde"
@@ -1404,321 +1435,334 @@
 #. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
 #. * and merging the two would be very difficult at best, most likely
 #. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:560
+#: src/prefs.c:601
 msgid "Allow only users on Buddy List"
 msgstr ""
 
-#: src/prefs.c:562
+#: src/prefs.c:603
 msgid "Allow only the users in \"Permit\""
 msgstr ""
 
-#: src/prefs.c:568
+#: src/prefs.c:609
 msgid "Block all users"
 msgstr ""
 
-#: src/prefs.c:569
+#: src/prefs.c:610
 msgid "Block the users in \"Deny\""
 msgstr ""
 
-#: src/prefs.c:614
+#: src/prefs.c:655
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:625
+#: src/prefs.c:666
 msgid "Enter sends message"
 msgstr "Entrer les messages envoyés"
 
-#: src/prefs.c:626
+#: src/prefs.c:667
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:627
+#: src/prefs.c:668
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:633
+#: src/prefs.c:674
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "Afficher graphiquement les smileys (expérimental)"
 
-#: src/prefs.c:634
+#: src/prefs.c:675
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "Afficher l'heure su les messages"
 
-#: src/prefs.c:635
+#: src/prefs.c:676
 #, fuzzy
 msgid "Ignore incoming colors"
 msgstr "Ignorer les couleurs envoyées"
 
-#: src/prefs.c:636
+#: src/prefs.c:677
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:642
+#: src/prefs.c:683
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Tracer toutes les conversations"
 
-#: src/prefs.c:643
+#: src/prefs.c:684
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "Enlever l'HTML des traces"
 
-#: src/prefs.c:649
+#: src/prefs.c:690
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Surligner automagiquement les mots mal orthographiés"
 
-#: src/prefs.c:650
+#: src/prefs.c:691
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "Envoyer les URL comme des liens cliquables"
 
-#: src/prefs.c:651
+#: src/prefs.c:692
 msgid "Sending messages removes away status"
 msgstr "L'envoi de message supprime le statut d'absence"
 
-#: src/prefs.c:665
+#: src/prefs.c:733 src/prefs.c:818
+msgid "Pictures and Text"
+msgstr ""
+
+#: src/prefs.c:738 src/prefs.c:823
+msgid "Pictures Only"
+msgstr ""
+
+#: src/prefs.c:743 src/prefs.c:828
+#, fuzzy
+msgid "Text Only"
+msgstr "Couleur de texte"
+
+#: src/prefs.c:764
 #, fuzzy
 msgid "IM Options"
 msgstr "Options"
 
-#: src/prefs.c:676
+#: src/prefs.c:775
 #, fuzzy
 msgid "Show logins in window"
 msgstr "Afficher les (dé)connection dans la fenetre de forum"
 
-#: src/prefs.c:677 src/prefs.c:707
+#: src/prefs.c:781 src/prefs.c:866
 #, fuzzy
-msgid "Show buttons with text"
+msgid "Show buttons as "
 msgstr "Afficher les images sur les boutons"
 
-#: src/prefs.c:678 src/prefs.c:708
+#: src/prefs.c:790 src/prefs.c:876
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:679 src/prefs.c:709
+#: src/prefs.c:791 src/prefs.c:877
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Avancer les fenêtres recevant un message"
 
-#: src/prefs.c:680 src/prefs.c:1404
+#: src/prefs.c:792 src/prefs.c:1572
 msgid "Ignore new conversations when away"
 msgstr "Ignorer les nouveaux forums lors des absences"
 
-#: src/prefs.c:681
+#: src/prefs.c:793
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "Créer un Message"
 
-#: src/prefs.c:695 src/prefs.c:883
+#: src/prefs.c:849 src/prefs.c:1051
 #, fuzzy
 msgid "Chat Options"
 msgstr "Options"
 
-#: src/prefs.c:706
+#: src/prefs.c:860
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:740 src/prefs.c:742 src/prefs.c:954 src/prefs.c:956
+#: src/prefs.c:908 src/prefs.c:910 src/prefs.c:1122 src/prefs.c:1124
 msgid "Gaim Chat"
 msgstr "Forum Gaim"
 
-#: src/prefs.c:900
+#: src/prefs.c:1068
 msgid "Refresh"
 msgstr "Rafraichir"
 
-#: src/prefs.c:928
+#: src/prefs.c:1096
 msgid "List of available chats"
 msgstr "Liste des forums disponibles"
 
-#: src/prefs.c:942
+#: src/prefs.c:1110
 msgid "List of subscribed chats"
 msgstr "Liste des forums souscrits"
 
-#: src/prefs.c:1074 src/prefs.c:1831
+#: src/prefs.c:1242 src/prefs.c:2027
 #, fuzzy
 msgid "Font Options"
 msgstr "Options"
 
-#: src/prefs.c:1087
+#: src/prefs.c:1255
 msgid "Underlined Text"
 msgstr "Texte Souligné"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1256
 msgid "Strike Text"
 msgstr "Texte barré"
 
-#: src/prefs.c:1101 src/prefs.c:1118 src/prefs.c:1138
+#: src/prefs.c:1269 src/prefs.c:1286 src/prefs.c:1306
 #, fuzzy
 msgid "Select"
 msgstr "Sectionner une fonte"
 
-#: src/prefs.c:1136
+#: src/prefs.c:1304
 msgid "Font Face for Text"
 msgstr "Fonte pour le Texte"
 
-#: src/prefs.c:1159
+#: src/prefs.c:1327
 #, fuzzy
 msgid "Sound Options"
 msgstr "Options"
 
-#: src/prefs.c:1171
+#: src/prefs.c:1339
 msgid "Sounds go through GNOME"
 msgstr "Les sons sont envoyés à GNOME"
 
-#: src/prefs.c:1173
+#: src/prefs.c:1341
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Son quand vos potes se connectent"
 
-#: src/prefs.c:1174 src/prefs.c:1405
+#: src/prefs.c:1342 src/prefs.c:1573
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1175
+#: src/prefs.c:1343
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1190
+#: src/prefs.c:1358
 #, fuzzy
 msgid "Sound Events"
 msgstr "Sons"
 
-#: src/prefs.c:1201
+#: src/prefs.c:1369
 msgid "Sound when buddy logs in"
 msgstr "Son quand vos potes se connectent"
 
-#: src/prefs.c:1202
+#: src/prefs.c:1370
 msgid "Sound when buddy logs out"
 msgstr "Son quand vos potes se déconnectent"
 
-#: src/prefs.c:1208
+#: src/prefs.c:1376
 msgid "Sound when message is received"
 msgstr "Son à la reception d'un message"
 
-#: src/prefs.c:1209
+#: src/prefs.c:1377
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "Son à la reception d'un message"
 
-#: src/prefs.c:1210
+#: src/prefs.c:1378
 msgid "Sound when message is sent"
 msgstr "Son à l'envoi d'un message"
 
-#: src/prefs.c:1216
+#: src/prefs.c:1384
 #, fuzzy
 msgid "Sound in chat rooms when people enter/leave"
 msgstr "Son lorsque les personnes entrent/sortent d'un forum"
 
-#: src/prefs.c:1217
+#: src/prefs.c:1385
 #, fuzzy
 msgid "Sound in chat rooms when people talk"
 msgstr "Son lorsque els personnes parlent dnas un forum"
 
-#: src/prefs.c:1302 src/prefs.c:1858
+#: src/prefs.c:1470 src/prefs.c:2054
 #, fuzzy
 msgid "Away Messages"
 msgstr "Nouveau Message d'absence"
 
-#: src/prefs.c:1318
+#: src/prefs.c:1486
 #, fuzzy
 msgid "Title"
 msgstr "Fichier"
 
-#: src/prefs.c:1322
+#: src/prefs.c:1490
 #, fuzzy
 msgid "Message"
 msgstr "Créer un Message"
 
-#: src/prefs.c:1362
+#: src/prefs.c:1530
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1366
+#: src/prefs.c:1534
 #, fuzzy
 msgid "Make Away"
 msgstr "Etre absent maintenant"
 
-#: src/prefs.c:1477
+#: src/prefs.c:1645
 #, fuzzy
 msgid "Browser Options"
 msgstr "Options"
 
-#: src/prefs.c:1488
+#: src/prefs.c:1656
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:1489
+#: src/prefs.c:1657
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1491
+#: src/prefs.c:1659
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1493
+#: src/prefs.c:1661
 #, fuzzy
 msgid "Internal HTML Widget (Quite likely a bad idea!)"
 msgstr "Support HTML Interne (plutot une mauvaise idée!)"
 
-#: src/prefs.c:1494
+#: src/prefs.c:1662
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/prefs.c:1503
+#: src/prefs.c:1671
 msgid "Pop up new window by default"
 msgstr "Afficher une nouvelle fenêtre par défaut"
 
-#: src/prefs.c:1547
+#: src/prefs.c:1716
 msgid "Gaim - Preferences"
 msgstr "Gaim - Préférences"
 
-#: src/prefs.c:1630
+#: src/prefs.c:1801
 msgid "GAIM debug output window"
 msgstr "fenetre de debug GAIM"
 
-#: src/prefs.c:1772
+#: src/prefs.c:1956
 msgid "General"
 msgstr "Génerale"
 
-#: src/prefs.c:1783
+#: src/prefs.c:1969
 msgid "Connection"
 msgstr "Connection"
 
 #. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:1800
+#: src/prefs.c:1996
 #, fuzzy
 msgid "Permit/Deny"
 msgstr "Autoriser certains"
 
-#: src/prefs.c:1811
+#: src/prefs.c:2007
 #, fuzzy
 msgid "Conversations"
 msgstr "Tracer toutes les conversations"
 
-#: src/prefs.c:1816
+#: src/prefs.c:2012
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:1821
+#: src/prefs.c:2017
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:1826
+#: src/prefs.c:2022
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:1842
+#: src/prefs.c:2038
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/prefs.c:1847
+#: src/prefs.c:2043
 msgid "Events"
 msgstr ""
 
-#: src/prefs.c:1869
+#: src/prefs.c:2065
 msgid "Browser"
 msgstr "Navigateur"
 
@@ -1740,20 +1784,24 @@
 msgid "Sending %s to %s"
 msgstr "Envoi de %s à %s"
 
-#: src/rvous.c:661
+#: src/rvous.c:662
 #, c-format
 msgid "%s requests you to accept the file: %s (%d bytes)"
 msgstr "%s vous demande d'accepter le fichier: %s (%d bytes)"
 
-#: src/rvous.c:664
+#: src/rvous.c:665
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s vous demande de leur envoyer un fichier"
 
-#: src/rvous.c:674
+#: src/rvous.c:675
 msgid "Gaim - File Transfer?"
 msgstr "Gaim - Transfert de fichier?"
 
+#, fuzzy
+#~ msgid "Connection Options"
+#~ msgstr "Connection"
+
 #~ msgid "Permit some"
 #~ msgstr "Autoriser certains"
 
--- a/po/ko.po	Mon Sep 18 10:43:38 2000 +0000
+++ b/po/ko.po	Mon Sep 18 18:07:38 2000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 02:08-0700\n"
+"POT-Creation-Date: 2000-09-15 18:12-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"
@@ -28,72 +28,72 @@
 msgid "You must give your password"
 msgstr "Æнº¿öµå¸¦ ÀÔ·ÂÇϼž߸¸ ÇÕ´Ï´Ù"
 
-#: src/aim.c:231 src/buddy.c:1790
+#: src/aim.c:231 src/buddy.c:1849
 msgid "Signoff"
 msgstr "²÷±â"
 
-#: src/aim.c:329 src/aim.c:575 src/buddy.c:308
+#: src/aim.c:334 src/aim.c:579 src/buddy.c:318
 msgid "Signon"
 msgstr "¿¬°á"
 
-#: src/aim.c:330 src/buddy_chat.c:127 src/buddy_chat.c:219 src/dialogs.c:418
-#: src/dialogs.c:717 src/dialogs.c:873 src/dialogs.c:949 src/dialogs.c:1065
-#: src/dialogs.c:1196 src/dialogs.c:1382 src/dialogs.c:1486 src/dialogs.c:1567
-#: src/dialogs.c:1811 src/dialogs.c:1998 src/dialogs.c:2163 src/dialogs.c:2256
-#: src/dialogs.c:2981 src/dialogs.c:3240 src/oscar.c:647 src/rvous.c:279
-#: src/rvous.c:416 src/rvous.c:637
+#: src/aim.c:335 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:419
+#: src/dialogs.c:720 src/dialogs.c:877 src/dialogs.c:954 src/dialogs.c:1071
+#: src/dialogs.c:1203 src/dialogs.c:1390 src/dialogs.c:1495 src/dialogs.c:1576
+#: src/dialogs.c:1821 src/dialogs.c:2009 src/dialogs.c:2175 src/dialogs.c:2270
+#: src/dialogs.c:2996 src/dialogs.c:3257 src/oscar.c:651 src/rvous.c:279
+#: src/rvous.c:416 src/rvous.c:638
 msgid "Cancel"
 msgstr "Ãë¼Ò"
 
-#: src/aim.c:331 src/buddy.c:1787
+#: src/aim.c:336 src/buddy.c:1846
 msgid "Register"
 msgstr "µî·Ï"
 
-#: src/aim.c:332
+#: src/aim.c:337
 msgid "Options"
 msgstr "¿É¼Ç"
 
-#: src/aim.c:334 src/aim.c:581 src/buddy.c:1853
+#: src/aim.c:339 src/aim.c:585 src/buddy.c:1912
 msgid "Plugins"
 msgstr "Ç÷¯±×ÀÎ"
 
-#: src/aim.c:408
+#: src/aim.c:413
 msgid "Screen Name: "
 msgstr "È­¸éÀ̸§: "
 
-#: src/aim.c:411
+#: src/aim.c:416
 msgid "Password: "
 msgstr "¾ÏÈ£: "
 
-#: src/aim.c:414
+#: src/aim.c:419
 msgid "Remember Password"
 msgstr "¾ÏÈ£ ÀúÀå"
 
-#: src/aim.c:461
+#: src/aim.c:466
 msgid "Gaim - Login"
 msgstr "Gaim - ·Î±×ÀÎ"
 
-#: src/aim.c:570 src/buddy.c:1850
+#: src/aim.c:574 src/buddy.c:1909
 msgid "Preferences"
 msgstr "¼³Á¤"
 
-#: src/away.c:88 src/away.c:202
+#: src/away.c:88 src/away.c:203
 msgid "Back"
 msgstr "µÚ·Î"
 
-#: src/away.c:98
+#: src/away.c:99
 msgid "I'm Back!"
 msgstr "³»°¡ µ¹¾Æ¿Ô´Ù!"
 
-#: src/away.c:140
+#: src/away.c:141
 msgid "Gaim - Away!"
 msgstr "Gaim - Àá¼ö!"
 
-#: src/away.c:243 src/gnome_applet_mgr.c:198
+#: src/away.c:244 src/gnome_applet_mgr.c:198
 msgid "New Away Message"
 msgstr "»õ·Î¿î Àá¼ö ¸Þ½ÃÁö"
 
-#: src/away.c:262
+#: src/away.c:263
 msgid "Remove Away Message"
 msgstr "Àá¼ö ¸Þ½ÃÁö ¾ø¾Ö±â"
 
@@ -103,108 +103,109 @@
 msgstr "ÇöÀç Á¢¼ÓµÈ Ä£±¸´Â %d/%d"
 
 #. Put the buttons in the box
-#: src/buddy.c:250 src/buddy.c:1922 src/conversation.c:447
-#: src/conversation.c:1664 src/dialogs.c:871 src/dialogs.c:948
-#: src/dialogs.c:1810 src/dialogs.c:1832 src/dialogs.c:3238 src/prefs.c:587
-#: src/prefs.c:901 src/prefs.c:1358
+#: src/buddy.c:259 src/buddy.c:1981 src/buddy_chat.c:816
+#: src/conversation.c:440 src/conversation.c:1650 src/dialogs.c:875
+#: src/dialogs.c:953 src/dialogs.c:1820 src/dialogs.c:1842 src/dialogs.c:3255
+#: src/prefs.c:628 src/prefs.c:1069 src/prefs.c:1526
 msgid "Add"
 msgstr "´õÇϱâ"
 
-#: src/buddy.c:251 src/buddy.c:1923 src/dialogs.c:881 src/dialogs.c:964
+#: src/buddy.c:260 src/buddy.c:1982 src/dialogs.c:885 src/dialogs.c:969
 msgid "Group"
 msgstr "±×·ì"
 
-#: src/buddy.c:252 src/buddy.c:1924 src/conversation.c:1662 src/dialogs.c:780
-#: src/prefs.c:591 src/prefs.c:902 src/prefs.c:1370
+#: src/buddy.c:261 src/buddy.c:1983 src/buddy_chat.c:818
+#: src/conversation.c:1648 src/dialogs.c:783 src/prefs.c:632 src/prefs.c:1070
+#: src/prefs.c:1538
 msgid "Remove"
 msgstr "Á¦°Å"
 
-#: src/buddy.c:255 src/buddy.c:1696
+#: src/buddy.c:264 src/buddy.c:1753
 msgid "Chat"
 msgstr "äÆÃ"
 
-#: src/buddy.c:256 src/buddy.c:395 src/buddy.c:1694 src/buddy_chat.c:545
+#: src/buddy.c:265 src/buddy.c:405 src/buddy.c:1751 src/buddy_chat.c:543
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:257 src/buddy.c:401 src/buddy.c:1695 src/buddy_chat.c:547
-#: src/conversation.c:1658 src/rvous.c:635
+#: src/buddy.c:266 src/buddy.c:411 src/buddy.c:1752 src/buddy_chat.c:545
+#: src/buddy_chat.c:824 src/conversation.c:1644 src/rvous.c:636
 msgid "Info"
 msgstr "Á¤º¸"
 
-#: src/buddy.c:407 src/dialogs.c:3252
+#: src/buddy.c:417 src/dialogs.c:3269
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:414
+#: src/buddy.c:424
 msgid "Dir Info"
 msgstr "µð·ºÅ丮 Á¤º¸"
 
-#: src/buddy.c:421
+#: src/buddy.c:431
 #, fuzzy
 msgid "Direct IM"
 msgstr "µð·ºÅ丮 Á¤º¸"
 
-#: src/buddy.c:427
+#: src/buddy.c:437
 msgid "Away Msg"
 msgstr "Àá¼ö ¸Þ½ÃÁö"
 
-#: src/buddy.c:434
+#: src/buddy.c:444
 msgid "Toggle Logging"
 msgstr "·Î±ë ¼±ÅÃ"
 
-#: src/buddy.c:440
+#: src/buddy.c:450
 msgid "Add Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â ¸¸µé±â"
 
-#: src/buddy.c:1204
+#: src/buddy.c:1246
 msgid "New Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â »õ·Î ¸¸µé±â"
 
-#: src/buddy.c:1222
+#: src/buddy.c:1264
 msgid "Remove Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â Áö¿ì±â"
 
-#: src/buddy.c:1297
+#: src/buddy.c:1352
 #, fuzzy, c-format
 msgid "%sBuddy Icon"
 msgstr "Ä£±¸ ºÙÀâ±â"
 
-#: src/buddy.c:1300
+#: src/buddy.c:1355
 #, c-format
 msgid "%sVoice"
 msgstr ""
 
-#: src/buddy.c:1303
+#: src/buddy.c:1358
 #, c-format
 msgid "%sIM Image"
 msgstr ""
 
-#: src/buddy.c:1306
+#: src/buddy.c:1361
 #, fuzzy, c-format
 msgid "%sChat"
 msgstr "äÆÃ"
 
-#: src/buddy.c:1309
+#: src/buddy.c:1364
 #, c-format
 msgid "%sGet File"
 msgstr ""
 
-#: src/buddy.c:1312
+#: src/buddy.c:1367
 #, c-format
 msgid "%sSend File"
 msgstr ""
 
-#: src/buddy.c:1367
+#: src/buddy.c:1422
 msgid "Warnings: %d%%\n"
 msgstr "ÁÖÀÇ: %d%%\n"
 
-#: src/buddy.c:1373
+#: src/buddy.c:1428
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1377
+#: src/buddy.c:1432
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -216,373 +217,374 @@
 "·Î±×ÀÎ ÇÑ ¶§: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1377
+#: src/buddy.c:1432
 msgid "Idle: "
 msgstr "³î±â: "
 
-#: src/buddy.c:1422
+#: src/buddy.c:1477
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
-#: src/buddy.c:1563
+#: src/buddy.c:1620
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s °¡ ·Î±×¾Æ¿ô ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
-#: src/buddy.c:1721
+#: src/buddy.c:1778
 msgid "Information on selected Buddy"
 msgstr "¼±ÅÃÇÑ Ä£±¸¿¡ ´ëÇÑ Á¤º¸"
 
-#: src/buddy.c:1722 src/dialogs.c:708
+#: src/buddy.c:1779 src/dialogs.c:711
 msgid "Send Instant Message"
 msgstr "¸Þ½ÃÁö º¸³»±â"
 
-#: src/buddy.c:1723
+#: src/buddy.c:1780
 msgid "Start/join a Buddy Chat"
 msgstr "äÆà ½ÃÀÛ/Âü°¡"
 
-#: src/buddy.c:1774
+#: src/buddy.c:1833
 msgid "File"
 msgstr "ÆÄÀÏ"
 
-#: src/buddy.c:1778 src/buddy.c:1779
+#: src/buddy.c:1837 src/buddy.c:1838
 msgid "Add A Buddy"
 msgstr "Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:1780
+#: src/buddy.c:1839
 #, fuzzy
 msgid "Join A Chat"
 msgstr "äÆÿ¡ Âü°¡"
 
-#: src/buddy.c:1782
+#: src/buddy.c:1841
 msgid "Import Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï °¡Á®¿À±â"
 
-#: src/buddy.c:1783
+#: src/buddy.c:1842
 msgid "Export Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï ³»º¸³»±â"
 
-#: src/buddy.c:1793
+#: src/buddy.c:1852
 msgid "Quit"
 msgstr "³¡³»±â"
 
-#: src/buddy.c:1795 src/buddy_chat.c:539 src/buddy_chat.c:787
-#: src/conversation.c:1660 src/dialogs.c:495 src/plugins.c:317
-#: src/prefs.c:1597
+#: src/buddy.c:1854 src/buddy_chat.c:537 src/buddy_chat.c:791
+#: src/buddy_chat.c:812 src/conversation.c:1646 src/dialogs.c:496
+#: src/plugins.c:318 src/prefs.c:1768
 msgid "Close"
 msgstr "´Ý±â"
 
-#: src/buddy.c:1800
+#: src/buddy.c:1859
 msgid "Tools"
 msgstr "µµ±¸"
 
-#: src/buddy.c:1805 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:1864 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
 msgid "Away"
 msgstr "Àá¼ö"
 
-#: src/buddy.c:1810
+#: src/buddy.c:1869
 msgid "Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â"
 
-#: src/buddy.c:1818 src/dialogs.c:1992 src/dialogs.c:2148
+#: src/buddy.c:1877 src/dialogs.c:2003 src/dialogs.c:2160
 msgid "Search for Buddy"
 msgstr "Ä£±¸ ã±â"
 
-#: src/buddy.c:1821
+#: src/buddy.c:1880
 msgid "by Email"
 msgstr "¸ÞÀÏ·Î"
 
-#: src/buddy.c:1825
+#: src/buddy.c:1884
 msgid "by Dir Info"
 msgstr "µð·ºÅ丮 Á¤º¸·Î"
 
-#: src/buddy.c:1832 src/buddy.c:1833
+#: src/buddy.c:1891 src/buddy.c:1892
 msgid "Settings"
 msgstr "¼³Á¤"
 
-#: src/buddy.c:1836
+#: src/buddy.c:1895
 msgid "User Info"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: src/buddy.c:1840 src/dialogs.c:1190
+#: src/buddy.c:1899 src/dialogs.c:1197
 msgid "Directory Info"
 msgstr "µð·ºÅ丮 Á¤º¸"
 
-#: src/buddy.c:1844 src/dialogs.c:1376
+#: src/buddy.c:1903 src/dialogs.c:1384
 msgid "Change Password"
 msgstr "Æнº¿öµå ¹Ù²Ù±â"
 
-#: src/buddy.c:1858
+#: src/buddy.c:1917
 #, fuzzy
 msgid "Perl"
 msgstr "Çã¿ë"
 
-#: src/buddy.c:1861
+#: src/buddy.c:1920
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1865
+#: src/buddy.c:1924
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1869
+#: src/buddy.c:1928
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1877
+#: src/buddy.c:1936
 msgid "Help"
 msgstr "µµ¿ò¸»"
 
-#: src/buddy.c:1882
+#: src/buddy.c:1941
 #, fuzzy
 msgid "About Gaim"
 msgstr "GAIM ˼"
 
-#: src/buddy.c:1901 src/prefs.c:1794
+#: src/buddy.c:1960 src/prefs.c:1990
 msgid "Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï"
 
-#: src/buddy.c:1953
+#: src/buddy.c:2012
 msgid "Add a new Buddy"
 msgstr "»õ Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:1954
+#: src/buddy.c:2013
 #, fuzzy
 msgid "Add a new Group"
 msgstr "»õ Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:1955
+#: src/buddy.c:2014
 msgid "Remove selected Buddy"
 msgstr "¼±ÅÃÇÑ Ä£±¸ »©±â"
 
-#: src/buddy.c:1980
+#: src/buddy.c:2039
 msgid "Online"
 msgstr "¿¬°áÁß"
 
-#: src/buddy.c:1982
+#: src/buddy.c:2041
 msgid "Edit Buddies"
 msgstr "Ä£±¸ ÆíÁý"
 
-#: src/buddy.c:2019
+#: src/buddy.c:2078
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï"
 
-#: src/buddy_chat.c:124 src/buddy_chat.c:729 src/buddy_chat.c:741
+#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
 msgid "Buddy Chat"
 msgstr "äÆÃ"
 
-#: src/buddy_chat.c:126
+#: src/buddy_chat.c:123
 msgid "Join"
 msgstr "Âü°¡"
 
-#: src/buddy_chat.c:132
+#: src/buddy_chat.c:129
 msgid "Join what group:"
 msgstr "Âü°¡ÇÒ ±×·ìÀº:"
 
-#: src/buddy_chat.c:138
+#: src/buddy_chat.c:135
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:146
+#: src/buddy_chat.c:143
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:175
+#: src/buddy_chat.c:172
 msgid "Join Chat"
 msgstr "äÆÿ¡ Âü°¡"
 
-#: src/buddy_chat.c:220 src/buddy_chat.c:541 src/buddy_chat.c:786
+#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
 msgid "Invite"
 msgstr "ÃÊ´ë"
 
-#: src/buddy_chat.c:237
+#: src/buddy_chat.c:234
 msgid "Invite who?"
 msgstr "´©±¼ ÃÊ´ëÇÒ±î¿ä?"
 
-#: src/buddy_chat.c:241
+#: src/buddy_chat.c:238
 msgid "With message:"
 msgstr "¸Þ½ÃÁö´Â:"
 
-#: src/buddy_chat.c:268
+#: src/buddy_chat.c:265
 msgid "Invite to Buddy Chat"
 msgstr "äÆÿ¡ ÃÊ´ë"
 
-#: src/buddy_chat.c:427
+#: src/buddy_chat.c:424
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:455
+#: src/buddy_chat.c:452
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:542 src/buddy_chat.c:785
+#: src/buddy_chat.c:540 src/buddy_chat.c:789
 msgid "Whisper"
 msgstr "±Ó¼Ó¸»"
 
-#: src/buddy_chat.c:543 src/buddy_chat.c:784 src/conversation.c:1657
-#: src/dialogs.c:1568
+#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
+#: src/conversation.c:1643 src/dialogs.c:1577
 msgid "Send"
 msgstr "º¸³»±â"
 
-#: src/buddy_chat.c:546
+#: src/buddy_chat.c:544
 msgid "Ignore"
 msgstr "¹«½Ã"
 
-#: src/conversation.c:181
+#: src/buddy_chat.c:820 src/conversation.c:1651
+msgid "Block"
+msgstr "Â÷´Ü"
+
+#: src/buddy_chat.c:822 src/conversation.c:1645 src/dialogs.c:415
+#: src/dialogs.c:417 src/rvous.c:637
+msgid "Warn"
+msgstr "ÁÖÀÇ"
+
+#: src/conversation.c:171
 #, fuzzy, c-format
 msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
 msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
-#: src/conversation.c:188
+#: src/conversation.c:178
 #, fuzzy, c-format
 msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
 msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
-#: src/conversation.c:442
+#: src/conversation.c:435
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "'%s' ¸¦ Ä£±¸ ¸ñ·Ï¿¡¼­ »®´Ï´Ù.\n"
 
-#: src/conversation.c:695
+#: src/conversation.c:688
 msgid "Message too long, some data truncated."
 msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±æ¾î¼­ ¾à°£ ©·È½À´Ï´Ù."
 
-#: src/conversation.c:695 src/dialogs.c:2709 src/dialogs.c:2779
+#: src/conversation.c:688 src/dialogs.c:2723 src/dialogs.c:2793
 #: src/rvous.c:221 src/rvous.c:492
 msgid "Error"
 msgstr "¿À·ù"
 
-#: src/conversation.c:883
+#: src/conversation.c:875
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "ÇöÀç %d ¿¡ ÀÖ½À´Ï´Ù\n"
 
-#: src/conversation.c:892
+#: src/conversation.c:884
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "À§Ä¡¸¦ %d ·Î ¿Å±é´Ï´Ù\n"
 
-#: src/conversation.c:1489
+#: src/conversation.c:1481
 msgid "Bold"
 msgstr "±½°Ô"
 
-#: src/conversation.c:1489 src/prefs.c:1085
+#: src/conversation.c:1481 src/prefs.c:1253
 msgid "Bold Text"
 msgstr "±½Àº ±Û¾¾"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1485 src/conversation.c:1486
 msgid "Italics"
 msgstr "±â¿ïÀÓ"
 
-#: src/conversation.c:1493 src/prefs.c:1086
+#: src/conversation.c:1485 src/prefs.c:1254
 msgid "Italics Text"
 msgstr "±â¿ïÀÎ ±Û¾¾"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1489 src/conversation.c:1490
 msgid "Underline"
 msgstr "¹ØÁÙ"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1489
 msgid "Underline Text"
 msgstr "¹ØÁÙÄ£ ±Û¾¾"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1493 src/conversation.c:1494
 msgid "Strike"
 msgstr "°¡¿îµ¥ÁÙ"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1493
 msgid "Strike through Text"
 msgstr "°¡¿îµ¥ÁÙÄ£ ±Û¾¾"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1497
 msgid "Small"
 msgstr "ÀÛ°Ô"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1497
 msgid "Decrease font size"
 msgstr "±Û¾¾ Å©±â ÁÙÀ̱â"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1500
 msgid "Normal"
 msgstr "º¸Åë"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1500
 msgid "Normal font size"
 msgstr "º¸Åë ±Û¾¾ Å©±â"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1503
 msgid "Big"
 msgstr "Å©°Ô"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1503
 msgid "Increase font size"
 msgstr "±Û¾¾ Å©±â Å°¿ì±â"
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1510 src/conversation.c:1511
 msgid "Font"
 msgstr "±Û²Ã"
 
-#: src/conversation.c:1518 src/dialogs.c:2608 src/dialogs.c:2624
+#: src/conversation.c:1510 src/dialogs.c:2622 src/dialogs.c:2638
 msgid "Select Font"
 msgstr "±Û²Ã ¼±ÅÃ"
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1514 src/conversation.c:1515 src/conversation.c:1518
+#: src/conversation.c:1519
 msgid "Color"
 msgstr "»ö±ò"
 
-#: src/conversation.c:1522 src/prefs.c:1099
+#: src/conversation.c:1514 src/prefs.c:1267
 msgid "Text Color"
 msgstr "±Û¾¾ »ö±ò"
 
-#: src/conversation.c:1526 src/prefs.c:1116
+#: src/conversation.c:1518 src/prefs.c:1284
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1525 src/conversation.c:1526
 msgid "Link"
 msgstr "¿¬°á"
 
-#: src/conversation.c:1533 src/dialogs.c:2250
+#: src/conversation.c:1525 src/dialogs.c:2264
 msgid "Insert Link"
 msgstr "¿¬°á ³Ö±â"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1529
 #, fuzzy
 msgid "Smiley"
 msgstr "ÆÄÀÏ"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1529
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1536 src/conversation.c:1537
 msgid "Logging"
 msgstr "·Î±ë"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1536
 msgid "Enable logging"
 msgstr "·Î±ë Çϱâ"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1540 src/conversation.c:1541
 msgid "Sound"
 msgstr "¼Ò¸®"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1540
 msgid "Enable sounds"
 msgstr "¼Ò¸® µé¸®°Ô"
 
-#: src/conversation.c:1659 src/dialogs.c:414 src/dialogs.c:416 src/rvous.c:636
-msgid "Warn"
-msgstr "ÁÖÀÇ"
-
-#: src/conversation.c:1665
-msgid "Block"
-msgstr "Â÷´Ü"
-
 #: src/dialogs.c:224
 msgid "Error Resolving Mail Server.\n"
 msgstr "¸ÞÀÏ ¼­¹ö¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù.\n"
@@ -591,127 +593,127 @@
 msgid "Error Connecting to Socket.\n"
 msgstr "¼ÒÄÏÀ» ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: src/dialogs.c:431
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "%s ¿¡°Ô Á¤¸»·Î ÁÖÀǸ¦ º¸³»½Ã·Æ´Ï±î?"
 
-#: src/dialogs.c:435
+#: src/dialogs.c:436
 msgid "Warn anonymously?"
 msgstr "ÁÖÀǸ¦ À͸íÀ¸·Î º¸³¾±î¿ä?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:439
 msgid "Anonymous warnings are less harsh."
 msgstr "À͸íÀÇ ÁÖÀÇ°¡ ´ú °Å½½¸± ¼ö ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:463
+#: src/dialogs.c:464
 msgid "Gaim - Warn user?"
 msgstr "Gaim - »ç¿ëÀÚ¿¡°Ô ÁÖÀÇ º¸³»±â"
 
-#: src/dialogs.c:531
+#: src/dialogs.c:532
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%s ÆÄÀÏ¿¡ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:535
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:537
+#: src/dialogs.c:538
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±æ¾î¼­ ¸¶Áö¸· %s ¹ÙÀÌÆ®°¡ ©·È½À´Ï´Ù."
 
-#: src/dialogs.c:540
+#: src/dialogs.c:541
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ´Â ÇöÀç ·Î±×ÀÎÇÏÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/dialogs.c:543
+#: src/dialogs.c:544
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s ¿¡°Ô ÁÖÀǸ¦ º¸³»´Â °ÍÀº Çã¿ëµÇÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:546
+#: src/dialogs.c:547
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "¼­¹öÀÇ ¼ÓµµÇѰ踦 ³Ñ¾ú±â ¶§¹®¿¡ ¸Þ½ÃÁö¸¦ ¹ö·È½À´Ï´Ù."
 
-#: src/dialogs.c:549
+#: src/dialogs.c:550
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s ¿¡ äÆà Âü°¡¸¦ ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:552
+#: src/dialogs.c:553
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "%s ¿¡°Ô ³Ê¹« »¡¸® ¸Þ½ÃÁö¸¦ º¸³»°í ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:555
+#: src/dialogs.c:556
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« Ä¿¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/dialogs.c:558
+#: src/dialogs.c:559
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« »¡¶ó¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/dialogs.c:561
+#: src/dialogs.c:562
 msgid "Failure."
 msgstr "½ÇÆÐ."
 
-#: src/dialogs.c:564
+#: src/dialogs.c:565
 msgid "Too many matches."
 msgstr "ÇØ´ç Ç׸ñÀÌ ³Ê¹« ¸¹½À´Ï´Ù."
 
-#: src/dialogs.c:567
+#: src/dialogs.c:568
 msgid "Need more qualifiers."
 msgstr "´õ »ó¼¼È÷ ÁöÁ¤ÇϽʽÿä."
 
-#: src/dialogs.c:570
+#: src/dialogs.c:571
 msgid "Dir service temporarily unavailable."
 msgstr "µð·ºÅ丮 ¼­ºñ½º¸¦ ÀϽÃÀûÀ¸·Î »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:573
+#: src/dialogs.c:574
 msgid "Email lookup restricted."
 msgstr "¸ÞÀÏ Ã£¾Æº¸±â¿¡ Á¦¾àÀÌ ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:576
+#: src/dialogs.c:577
 msgid "Keyword ignored."
 msgstr "Å°¿öµå°¡ ¹«½ÃµÇ¾ú½À´Ï´Ù."
 
-#: src/dialogs.c:579
+#: src/dialogs.c:580
 msgid "No keywords."
 msgstr "Å°¿öµå°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:582
+#: src/dialogs.c:583
 msgid "User has no directory information."
 msgstr "»ç¿ëÀÚ°¡ µð·ºÅ丮 Á¤º¸¸¦ °®°í ÀÖÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:586
+#: src/dialogs.c:587
 msgid "Country not supported."
 msgstr "±¹°¡´Â Áö¿øµÇÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:589
+#: src/dialogs.c:590
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "¾Ë ¼ö ¾ø´Â ½ÇÆÐ: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:592 src/oscar.c:315
+#: src/dialogs.c:593 src/oscar.c:318
 msgid "Incorrect nickname or password."
 msgstr "À̸§À̳ª Æнº¿öµå°¡ Ʋ·È½À´Ï´Ù."
 
-#: src/dialogs.c:595
+#: src/dialogs.c:596
 msgid "The service is temporarily unavailable."
 msgstr "Àá½Ã ¼­ºñ½º°¡ »ç¿ëºÒ°¡´ÉÇÕ´Ï´Ù."
 
-#: src/dialogs.c:598
+#: src/dialogs.c:599
 msgid "Your warning level is currently too high to log in."
 msgstr "´ç½ÅÀº ÁÖÀÇ ¼öÁØÀÌ ³ô¾î¼­ ·Î±×ÀÎ ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:601
+#: src/dialogs.c:602
 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."
@@ -719,271 +721,271 @@
 "´ç½ÅÀº ³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°íÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã "
 "½ÃµµÇϽʽÿä. °è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
-#: src/dialogs.c:604
+#: src/dialogs.c:605
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Á¢¼Ó Áß¿¡ ¾Ë ¼ö ¾ø´Â ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù: %s."
 
-#: src/dialogs.c:607
+#: src/dialogs.c:608
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù, %d °¡ ¹ß»ýÇÏ¿´½À´Ï´Ù.  Á¤º¸´Â: %s"
 
-#: src/dialogs.c:610
+#: src/dialogs.c:611
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - ¿À·ù %d"
 
 #. Build OK Button
-#: src/dialogs.c:649 src/dialogs.c:712 src/dialogs.c:1060 src/dialogs.c:1381
-#: src/dialogs.c:1665 src/dialogs.c:1997 src/dialogs.c:2158 src/dialogs.c:2255
+#: src/dialogs.c:650 src/dialogs.c:715 src/dialogs.c:1066 src/dialogs.c:1389
+#: src/dialogs.c:1675 src/dialogs.c:2008 src/dialogs.c:2170 src/dialogs.c:2269
 msgid "OK"
 msgstr "È®ÀÎ"
 
-#: src/dialogs.c:722
+#: src/dialogs.c:725
 msgid "IM who: "
 msgstr "ÀνºÅÏÆ® ¸Þ½ÅÀú »ç¿ëÀÚ: "
 
-#: src/dialogs.c:746
+#: src/dialogs.c:749
 msgid "Gaim - IM user"
 msgstr "Gaim - ÀνºÅÏÆ® ¸Þ½ÅÀú »ç¿ëÀÚ"
 
-#: src/dialogs.c:828
+#: src/dialogs.c:831
 msgid "Buddies"
 msgstr "Ä£±¸"
 
-#: src/dialogs.c:879
+#: src/dialogs.c:883
 #, fuzzy
 msgid "Add Group"
 msgstr "±×·ì"
 
-#: src/dialogs.c:909
+#: src/dialogs.c:913
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:955
+#: src/dialogs.c:960
 msgid "Add Buddy"
 msgstr "Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:957 src/dialogs.c:3248
+#: src/dialogs.c:962 src/dialogs.c:3265
 msgid "Buddy"
 msgstr "Ä£±¸"
 
-#: src/dialogs.c:996
+#: src/dialogs.c:1001
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ä£±¸ ´õÇϱâ"
 
 #. Put the buttons in the box
-#: src/dialogs.c:1071
+#: src/dialogs.c:1077
 msgid "Buddy To Pounce:"
 msgstr "ºÙÀâÀ» Ä£±¸:"
 
-#: src/dialogs.c:1076
+#: src/dialogs.c:1082
 msgid "Open IM Window on Buddy Logon"
 msgstr "Ä£±¸°¡ Á¢¼ÓÇÒ ¶§ ¸Þ½ÃÁö â ¿­±â"
 
-#: src/dialogs.c:1079
+#: src/dialogs.c:1085
 msgid "Send IM on Buddy Logon"
 msgstr "Ä£±¸°¡ Á¢¼ÓÇÒ ¶§ ¸Þ½ÃÁö º¸³»±â"
 
-#: src/dialogs.c:1087
+#: src/dialogs.c:1093
 msgid "Message to send:"
 msgstr "º¸³¾ ¸Þ½ÃÁö:"
 
-#: src/dialogs.c:1108
+#: src/dialogs.c:1114
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ºÙÀâÀ» Ä£±¸ »õ·Î ¸¸µé±â"
 
 #. Build Save Button
-#: src/dialogs.c:1194 src/dialogs.c:1485 src/dialogs.c:2976
+#: src/dialogs.c:1201 src/dialogs.c:1494 src/dialogs.c:2991
 msgid "Save"
 msgstr "ÀúÀå"
 
-#: src/dialogs.c:1212
+#: src/dialogs.c:1219
 msgid "Allow Web Searches To Find Your Info"
 msgstr "À¥À» ÅëÇÏ¿© ³ªÀÇ Á¤º¸¸¦ °Ë»öÇÒ ¼ö ÀÖµµ·Ï Çã¿ë"
 
 #. Line 1
-#: src/dialogs.c:1215 src/dialogs.c:2015
+#: src/dialogs.c:1222 src/dialogs.c:2026
 msgid "First Name"
 msgstr "À̸§"
 
 #. Line 2
-#: src/dialogs.c:1226 src/dialogs.c:2027
+#: src/dialogs.c:1233 src/dialogs.c:2038
 msgid "Middle Name"
 msgstr "Áß°£ À̸§"
 
 #. Line 3
-#: src/dialogs.c:1238 src/dialogs.c:2039
+#: src/dialogs.c:1245 src/dialogs.c:2050
 msgid "Last Name"
 msgstr "¼º"
 
 #. Line 4
-#: src/dialogs.c:1249 src/dialogs.c:2051
+#: src/dialogs.c:1256 src/dialogs.c:2062
 msgid "Maiden Name"
 msgstr "ó³à½ÃÀý À̸§"
 
 #. Line 5
-#: src/dialogs.c:1260 src/dialogs.c:2063
+#: src/dialogs.c:1267 src/dialogs.c:2074
 msgid "City"
 msgstr "±º/±¸"
 
 #. Line 6
-#: src/dialogs.c:1271 src/dialogs.c:2074
+#: src/dialogs.c:1278 src/dialogs.c:2085
 msgid "State"
 msgstr "½Ã/µµ"
 
 #. Line 7
-#: src/dialogs.c:1282 src/dialogs.c:2085
+#: src/dialogs.c:1289 src/dialogs.c:2096
 msgid "Country"
 msgstr "±¹°¡"
 
-#: src/dialogs.c:1327
+#: src/dialogs.c:1334
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - µð·ºÅ丮 Á¤º¸ ¼³Á¤"
 
-#: src/dialogs.c:1344
+#: src/dialogs.c:1351
 msgid "New Passwords Do Not Match"
 msgstr "»õ ¾ÏÈ£°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/dialogs.c:1344 src/dialogs.c:1349
+#: src/dialogs.c:1351 src/dialogs.c:1356
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ¾ÏÈ£ º¯°æ ½ÇÆÐ"
 
-#: src/dialogs.c:1349
+#: src/dialogs.c:1356
 msgid "Fill out all fields completely"
 msgstr "¸ðµç Ç׸ñÀ» ¿ÏÀüÈ÷ ä¿ì½Ê½Ã¿ä"
 
-#: src/dialogs.c:1390
+#: src/dialogs.c:1398
 msgid "Original Password"
 msgstr "¿ø·¡ ¾ÏÈ£"
 
-#: src/dialogs.c:1406
+#: src/dialogs.c:1414
 msgid "New Password"
 msgstr "»õ ¾ÏÈ£"
 
-#: src/dialogs.c:1420
+#: src/dialogs.c:1428
 msgid "New Password (again)"
 msgstr "»õ ¾ÏÈ£ (Çѹø´õ)"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1465
 msgid "Gaim - Password Change"
 msgstr "Gaim - ¾ÏÈ£ º¯°æ"
 
-#: src/dialogs.c:1519
+#: src/dialogs.c:1528
 msgid "Gaim - Set User Info"
 msgstr "Gaim - »ç¿ëÀÚ Á¤º¸ ¼³Á¤"
 
-#: src/dialogs.c:1674
+#: src/dialogs.c:1684
 msgid "Below are the results of your search: "
 msgstr "°Ë»öÀÇ °á°ú´Â ´ÙÀ½°ú °°½À´Ï´Ù: "
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1816
 #, fuzzy
 msgid "Permit / Deny"
 msgstr "¸î¸í¸¸ Çã¿ë"
 
-#: src/dialogs.c:1817 src/prefs.c:391
+#: src/dialogs.c:1827 src/prefs.c:432
 msgid "Deny"
 msgstr "°ÅºÎ"
 
-#: src/dialogs.c:1822 src/prefs.c:375 src/prefs.c:432
+#: src/dialogs.c:1832 src/prefs.c:416 src/prefs.c:473
 msgid "Permit"
 msgstr "Çã¿ë"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1873
 msgid "Gaim - Add Permit/Deny"
 msgstr "Gaim - Çã¿ë/°ÅºÎ ¸ñ·Ï¿¡ ´õÇϱâ"
 
-#: src/dialogs.c:1917
+#: src/dialogs.c:1927
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ´ëÈ­ ·Î±ë"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2133
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Á¤º¸·Î Ä£±¸ ã±â"
 
-#: src/dialogs.c:2168
+#: src/dialogs.c:2180
 msgid "Email"
 msgstr "¸ÞÀÏ"
 
-#: src/dialogs.c:2187
+#: src/dialogs.c:2199
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ¸ÞÀϷΠģ±¸ ã±â"
 
-#: src/dialogs.c:2269
+#: src/dialogs.c:2283
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2277
+#: src/dialogs.c:2291
 msgid "Description"
 msgstr "¼³¸í"
 
-#: src/dialogs.c:2303
+#: src/dialogs.c:2317
 msgid "GAIM - Add URL"
 msgstr "GAIM - URL ´õÇϱâ"
 
-#: src/dialogs.c:2446 src/dialogs.c:2459 src/dialogs.c:2496
+#: src/dialogs.c:2460 src/dialogs.c:2473 src/dialogs.c:2510
 msgid "Select Text Color"
 msgstr "±Û¾¾ »ö±ò ¼±ÅÃ"
 
-#: src/dialogs.c:2483
+#: src/dialogs.c:2497
 #, fuzzy
 msgid "Select Background Color"
 msgstr "±Û¾¾ »ö±ò ¼±ÅÃ"
 
-#: src/dialogs.c:2708 src/rvous.c:220
+#: src/dialogs.c:2722 src/rvous.c:220
 #, c-format
 msgid "Error writing file %s"
 msgstr "%s ÆÄÀÏ¿¡ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: src/dialogs.c:2725
+#: src/dialogs.c:2739
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï ³»º¸³»±â"
 
-#: src/dialogs.c:2778 src/rvous.c:491
+#: src/dialogs.c:2792 src/rvous.c:491
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: src/dialogs.c:2857
+#: src/dialogs.c:2871
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï °¡Á®¿À±â"
 
-#: src/dialogs.c:2938
+#: src/dialogs.c:2952
 msgid "Gaim - New away message"
 msgstr "Gaim - Àá¼ö ¸Þ½ÃÁö »õ·Î ¸¸µé±â"
 
 #. Set up our frame
-#: src/dialogs.c:2944
+#: src/dialogs.c:2959
 #, fuzzy
 msgid "New away message"
 msgstr "»õ·Î¿î Àá¼ö ¸Þ½ÃÁö"
 
 #. Make a label for away entry
-#: src/dialogs.c:2954
+#: src/dialogs.c:2969
 msgid "Away title: "
 msgstr "Á¦¸ñ: "
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3004
+#: src/dialogs.c:3019
 #, fuzzy
 msgid "Make Away Now"
 msgstr "Áö±Ý ¹Ù·Î Àá¼ö"
 
 #. show everything
-#: src/dialogs.c:3180
+#: src/dialogs.c:3196
 #, fuzzy
 msgid "Smile!"
 msgstr "ÆÄÀÏ"
 
-#: src/dialogs.c:3246
+#: src/dialogs.c:3263
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:3284
+#: src/dialogs.c:3301
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Ä£±¸ ´õÇϱâ"
@@ -1021,19 +1023,19 @@
 msgid "About..."
 msgstr "...¿¡ ´ëÇÏ¿©"
 
-#: src/gtkhtml.c:1382
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "HTML ¿¬°á:"
 
-#: src/gtkhtml.c:1791
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "ÇöÀç â¿¡¼­ URL ¿­±â"
 
-#: src/gtkhtml.c:1800
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "»õ â¿¡¼­ URL ¿­±â"
 
-#: src/gtkhtml.c:1808
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "Áñ°Üã±â¿¡ URL ´õÇϱâ"
 
@@ -1059,71 +1061,71 @@
 msgid "Receieved: '%s'\n"
 msgstr "¹ÞÀº³»¿ë: '%s'\n"
 
-#: src/oscar.c:154 src/oscar.c:181
+#: src/oscar.c:157 src/oscar.c:184
 msgid "Disconnected."
 msgstr "²÷¾îÁü."
 
-#: src/oscar.c:162
+#: src/oscar.c:165
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "Á¢¼Ó ¿À·ù!\n"
 
-#: src/oscar.c:179
+#: src/oscar.c:182
 #, fuzzy
 msgid "major connection error\n"
 msgstr "Á¢¼Ó ¿À·ù!\n"
 
-#: src/oscar.c:193
+#: src/oscar.c:196
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:194
+#: src/oscar.c:197
 #, fuzzy
 msgid "Chat Error!"
 msgstr "¿À·ù"
 
-#: src/oscar.c:217
+#: src/oscar.c:220
 #, c-format
 msgid "Logging in %s\n"
 msgstr "%s ¿¡ Á¢¼Ó\n"
 
-#: src/oscar.c:227
+#: src/oscar.c:230
 #, c-format
 msgid "Looking up %s"
 msgstr "%s ¸¦ ã¾Æº½"
 
-#: src/oscar.c:232
+#: src/oscar.c:235
 msgid "internal connection error\n"
 msgstr "³»ºÎ Á¢¼Ó ¿À·ù\n"
 
-#: src/oscar.c:237
+#: src/oscar.c:240
 msgid "Unable to login to AIM"
 msgstr "AIM ¿¡ ·Î±×ÀÎÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/oscar.c:245
+#: src/oscar.c:248
 msgid "couldn't resolve host\n"
 msgstr "È£½ºÆ®¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: src/oscar.c:249
+#: src/oscar.c:252
 msgid "couldn't connect to host\n"
 msgstr "È£½ºÆ®¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: src/oscar.c:255
+#: src/oscar.c:258
 #, c-format
 msgid "Signon: %s"
 msgstr "Á¢¼Ó: %s"
 
-#: src/oscar.c:280
+#: src/oscar.c:283
 msgid "Password sent, waiting for response\n"
 msgstr "¾ÏÈ£¸¦ º¸³»°í ÀÀ´äÀ» ±â´Ù¸³´Ï´Ù\n"
 
-#: src/oscar.c:296
+#: src/oscar.c:299
 msgid "Signed off.\n"
 msgstr "Á¢¼Ó ²÷±â.\n"
 
 #. connecting too frequently
-#: src/oscar.c:310
+#: src/oscar.c:313
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1132,79 +1134,79 @@
 "´ç½ÅÀº ³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°íÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã "
 "½ÃµµÇϽʽÿä. °è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
-#: src/oscar.c:310 src/oscar.c:315 src/oscar.c:320 src/oscar.c:753
-#: src/oscar.c:758 src/oscar.c:780 src/oscar.c:799 src/oscar.c:823
+#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:757
+#: src/oscar.c:762 src/oscar.c:784 src/oscar.c:803 src/oscar.c:827
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - ¿À·ù %d"
 
 #. client too old
-#: src/oscar.c:320
+#: src/oscar.c:323
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:335
+#: src/oscar.c:338
 msgid "Authentication Failed"
 msgstr "ÀÎÁõ ½ÇÆÐ"
 
-#: src/oscar.c:355
+#: src/oscar.c:358
 msgid "Internal Error"
 msgstr "³»ºÎ ¿À·ù"
 
-#: src/oscar.c:363
+#: src/oscar.c:366
 msgid "Could Not Connect"
 msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/oscar.c:394
+#: src/oscar.c:397
 msgid "Connection established, cookie sent"
 msgstr "¿¬°áÇÏ°í ÄíÅ°¸¦ º¸³Â½À´Ï´Ù"
 
-#: src/oscar.c:625
+#: src/oscar.c:628
 msgid "Accept Direct IM?"
 msgstr ""
 
-#: src/oscar.c:634
+#: src/oscar.c:638
 #, c-format
 msgid "%s has requested to directly connect to your computer. Do you accept?"
 msgstr ""
 
-#: src/oscar.c:644 src/rvous.c:634
+#: src/oscar.c:648 src/rvous.c:635
 msgid "Accept"
 msgstr "Á¢¼ö"
 
 #. message too large
-#: src/oscar.c:752
+#: src/oscar.c:756
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« Ä¿¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/oscar.c:757
+#: src/oscar.c:761
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:778
+#: src/oscar.c:782
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:779 src/oscar.c:798
+#: src/oscar.c:783 src/oscar.c:802
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:797
+#: src/oscar.c:801
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:822
+#: src/oscar.c:826
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:828
+#: src/oscar.c:832
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1216,11 +1218,11 @@
 "<BR>Á¢¼ÓÇÑ ¶§ : <B>%s</B><BR>¸îºÐ° ³î°íÀÖ³ª : <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/oscar.c:861
+#: src/oscar.c:865
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:862
+#: src/oscar.c:866
 msgid "AOL error"
 msgstr ""
 
@@ -1237,161 +1239,190 @@
 msgid "Plugin Error"
 msgstr "Ç÷¯±×ÀÎ ¿À·ù"
 
-#: src/plugins.c:268
+#: src/plugins.c:269
 msgid "Gaim - Plugins"
 msgstr "Gaim - Ç÷¯±×ÀÎ"
 
-#: src/plugins.c:297
+#: src/plugins.c:298
 msgid "Load Plugin"
 msgstr "Ç÷¯±×ÀÎ ¿Ã¸®±â"
 
-#: src/plugins.c:304
+#: src/plugins.c:305
 msgid "Configure Plugin"
 msgstr "Ç÷¯±×ÀÎ ¼³Á¤"
 
-#: src/plugins.c:310
+#: src/plugins.c:311
 msgid "Unload Plugin"
 msgstr "Ç÷¯±×ÀÎ ³»¸®±â"
 
-#: src/prefs.c:89
+#: src/prefs.c:90
 #, fuzzy
 msgid "General Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:96 src/prefs.c:209 src/prefs.c:335 src/prefs.c:534
-#: src/prefs.c:621 src/prefs.c:672 src/prefs.c:702 src/prefs.c:1081
-#: src/prefs.c:1166 src/prefs.c:1197 src/prefs.c:1484
+#: src/prefs.c:97 src/prefs.c:349 src/prefs.c:375 src/prefs.c:575
+#: src/prefs.c:662 src/prefs.c:771 src/prefs.c:856 src/prefs.c:1249
+#: src/prefs.c:1334 src/prefs.c:1365 src/prefs.c:1652
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:100
+#: src/prefs.c:101
 #, fuzzy
 msgid "Remember password"
 msgstr "¾ÏÈ£ ÀúÀå"
 
-#: src/prefs.c:102
+#: src/prefs.c:103
 msgid "Auto-login"
 msgstr "ÀÚµ¿ ·Î±×ÀÎ"
 
-#: src/prefs.c:108
+#: src/prefs.c:109
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:109
+#: src/prefs.c:110
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:112
+#: src/prefs.c:113
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:120
+#: src/prefs.c:121
 #, fuzzy
 msgid "Report Idle Times"
 msgstr "³î°í ÀÖ´Â ½Ã°£ º¸¿©ÁÖ±â"
 
-#: src/prefs.c:201
+#: src/prefs.c:198 src/prefs.c:230 src/prefs.c:1974
 #, fuzzy
-msgid "Connection Options"
-msgstr "¿¬°á"
+msgid "TOC Options"
+msgstr "¿É¼Ç"
 
-#: src/prefs.c:213
-msgid "Use Oscar Protocol (experimental; only takes effect before signon)"
+#: src/prefs.c:206
+msgid ""
+"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
+"other is TOC.\n"
+"\n"
+"TOC is a published protocol; AOL allows people to use the TOC protocol in "
+"their clients to connect. It is a simplified version of Oscar; it is capable "
+"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
+"is published, using TOC in gaim tends to be more stable and reliable.\n"
+"\n"
+"Oscar is a proprietary protocol. AOL has not published any information about "
+"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
+"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
+"or implemented all of the functions of Oscar, it is still able to perform "
+"most functions TOC provides as well as several others. However, using Oscar "
+"in gaim tends to be less reliable, though more usable.\n"
+"\n"
+"Changing this option takes effect at signon time."
 msgstr ""
 
-#: src/prefs.c:219
-msgid "The following options do not apply if you use Oscar."
+#: src/prefs.c:212
+msgid "Use Oscar Protocol"
 msgstr ""
 
-#: src/prefs.c:227
+#: src/prefs.c:242
 msgid "TOC Host:"
 msgstr "TOC È£½ºÆ®:"
 
-#: src/prefs.c:237 src/prefs.c:262 src/prefs.c:296
+#: src/prefs.c:252 src/prefs.c:277 src/prefs.c:311
 msgid "Port:"
 msgstr "Æ÷Æ®:"
 
-#: src/prefs.c:252
+#: src/prefs.c:267
 msgid "Login Host:"
 msgstr "·Î±×ÀΠȣ½ºÆ®:"
 
-#: src/prefs.c:273
+#: src/prefs.c:288
 msgid "No Proxy"
 msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
 
-#: src/prefs.c:274
+#: src/prefs.c:289
 msgid "HTTP Proxy"
 msgstr "HTTP ÇÁ·Ï½Ã"
 
-#: src/prefs.c:275
+#: src/prefs.c:290
 #, fuzzy
 msgid "Socks 4 Proxy"
 msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
 
-#: src/prefs.c:276
+#: src/prefs.c:291
 #, fuzzy
 msgid "Socks 5 Proxy"
 msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
 
-#: src/prefs.c:282
+#: src/prefs.c:297
 msgid "Proxy Host:"
 msgstr "ÇÁ·Ï½Ã È£½ºÆ®:"
 
-#: src/prefs.c:328
+#: src/prefs.c:342 src/prefs.c:1979
+#, fuzzy
+msgid "Oscar Options"
+msgstr "¿É¼Ç"
+
+#: src/prefs.c:353
+msgid "Send Keep-Alive Packet (6 bytes/minute)"
+msgstr ""
+
+#: src/prefs.c:368
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Ä£±¸ ¸ñ·Ï"
 
-#: src/prefs.c:339
+#: src/prefs.c:379
 msgid "Show numbers in groups"
 msgstr "±×·ì¿¡ Àοø Ç¥½Ã"
 
-#: src/prefs.c:340
+#: src/prefs.c:380
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:381
 msgid "Show idle times"
 msgstr "³î°í ÀÖ´Â ½Ã°£ º¸¿©ÁÖ±â"
 
-#: src/prefs.c:341
+#: src/prefs.c:382
 #, fuzzy
 msgid "Show buddy type icons"
 msgstr "Ä£±¸ Á¾·ù ±×¸² º¸¿©ÁÖ±â"
 
-#: src/prefs.c:347
+#: src/prefs.c:388
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
-#: src/prefs.c:348
+#: src/prefs.c:389
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:354
+#: src/prefs.c:395
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "ÀϺΠâÀÇ Å©±â/À§Ä¡ ÀúÀå"
 
-#: src/prefs.c:356
+#: src/prefs.c:397
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "Ä£±¸ ¸ñ·ÏÀ» ÀÚµ¿À¸·Î º¸¿©ÁÜ"
 
-#: src/prefs.c:506
+#: src/prefs.c:547
 msgid "Please sign on before editing the permit/deny lists."
 msgstr ""
 
-#: src/prefs.c:507
+#: src/prefs.c:548
 msgid "Please sign on"
 msgstr ""
 
-#: src/prefs.c:527
+#: src/prefs.c:568
 msgid "Permit/Deny List Options"
 msgstr ""
 
-#: src/prefs.c:542
+#: src/prefs.c:583
 msgid ""
 "The permit/deny configuration will change between users,\n"
 "and changes while you are signed off will not be saved."
 msgstr ""
 
-#: src/prefs.c:555
+#: src/prefs.c:596
 #, fuzzy
 msgid "Allow Anyone"
 msgstr "´©±¸µçÁö Çã¿ë"
@@ -1399,321 +1430,334 @@
 #. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
 #. * and merging the two would be very difficult at best, most likely
 #. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:560
+#: src/prefs.c:601
 msgid "Allow only users on Buddy List"
 msgstr ""
 
-#: src/prefs.c:562
+#: src/prefs.c:603
 msgid "Allow only the users in \"Permit\""
 msgstr ""
 
-#: src/prefs.c:568
+#: src/prefs.c:609
 msgid "Block all users"
 msgstr ""
 
-#: src/prefs.c:569
+#: src/prefs.c:610
 msgid "Block the users in \"Deny\""
 msgstr ""
 
-#: src/prefs.c:614
+#: src/prefs.c:655
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:625
+#: src/prefs.c:666
 msgid "Enter sends message"
 msgstr "¿£ÅÍÅ°¸¦ ´©¸£¸é ¸Þ½ÃÁö º¸³»±â"
 
-#: src/prefs.c:626
+#: src/prefs.c:667
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:627
+#: src/prefs.c:668
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:633
+#: src/prefs.c:674
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "±Û¾¾±×¸²À» ±×¸²À¸·Î º¸¿©ÁÖ±â (½ÇÇè¼öÁØ)"
 
-#: src/prefs.c:634
+#: src/prefs.c:675
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "¸Þ½ÃÁö¿¡ ½Ã°£ Ç¥½Ã"
 
-#: src/prefs.c:635
+#: src/prefs.c:676
 #, fuzzy
 msgid "Ignore incoming colors"
 msgstr "º¸³»¿À´Â »ö±òÀº ¹«½Ã"
 
-#: src/prefs.c:636
+#: src/prefs.c:677
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:642
+#: src/prefs.c:683
 #, fuzzy
 msgid "Log all conversations"
 msgstr "¸ðµç ´ëÈ­¸¦ ·Î±ë"
 
-#: src/prefs.c:643
+#: src/prefs.c:684
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "·Î±× ÆÄÀÏ¿¡ HTML Àº »©°í ´ã±â"
 
-#: src/prefs.c:649
+#: src/prefs.c:690
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Ʋ¸° öÀÚ ÀÚµ¿À¸·Î Ç¥½Ã"
 
-#: src/prefs.c:650
+#: src/prefs.c:691
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "URL À» ¸µÅ©·Î º¸³»±â"
 
-#: src/prefs.c:651
+#: src/prefs.c:692
 msgid "Sending messages removes away status"
 msgstr "¸Þ½ÃÁö¸¦ º¸³»¸é Àá¼ö¿¡¼­ ³ª¿À±â"
 
-#: src/prefs.c:665
+#: src/prefs.c:733 src/prefs.c:818
+msgid "Pictures and Text"
+msgstr ""
+
+#: src/prefs.c:738 src/prefs.c:823
+msgid "Pictures Only"
+msgstr ""
+
+#: src/prefs.c:743 src/prefs.c:828
+#, fuzzy
+msgid "Text Only"
+msgstr "±Û¾¾ »ö±ò"
+
+#: src/prefs.c:764
 #, fuzzy
 msgid "IM Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:676
+#: src/prefs.c:775
 #, fuzzy
 msgid "Show logins in window"
 msgstr "´ëȭâ¿¡¼­ ·Î±×¿Â/¿ÀÇÁ º¸¿©ÁÖ±â"
 
-#: src/prefs.c:677 src/prefs.c:707
+#: src/prefs.c:781 src/prefs.c:866
 #, fuzzy
-msgid "Show buttons with text"
+msgid "Show buttons as "
 msgstr "¹öÆ° ±×¸² º¸¿©ÁÖ±â"
 
-#: src/prefs.c:678 src/prefs.c:708
+#: src/prefs.c:790 src/prefs.c:876
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:679 src/prefs.c:709
+#: src/prefs.c:791 src/prefs.c:877
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é âÀ» ¾ÕÀ¸·Î"
 
-#: src/prefs.c:680 src/prefs.c:1404
+#: src/prefs.c:792 src/prefs.c:1572
 msgid "Ignore new conversations when away"
 msgstr "Àá¼öÁß¿¡´Â »õ·Î¿î ´ëÈ­ ¹«½Ã"
 
-#: src/prefs.c:681
+#: src/prefs.c:793
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "¸Þ½ÃÁö ¸¸µé±â"
 
-#: src/prefs.c:695 src/prefs.c:883
+#: src/prefs.c:849 src/prefs.c:1051
 #, fuzzy
 msgid "Chat Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:706
+#: src/prefs.c:860
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:740 src/prefs.c:742 src/prefs.c:954 src/prefs.c:956
+#: src/prefs.c:908 src/prefs.c:910 src/prefs.c:1122 src/prefs.c:1124
 msgid "Gaim Chat"
 msgstr "Gaim äÆÃ"
 
-#: src/prefs.c:900
+#: src/prefs.c:1068
 msgid "Refresh"
 msgstr "°»½Å"
 
-#: src/prefs.c:928
+#: src/prefs.c:1096
 msgid "List of available chats"
 msgstr "°¡´ÉÇÑ Ã¤ÆÃÀÇ ¸ñ·Ï"
 
-#: src/prefs.c:942
+#: src/prefs.c:1110
 msgid "List of subscribed chats"
 msgstr "°¡ÀÔÇÑ Ã¤ÆÃÀÇ ¸ñ·Ï"
 
-#: src/prefs.c:1074 src/prefs.c:1831
+#: src/prefs.c:1242 src/prefs.c:2027
 #, fuzzy
 msgid "Font Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:1087
+#: src/prefs.c:1255
 msgid "Underlined Text"
 msgstr "¹ØÁÙÄ£ ±Û¾¾"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1256
 msgid "Strike Text"
 msgstr "°¡¿îµ¥ ÁÙÄ£ ±Û¾¾"
 
-#: src/prefs.c:1101 src/prefs.c:1118 src/prefs.c:1138
+#: src/prefs.c:1269 src/prefs.c:1286 src/prefs.c:1306
 #, fuzzy
 msgid "Select"
 msgstr "±Û²Ã ¼±ÅÃ"
 
-#: src/prefs.c:1136
+#: src/prefs.c:1304
 msgid "Font Face for Text"
 msgstr "±Û¾¾¿¡ »ç¿ëÇÒ ±Û²Ã"
 
-#: src/prefs.c:1159
+#: src/prefs.c:1327
 #, fuzzy
 msgid "Sound Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:1171
+#: src/prefs.c:1339
 msgid "Sounds go through GNOME"
 msgstr "±×³ðÀ» ÀÌ¿ëÇÏ¿© ¼Ò¸®³»±â"
 
-#: src/prefs.c:1173
+#: src/prefs.c:1341
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Ä£±¸°¡ µé¾î¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1174 src/prefs.c:1405
+#: src/prefs.c:1342 src/prefs.c:1573
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1175
+#: src/prefs.c:1343
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1190
+#: src/prefs.c:1358
 #, fuzzy
 msgid "Sound Events"
 msgstr "¼Ò¸®"
 
-#: src/prefs.c:1201
+#: src/prefs.c:1369
 msgid "Sound when buddy logs in"
 msgstr "Ä£±¸°¡ µé¾î¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1202
+#: src/prefs.c:1370
 msgid "Sound when buddy logs out"
 msgstr "Ä£±¸°¡ ³ª°¡¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1208
+#: src/prefs.c:1376
 msgid "Sound when message is received"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1209
+#: src/prefs.c:1377
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1210
+#: src/prefs.c:1378
 msgid "Sound when message is sent"
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1216
+#: src/prefs.c:1384
 #, fuzzy
 msgid "Sound in chat rooms when people enter/leave"
 msgstr "äÆù濡 »ç¶÷µéÀÌ µå³ªµé ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1217
+#: src/prefs.c:1385
 #, fuzzy
 msgid "Sound in chat rooms when people talk"
 msgstr "»ç¶÷µéÀÌ Ã¤Æù濡¼­ ¾ê±âÇÒ ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1302 src/prefs.c:1858
+#: src/prefs.c:1470 src/prefs.c:2054
 #, fuzzy
 msgid "Away Messages"
 msgstr "»õ·Î¿î Àá¼ö ¸Þ½ÃÁö"
 
-#: src/prefs.c:1318
+#: src/prefs.c:1486
 #, fuzzy
 msgid "Title"
 msgstr "ÆÄÀÏ"
 
-#: src/prefs.c:1322
+#: src/prefs.c:1490
 #, fuzzy
 msgid "Message"
 msgstr "¸Þ½ÃÁö ¸¸µé±â"
 
-#: src/prefs.c:1362
+#: src/prefs.c:1530
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1366
+#: src/prefs.c:1534
 #, fuzzy
 msgid "Make Away"
 msgstr "Áö±Ý ¹Ù·Î Àá¼ö"
 
-#: src/prefs.c:1477
+#: src/prefs.c:1645
 #, fuzzy
 msgid "Browser Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:1488
+#: src/prefs.c:1656
 msgid "Netscape"
 msgstr "³Ý½ºÄÉÀÌÇÁ"
 
-#: src/prefs.c:1489
+#: src/prefs.c:1657
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1491
+#: src/prefs.c:1659
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1493
+#: src/prefs.c:1661
 #, fuzzy
 msgid "Internal HTML Widget (Quite likely a bad idea!)"
 msgstr "³»Àå HTML À§Á¬ (ÁÁÀº »ý°¢ÀÌ ¾Æ³Ä!)"
 
-#: src/prefs.c:1494
+#: src/prefs.c:1662
 msgid "Manual"
 msgstr "¼öµ¿"
 
-#: src/prefs.c:1503
+#: src/prefs.c:1671
 msgid "Pop up new window by default"
 msgstr "±âº»À¸·Î »õ â ¿­±â"
 
-#: src/prefs.c:1547
+#: src/prefs.c:1716
 msgid "Gaim - Preferences"
 msgstr "Gaim - ¼³Á¤"
 
-#: src/prefs.c:1630
+#: src/prefs.c:1801
 msgid "GAIM debug output window"
 msgstr "GAIM µð¹ö±ë Ãâ·Ââ"
 
-#: src/prefs.c:1772
+#: src/prefs.c:1956
 msgid "General"
 msgstr "ÀϹÝ"
 
-#: src/prefs.c:1783
+#: src/prefs.c:1969
 msgid "Connection"
 msgstr "¿¬°á"
 
 #. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:1800
+#: src/prefs.c:1996
 #, fuzzy
 msgid "Permit/Deny"
 msgstr "¸î¸í¸¸ Çã¿ë"
 
-#: src/prefs.c:1811
+#: src/prefs.c:2007
 #, fuzzy
 msgid "Conversations"
 msgstr "¸ðµç ´ëÈ­¸¦ ·Î±ë"
 
-#: src/prefs.c:1816
+#: src/prefs.c:2012
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:1821
+#: src/prefs.c:2017
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:1826
+#: src/prefs.c:2022
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:1842
+#: src/prefs.c:2038
 msgid "Sounds"
 msgstr "¼Ò¸®"
 
-#: src/prefs.c:1847
+#: src/prefs.c:2043
 msgid "Events"
 msgstr ""
 
-#: src/prefs.c:1869
+#: src/prefs.c:2065
 msgid "Browser"
 msgstr "ºê¶ó¿ìÀú"
 
@@ -1735,20 +1779,24 @@
 msgid "Sending %s to %s"
 msgstr "%s ¸¦ %s ¿¡°Ô º¸³¿"
 
-#: src/rvous.c:661
+#: src/rvous.c:662
 #, c-format
 msgid "%s requests you to accept the file: %s (%d bytes)"
 msgstr "%s °¡ ´ç½ÅÀÌ ÆÄÀÏÀ» Á¢¼öÇϱ⸦ ¿äûÇÏ¿´½À´Ï´Ù : %s (%d ¹ÙÀÌÆ®)"
 
-#: src/rvous.c:664
+#: src/rvous.c:665
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s °¡ ´ç½Å¿¡°Ô ÆÄÀÏÀ» º¸³»´Þ¶ó°í ¿äûÇÏ¿´½À´Ï´Ù"
 
-#: src/rvous.c:674
+#: src/rvous.c:675
 msgid "Gaim - File Transfer?"
 msgstr "Gaim - ÆÄÀÏÀ» Àü¼ÛÇÒ±î¿ä?"
 
+#, fuzzy
+#~ msgid "Connection Options"
+#~ msgstr "¿¬°á"
+
 #~ msgid "Permit some"
 #~ msgstr "¸î¸í¸¸ Çã¿ë"
 
--- a/po/zh_CN.po	Mon Sep 18 10:43:38 2000 +0000
+++ b/po/zh_CN.po	Mon Sep 18 18:07:38 2000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2000-09-11 02:08-0700\n"
+"POT-Creation-Date: 2000-09-15 18:12-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"
@@ -28,72 +28,72 @@
 msgid "You must give your password"
 msgstr "ÄãÐèÒªÊäÈëÃÜÂë"
 
-#: src/aim.c:231 src/buddy.c:1790
+#: src/aim.c:231 src/buddy.c:1849
 msgid "Signoff"
 msgstr "À뿪"
 
-#: src/aim.c:329 src/aim.c:575 src/buddy.c:308
+#: src/aim.c:334 src/aim.c:579 src/buddy.c:318
 msgid "Signon"
 msgstr "怬"
 
-#: src/aim.c:330 src/buddy_chat.c:127 src/buddy_chat.c:219 src/dialogs.c:418
-#: src/dialogs.c:717 src/dialogs.c:873 src/dialogs.c:949 src/dialogs.c:1065
-#: src/dialogs.c:1196 src/dialogs.c:1382 src/dialogs.c:1486 src/dialogs.c:1567
-#: src/dialogs.c:1811 src/dialogs.c:1998 src/dialogs.c:2163 src/dialogs.c:2256
-#: src/dialogs.c:2981 src/dialogs.c:3240 src/oscar.c:647 src/rvous.c:279
-#: src/rvous.c:416 src/rvous.c:637
+#: src/aim.c:335 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:419
+#: src/dialogs.c:720 src/dialogs.c:877 src/dialogs.c:954 src/dialogs.c:1071
+#: src/dialogs.c:1203 src/dialogs.c:1390 src/dialogs.c:1495 src/dialogs.c:1576
+#: src/dialogs.c:1821 src/dialogs.c:2009 src/dialogs.c:2175 src/dialogs.c:2270
+#: src/dialogs.c:2996 src/dialogs.c:3257 src/oscar.c:651 src/rvous.c:279
+#: src/rvous.c:416 src/rvous.c:638
 msgid "Cancel"
 msgstr "È¡Ïû"
 
-#: src/aim.c:331 src/buddy.c:1787
+#: src/aim.c:336 src/buddy.c:1846
 msgid "Register"
 msgstr "×¢²á"
 
-#: src/aim.c:332
+#: src/aim.c:337
 msgid "Options"
 msgstr "Ñ¡Ïî"
 
-#: src/aim.c:334 src/aim.c:581 src/buddy.c:1853
+#: src/aim.c:339 src/aim.c:585 src/buddy.c:1912
 msgid "Plugins"
 msgstr "²å¼þ"
 
-#: src/aim.c:408
+#: src/aim.c:413
 msgid "Screen Name: "
 msgstr "ÏÔʾµÄÐÕÃû£º"
 
-#: src/aim.c:411
+#: src/aim.c:416
 msgid "Password: "
 msgstr "ÃÜÂ룺"
 
-#: src/aim.c:414
+#: src/aim.c:419
 msgid "Remember Password"
 msgstr "¼ÇסÃÜÂë"
 
-#: src/aim.c:461
+#: src/aim.c:466
 msgid "Gaim - Login"
 msgstr "Gaim - µÇÈë"
 
-#: src/aim.c:570 src/buddy.c:1850
+#: src/aim.c:574 src/buddy.c:1909
 msgid "Preferences"
 msgstr "ÓÅÏÈÑ¡Ïî"
 
-#: src/away.c:88 src/away.c:202
+#: src/away.c:88 src/away.c:203
 msgid "Back"
 msgstr "·µ»Ø"
 
-#: src/away.c:98
+#: src/away.c:99
 msgid "I'm Back!"
 msgstr "ÎÒºúººÈýÓÖ»ØÀ´ÁË£¡"
 
-#: src/away.c:140
+#: src/away.c:141
 msgid "Gaim - Away!"
 msgstr "Gaim - ÔÝʱÀ뿪"
 
-#: src/away.c:243 src/gnome_applet_mgr.c:198
+#: src/away.c:244 src/gnome_applet_mgr.c:198
 msgid "New Away Message"
 msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
 
-#: src/away.c:262
+#: src/away.c:263
 msgid "Remove Away Message"
 msgstr "ɾ³ýÀ뿪ÐÅÏ¢"
 
@@ -103,108 +103,109 @@
 msgstr "%d/%d ÅóÓÑÀ´ÁË"
 
 #. Put the buttons in the box
-#: src/buddy.c:250 src/buddy.c:1922 src/conversation.c:447
-#: src/conversation.c:1664 src/dialogs.c:871 src/dialogs.c:948
-#: src/dialogs.c:1810 src/dialogs.c:1832 src/dialogs.c:3238 src/prefs.c:587
-#: src/prefs.c:901 src/prefs.c:1358
+#: src/buddy.c:259 src/buddy.c:1981 src/buddy_chat.c:816
+#: src/conversation.c:440 src/conversation.c:1650 src/dialogs.c:875
+#: src/dialogs.c:953 src/dialogs.c:1820 src/dialogs.c:1842 src/dialogs.c:3255
+#: src/prefs.c:628 src/prefs.c:1069 src/prefs.c:1526
 msgid "Add"
 msgstr "Ôö¼Ó"
 
-#: src/buddy.c:251 src/buddy.c:1923 src/dialogs.c:881 src/dialogs.c:964
+#: src/buddy.c:260 src/buddy.c:1982 src/dialogs.c:885 src/dialogs.c:969
 msgid "Group"
 msgstr "×éȺ"
 
-#: src/buddy.c:252 src/buddy.c:1924 src/conversation.c:1662 src/dialogs.c:780
-#: src/prefs.c:591 src/prefs.c:902 src/prefs.c:1370
+#: src/buddy.c:261 src/buddy.c:1983 src/buddy_chat.c:818
+#: src/conversation.c:1648 src/dialogs.c:783 src/prefs.c:632 src/prefs.c:1070
+#: src/prefs.c:1538
 msgid "Remove"
 msgstr "ɾ³ý"
 
-#: src/buddy.c:255 src/buddy.c:1696
+#: src/buddy.c:264 src/buddy.c:1753
 msgid "Chat"
 msgstr "ÁÄÌì"
 
-#: src/buddy.c:256 src/buddy.c:395 src/buddy.c:1694 src/buddy_chat.c:545
+#: src/buddy.c:265 src/buddy.c:405 src/buddy.c:1751 src/buddy_chat.c:543
 msgid "IM"
 msgstr "¼´Ê±ÐÅÏ¢"
 
-#: src/buddy.c:257 src/buddy.c:401 src/buddy.c:1695 src/buddy_chat.c:547
-#: src/conversation.c:1658 src/rvous.c:635
+#: src/buddy.c:266 src/buddy.c:411 src/buddy.c:1752 src/buddy_chat.c:545
+#: src/buddy_chat.c:824 src/conversation.c:1644 src/rvous.c:636
 msgid "Info"
 msgstr "Ïêϸ×ÊÁÏ"
 
-#: src/buddy.c:407 src/dialogs.c:3252
+#: src/buddy.c:417 src/dialogs.c:3269
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:414
+#: src/buddy.c:424
 msgid "Dir Info"
 msgstr "ÐÕÃûµØַ¼"
 
-#: src/buddy.c:421
+#: src/buddy.c:431
 #, fuzzy
 msgid "Direct IM"
 msgstr "ÐÕÃûµØַ¼"
 
-#: src/buddy.c:427
+#: src/buddy.c:437
 msgid "Away Msg"
 msgstr "ÔÝʱÀ뿪ÐÅÏ¢"
 
-#: src/buddy.c:434
+#: src/buddy.c:444
 msgid "Toggle Logging"
 msgstr "´ò¿ª£¯¹Ø±Õ¼Ç¼"
 
-#: src/buddy.c:440
+#: src/buddy.c:450
 msgid "Add Buddy Pounce"
 msgstr "Ôö¼Ó¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1204
+#: src/buddy.c:1246
 msgid "New Buddy Pounce"
 msgstr "ÐÂÔö¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1222
+#: src/buddy.c:1264
 msgid "Remove Buddy Pounce"
 msgstr "È¡Ïû¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1297
+#: src/buddy.c:1352
 #, fuzzy, c-format
 msgid "%sBuddy Icon"
 msgstr "¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1300
+#: src/buddy.c:1355
 #, c-format
 msgid "%sVoice"
 msgstr ""
 
-#: src/buddy.c:1303
+#: src/buddy.c:1358
 #, c-format
 msgid "%sIM Image"
 msgstr ""
 
-#: src/buddy.c:1306
+#: src/buddy.c:1361
 #, fuzzy, c-format
 msgid "%sChat"
 msgstr "ÁÄÌì"
 
-#: src/buddy.c:1309
+#: src/buddy.c:1364
 #, c-format
 msgid "%sGet File"
 msgstr ""
 
-#: src/buddy.c:1312
+#: src/buddy.c:1367
 #, c-format
 msgid "%sSend File"
 msgstr ""
 
-#: src/buddy.c:1367
+#: src/buddy.c:1422
 msgid "Warnings: %d%%\n"
 msgstr "¾¯¸æ£º%d%%\n"
 
-#: src/buddy.c:1373
+#: src/buddy.c:1428
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1377
+#: src/buddy.c:1432
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -216,373 +217,374 @@
 "µÇÈëµ½£º%s\n"
 "%s%s%s"
 
-#: src/buddy.c:1377
+#: src/buddy.c:1432
 msgid "Idle: "
 msgstr "¿Õתʱ¼ä£º"
 
-#: src/buddy.c:1422
+#: src/buddy.c:1477
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
 
-#: src/buddy.c:1563
+#: src/buddy.c:1620
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s À뿪ÁË %s%s ¡£</B><BR><HR>"
 
-#: src/buddy.c:1721
+#: src/buddy.c:1778
 msgid "Information on selected Buddy"
 msgstr "Ñ¡ÖеÄÅóÓѵÄ×ÊÁÏ"
 
-#: src/buddy.c:1722 src/dialogs.c:708
+#: src/buddy.c:1779 src/dialogs.c:711
 msgid "Send Instant Message"
 msgstr "·¢³ö¼´Ê±ÐÅÏ¢"
 
-#: src/buddy.c:1723
+#: src/buddy.c:1780
 msgid "Start/join a Buddy Chat"
 msgstr "·¢Æ𣯼ÓÈëÒ»¸öÁÄÌìÊÒ"
 
-#: src/buddy.c:1774
+#: src/buddy.c:1833
 msgid "File"
 msgstr "Îļþ"
 
-#: src/buddy.c:1778 src/buddy.c:1779
+#: src/buddy.c:1837 src/buddy.c:1838
 msgid "Add A Buddy"
 msgstr "¼ÓÈëÒ»¸ö¸çÃǶù"
 
-#: src/buddy.c:1780
+#: src/buddy.c:1839
 #, fuzzy
 msgid "Join A Chat"
 msgstr "¼ÓÈëÁÄÌì"
 
-#: src/buddy.c:1782
+#: src/buddy.c:1841
 msgid "Import Buddy List"
 msgstr "µ¼ÈëÅóÓÑÁбí"
 
-#: src/buddy.c:1783
+#: src/buddy.c:1842
 msgid "Export Buddy List"
 msgstr "µ¼³öÅóÓÑÁбí"
 
-#: src/buddy.c:1793
+#: src/buddy.c:1852
 msgid "Quit"
 msgstr "Í˳ö"
 
-#: src/buddy.c:1795 src/buddy_chat.c:539 src/buddy_chat.c:787
-#: src/conversation.c:1660 src/dialogs.c:495 src/plugins.c:317
-#: src/prefs.c:1597
+#: src/buddy.c:1854 src/buddy_chat.c:537 src/buddy_chat.c:791
+#: src/buddy_chat.c:812 src/conversation.c:1646 src/dialogs.c:496
+#: src/plugins.c:318 src/prefs.c:1768
 msgid "Close"
 msgstr "¹Ø±Õ"
 
-#: src/buddy.c:1800
+#: src/buddy.c:1859
 msgid "Tools"
 msgstr "¹¤¾ß"
 
-#: src/buddy.c:1805 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:1864 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
 msgid "Away"
 msgstr "ÔÝʱÀ뿪"
 
-#: src/buddy.c:1810
+#: src/buddy.c:1869
 msgid "Buddy Pounce"
 msgstr "¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1818 src/dialogs.c:1992 src/dialogs.c:2148
+#: src/buddy.c:1877 src/dialogs.c:2003 src/dialogs.c:2160
 msgid "Search for Buddy"
 msgstr "ËÑÑ°ÅóÓÑ"
 
-#: src/buddy.c:1821
+#: src/buddy.c:1880
 msgid "by Email"
 msgstr "ʹÓõçÓÊ"
 
-#: src/buddy.c:1825
+#: src/buddy.c:1884
 msgid "by Dir Info"
 msgstr "ʹÓÃÐÕÃûµØַ¼"
 
-#: src/buddy.c:1832 src/buddy.c:1833
+#: src/buddy.c:1891 src/buddy.c:1892
 msgid "Settings"
 msgstr "É趨"
 
-#: src/buddy.c:1836
+#: src/buddy.c:1895
 msgid "User Info"
 msgstr "Óû§Ïêϸ×ÊÁÏ"
 
-#: src/buddy.c:1840 src/dialogs.c:1190
+#: src/buddy.c:1899 src/dialogs.c:1197
 msgid "Directory Info"
 msgstr "ÐÕÃûµØַ¼"
 
-#: src/buddy.c:1844 src/dialogs.c:1376
+#: src/buddy.c:1903 src/dialogs.c:1384
 msgid "Change Password"
 msgstr "¸ü¸ÄÃÜÂë"
 
-#: src/buddy.c:1858
+#: src/buddy.c:1917
 #, fuzzy
 msgid "Perl"
 msgstr "ÔÊÐí"
 
-#: src/buddy.c:1861
+#: src/buddy.c:1920
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1865
+#: src/buddy.c:1924
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1869
+#: src/buddy.c:1928
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1877
+#: src/buddy.c:1936
 msgid "Help"
 msgstr "°ïÖú"
 
-#: src/buddy.c:1882
+#: src/buddy.c:1941
 #, fuzzy
 msgid "About Gaim"
 msgstr "¹ØÓÚ"
 
-#: src/buddy.c:1901 src/prefs.c:1794
+#: src/buddy.c:1960 src/prefs.c:1990
 msgid "Buddy List"
 msgstr "ÅóÓÑÁбí"
 
-#: src/buddy.c:1953
+#: src/buddy.c:2012
 msgid "Add a new Buddy"
 msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
 
-#: src/buddy.c:1954
+#: src/buddy.c:2013
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
 
-#: src/buddy.c:1955
+#: src/buddy.c:2014
 msgid "Remove selected Buddy"
 msgstr "ɾ³ýÑ¡ÖеÄÅóÓÑ"
 
-#: src/buddy.c:1980
+#: src/buddy.c:2039
 msgid "Online"
 msgstr "ÔÚÏß"
 
-#: src/buddy.c:1982
+#: src/buddy.c:2041
 msgid "Edit Buddies"
 msgstr "ÐÞ¸ÄÅóÓѱí"
 
-#: src/buddy.c:2019
+#: src/buddy.c:2078
 msgid "Gaim - Buddy List"
 msgstr "Gaim - ÅóÓÑÁбí"
 
-#: src/buddy_chat.c:124 src/buddy_chat.c:729 src/buddy_chat.c:741
+#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
 msgid "Buddy Chat"
 msgstr "ÅóÓÑÁÄÌì"
 
-#: src/buddy_chat.c:126
+#: src/buddy_chat.c:123
 msgid "Join"
 msgstr "¼ÓÈë"
 
-#: src/buddy_chat.c:132
+#: src/buddy_chat.c:129
 msgid "Join what group:"
 msgstr "Òª¼ÓÈëµÄ×飺"
 
-#: src/buddy_chat.c:138
+#: src/buddy_chat.c:135
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:146
+#: src/buddy_chat.c:143
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:175
+#: src/buddy_chat.c:172
 msgid "Join Chat"
 msgstr "¼ÓÈëÁÄÌì"
 
-#: src/buddy_chat.c:220 src/buddy_chat.c:541 src/buddy_chat.c:786
+#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
 msgid "Invite"
 msgstr "ÑûÇë"
 
-#: src/buddy_chat.c:237
+#: src/buddy_chat.c:234
 msgid "Invite who?"
 msgstr "ÏëÇëË­£¿"
 
-#: src/buddy_chat.c:241
+#: src/buddy_chat.c:238
 msgid "With message:"
 msgstr "ÑûÇëÐÅÏ¢£º"
 
-#: src/buddy_chat.c:268
+#: src/buddy_chat.c:265
 msgid "Invite to Buddy Chat"
 msgstr "ÇëÈËÁÄÌì"
 
-#: src/buddy_chat.c:427
+#: src/buddy_chat.c:424
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:455
+#: src/buddy_chat.c:452
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:542 src/buddy_chat.c:785
+#: src/buddy_chat.c:540 src/buddy_chat.c:789
 msgid "Whisper"
 msgstr "ÇÄÇÄ»°"
 
-#: src/buddy_chat.c:543 src/buddy_chat.c:784 src/conversation.c:1657
-#: src/dialogs.c:1568
+#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
+#: src/conversation.c:1643 src/dialogs.c:1577
 msgid "Send"
 msgstr "Ëͳö"
 
-#: src/buddy_chat.c:546
+#: src/buddy_chat.c:544
 msgid "Ignore"
 msgstr "²»ÀíËû"
 
-#: src/conversation.c:181
+#: src/buddy_chat.c:820 src/conversation.c:1651
+msgid "Block"
+msgstr "¿é"
+
+#: src/buddy_chat.c:822 src/conversation.c:1645 src/dialogs.c:415
+#: src/dialogs.c:417 src/rvous.c:637
+msgid "Warn"
+msgstr "¾¯¸æ"
+
+#: src/conversation.c:171
 #, fuzzy, c-format
 msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
 msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
 
-#: src/conversation.c:188
+#: src/conversation.c:178
 #, fuzzy, c-format
 msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
 msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
 
-#: src/conversation.c:442
+#: src/conversation.c:435
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "°Ñ ¡°%s¡±´ÓÅóÓѱíÉÏɾȥ\n"
 
-#: src/conversation.c:695
+#: src/conversation.c:688
 msgid "Message too long, some data truncated."
 msgstr "ÐÅϢ̫³¤ÁË£¬ºóÃæµÄ±»¿³µôÁË¡£"
 
-#: src/conversation.c:695 src/dialogs.c:2709 src/dialogs.c:2779
+#: src/conversation.c:688 src/dialogs.c:2723 src/dialogs.c:2793
 #: src/rvous.c:221 src/rvous.c:492
 msgid "Error"
 msgstr "´íÎó"
 
-#: src/conversation.c:883
+#: src/conversation.c:875
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Ä¿Ç°ÔÚ %d\n"
 
-#: src/conversation.c:892
+#: src/conversation.c:884
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "°ÑλÖÃÉ趨µ½ %d\n"
 
-#: src/conversation.c:1489
+#: src/conversation.c:1481
 msgid "Bold"
 msgstr "´ÖÌå"
 
-#: src/conversation.c:1489 src/prefs.c:1085
+#: src/conversation.c:1481 src/prefs.c:1253
 msgid "Bold Text"
 msgstr "´ÖÌåÎÄ×Ö"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1485 src/conversation.c:1486
 msgid "Italics"
 msgstr "бÌå"
 
-#: src/conversation.c:1493 src/prefs.c:1086
+#: src/conversation.c:1485 src/prefs.c:1254
 msgid "Italics Text"
 msgstr "бÌåÎÄ×Ö"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1489 src/conversation.c:1490
 msgid "Underline"
 msgstr "ϼÓÏß"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1489
 msgid "Underline Text"
 msgstr "ϼÓÏßÎÄ×Ö"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1493 src/conversation.c:1494
 msgid "Strike"
 msgstr "»®µô"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1493
 msgid "Strike through Text"
 msgstr "»®µôµÄÎÄ×Ö"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1497
 msgid "Small"
 msgstr "С"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1497
 msgid "Decrease font size"
 msgstr "ËõС×ÖÌå"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1500
 msgid "Normal"
 msgstr "Õý³£"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1500
 msgid "Normal font size"
 msgstr "Õý³£×ÖÌå´óС"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1503
 msgid "Big"
 msgstr "´ó"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1503
 msgid "Increase font size"
 msgstr "Ôö´ó×ÖÌå"
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1510 src/conversation.c:1511
 msgid "Font"
 msgstr "×ÖÐÍ"
 
-#: src/conversation.c:1518 src/dialogs.c:2608 src/dialogs.c:2624
+#: src/conversation.c:1510 src/dialogs.c:2622 src/dialogs.c:2638
 msgid "Select Font"
 msgstr "Ñ¡Ôñ×ÖÐÍ"
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1514 src/conversation.c:1515 src/conversation.c:1518
+#: src/conversation.c:1519
 msgid "Color"
 msgstr "ÑÕÉ«"
 
-#: src/conversation.c:1522 src/prefs.c:1099
+#: src/conversation.c:1514 src/prefs.c:1267
 msgid "Text Color"
 msgstr "ÎÄ×ÖÑÕÉ«"
 
-#: src/conversation.c:1526 src/prefs.c:1116
+#: src/conversation.c:1518 src/prefs.c:1284
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1525 src/conversation.c:1526
 msgid "Link"
 msgstr "Á¬½Ó"
 
-#: src/conversation.c:1533 src/dialogs.c:2250
+#: src/conversation.c:1525 src/dialogs.c:2264
 msgid "Insert Link"
 msgstr "²åÈëÁ¬½Ó"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1529
 #, fuzzy
 msgid "Smiley"
 msgstr "Îļþ"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1529
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1536 src/conversation.c:1537
 msgid "Logging"
 msgstr "¼Ç¼"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1536
 msgid "Enable logging"
 msgstr "´ò¿ª¼Ç¼"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1540 src/conversation.c:1541
 msgid "Sound"
 msgstr "ÉùÒô"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1540
 msgid "Enable sounds"
 msgstr "´ò¿ªÉùÒô"
 
-#: src/conversation.c:1659 src/dialogs.c:414 src/dialogs.c:416 src/rvous.c:636
-msgid "Warn"
-msgstr "¾¯¸æ"
-
-#: src/conversation.c:1665
-msgid "Block"
-msgstr "¿é"
-
 #: src/dialogs.c:224
 msgid "Error Resolving Mail Server.\n"
 msgstr "½âÎöµçÓÊ·þÎñÆ÷ʱ³ö´í¡£\n"
@@ -591,398 +593,398 @@
 msgid "Error Connecting to Socket.\n"
 msgstr "Á¬½Ó¶Ë¿Úʱ³ö´í¡£\n"
 
-#: src/dialogs.c:431
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "ÄãÕæµÄÏ뾯¸æ%s£¿"
 
-#: src/dialogs.c:435
+#: src/dialogs.c:436
 msgid "Warn anonymously?"
 msgstr "·¢ÄäÃû¾¯¸æ£¿"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:439
 msgid "Anonymous warnings are less harsh."
 msgstr "ÄäÃû¾¯¸æ²»ÄÇôÑÏÀ÷¡£"
 
-#: src/dialogs.c:463
+#: src/dialogs.c:464
 msgid "Gaim - Warn user?"
 msgstr "Gaim - ¾¯¸æÓû§£¿"
 
-#: src/dialogs.c:531
+#: src/dialogs.c:532
 #, c-format
 msgid "Unable to write file %s."
 msgstr "²»ÄÜдÈëÎļþ %s¡£"
 
-#: src/dialogs.c:534
+#: src/dialogs.c:535
 #, c-format
 msgid "Unable to read file %s."
 msgstr "²»ÄܶÁÈëÎļþ %s¡£"
 
-#: src/dialogs.c:537
+#: src/dialogs.c:538
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "ÐÅϢ̫³¤£¬ºóÃæ %s ×ÖÔª±»¿³µôÁË¡£"
 
-#: src/dialogs.c:540
+#: src/dialogs.c:541
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ÏÖÔÚûÓеÇÈë¡£"
 
-#: src/dialogs.c:543
+#: src/dialogs.c:544
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "²»ÔÊÐí¾¯¸æ %s ¡£"
 
-#: src/dialogs.c:546
+#: src/dialogs.c:547
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "È¡ÏûÁËÒ»¸öÐÅÏ¢£¬Ä㳬³öÁË·þÊÌÆ÷µÄËÙ¶ÈÏÞÖÆ¡£"
 
-#: src/dialogs.c:549
+#: src/dialogs.c:550
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "ÔÚ %s ÖÐûÓÐÁÄÌì¡£"
 
-#: src/dialogs.c:552
+#: src/dialogs.c:553
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Äã·¢Ë͸ø %s µÄËÙ¶ÈÌ«¿ìÁË¡£"
 
-#: src/dialogs.c:555
+#: src/dialogs.c:556
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
 
-#: src/dialogs.c:558
+#: src/dialogs.c:559
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅÏ¢·¢Ë͵ÄËÙ¶ÈÌ«¿ì¡£"
 
-#: src/dialogs.c:561
+#: src/dialogs.c:562
 msgid "Failure."
 msgstr "ʧ°ÜÁË¡£"
 
-#: src/dialogs.c:564
+#: src/dialogs.c:565
 msgid "Too many matches."
 msgstr "Æ¥ÅäÌ«¶à¡£"
 
-#: src/dialogs.c:567
+#: src/dialogs.c:568
 msgid "Need more qualifiers."
 msgstr "ÐèÒª¸ü¶àµÄ²ÎÊý¡£"
 
-#: src/dialogs.c:570
+#: src/dialogs.c:571
 msgid "Dir service temporarily unavailable."
 msgstr "ÐÕÃûµØַ¼·þÎñÆ÷ÔÝʱÁ¬²»ÉÏ¡£"
 
-#: src/dialogs.c:573
+#: src/dialogs.c:574
 msgid "Email lookup restricted."
 msgstr "µçÓʲéÕÒÏÞÖÆ¡£"
 
-#: src/dialogs.c:576
+#: src/dialogs.c:577
 msgid "Keyword ignored."
 msgstr "¹Ø¼ü×Ö±»ºöÂÔ¡£"
 
-#: src/dialogs.c:579
+#: src/dialogs.c:580
 msgid "No keywords."
 msgstr "ûÓйؼü×Ö¡£"
 
-#: src/dialogs.c:582
+#: src/dialogs.c:583
 msgid "User has no directory information."
 msgstr "¸ÃÓû§Ã»ÓÐÐÕÃûµØַ¼"
 
-#: src/dialogs.c:586
+#: src/dialogs.c:587
 msgid "Country not supported."
 msgstr "²»Ö§³ÖÕâ¸ö¹ú¼Ò¡£"
 
-#: src/dialogs.c:589
+#: src/dialogs.c:590
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "²»Ã÷´íÎó£º %s ¡£"
 
 #. Incorrect nick/password
-#: src/dialogs.c:592 src/oscar.c:315
+#: src/dialogs.c:593 src/oscar.c:318
 msgid "Incorrect nickname or password."
 msgstr "êÇÃû»òÕßÃÜÂë´íÎó¡£"
 
-#: src/dialogs.c:595
+#: src/dialogs.c:596
 msgid "The service is temporarily unavailable."
 msgstr "ÔÝʱûÓи÷þÎñ¡£"
 
-#: src/dialogs.c:598
+#: src/dialogs.c:599
 msgid "Your warning level is currently too high to log in."
 msgstr "ÄãÄ¿Ç°µÄ¾¯¸æ¼¶±ðÌ«¸ß£¬ÎÞ·¨µÇÈë¡£"
 
-#: src/dialogs.c:601
+#: src/dialogs.c:602
 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:604
+#: src/dialogs.c:605
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "·¢Éú²»Ã÷µÄµÇ¼´íÎó£º %s¡£"
 
-#: src/dialogs.c:607
+#: src/dialogs.c:608
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "²»Ã÷´íÎó %d ·¢ÉúÁË¡£¾ßÌåѶϢ£º %s"
 
-#: src/dialogs.c:610
+#: src/dialogs.c:611
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - ´íÎó %d"
 
 #. Build OK Button
-#: src/dialogs.c:649 src/dialogs.c:712 src/dialogs.c:1060 src/dialogs.c:1381
-#: src/dialogs.c:1665 src/dialogs.c:1997 src/dialogs.c:2158 src/dialogs.c:2255
+#: src/dialogs.c:650 src/dialogs.c:715 src/dialogs.c:1066 src/dialogs.c:1389
+#: src/dialogs.c:1675 src/dialogs.c:2008 src/dialogs.c:2170 src/dialogs.c:2269
 msgid "OK"
 msgstr "È·ÈÏ"
 
-#: src/dialogs.c:722
+#: src/dialogs.c:725
 msgid "IM who: "
 msgstr "¸øË­¼´Ê±ÐÅÏ¢£º"
 
-#: src/dialogs.c:746
+#: src/dialogs.c:749
 msgid "Gaim - IM user"
 msgstr "Gaim - ¼´Ê±ÐÅÏ¢Óû§"
 
-#: src/dialogs.c:828
+#: src/dialogs.c:831
 msgid "Buddies"
 msgstr "¸çÃǶùÃÇ"
 
-#: src/dialogs.c:879
+#: src/dialogs.c:883
 #, fuzzy
 msgid "Add Group"
 msgstr "×éȺ"
 
-#: src/dialogs.c:909
+#: src/dialogs.c:913
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:955
+#: src/dialogs.c:960
 msgid "Add Buddy"
 msgstr "Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:957 src/dialogs.c:3248
+#: src/dialogs.c:962 src/dialogs.c:3265
 msgid "Buddy"
 msgstr "ÅóÓÑ"
 
-#: src/dialogs.c:996
+#: src/dialogs.c:1001
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ôö¼ÓÅóÓÑ"
 
 #. Put the buttons in the box
-#: src/dialogs.c:1071
+#: src/dialogs.c:1077
 msgid "Buddy To Pounce:"
 msgstr "±»¼àÊÓµÄÅóÓÑ£º"
 
-#: src/dialogs.c:1076
+#: src/dialogs.c:1082
 msgid "Open IM Window on Buddy Logon"
 msgstr "ÅóÓѵǼʱ´ò¿ª¼´Ê±ÐÅÏ¢´°¿Ú"
 
-#: src/dialogs.c:1079
+#: src/dialogs.c:1085
 msgid "Send IM on Buddy Logon"
 msgstr "ÅóÓѵǼʱ·¢Ëͼ´Ê±ÐÅÏ¢"
 
-#: src/dialogs.c:1087
+#: src/dialogs.c:1093
 msgid "Message to send:"
 msgstr "·¢ËÍÐÅÏ¢£º"
 
-#: src/dialogs.c:1108
+#: src/dialogs.c:1114
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ÐÂÔö¼àÊÓÅóÓÑ"
 
 #. Build Save Button
-#: src/dialogs.c:1194 src/dialogs.c:1485 src/dialogs.c:2976
+#: src/dialogs.c:1201 src/dialogs.c:1494 src/dialogs.c:2991
 msgid "Save"
 msgstr "´æÅÌ"
 
-#: src/dialogs.c:1212
+#: src/dialogs.c:1219
 msgid "Allow Web Searches To Find Your Info"
 msgstr "ÔÊÐí´ÓÍøÒ³ËÑÑ°ÕÒµ½ÄãµÄ×ÊÁÏ"
 
 #. Line 1
-#: src/dialogs.c:1215 src/dialogs.c:2015
+#: src/dialogs.c:1222 src/dialogs.c:2026
 msgid "First Name"
 msgstr "Ãû"
 
 #. Line 2
-#: src/dialogs.c:1226 src/dialogs.c:2027
+#: src/dialogs.c:1233 src/dialogs.c:2038
 msgid "Middle Name"
 msgstr "×Ö"
 
 #. Line 3
-#: src/dialogs.c:1238 src/dialogs.c:2039
+#: src/dialogs.c:1245 src/dialogs.c:2050
 msgid "Last Name"
 msgstr "ÐÕ"
 
 #. Line 4
-#: src/dialogs.c:1249 src/dialogs.c:2051
+#: src/dialogs.c:1256 src/dialogs.c:2062
 msgid "Maiden Name"
 msgstr "Äï¼ÒÐÕ"
 
 #. Line 5
-#: src/dialogs.c:1260 src/dialogs.c:2063
+#: src/dialogs.c:1267 src/dialogs.c:2074
 msgid "City"
 msgstr "ÊÐ"
 
 #. Line 6
-#: src/dialogs.c:1271 src/dialogs.c:2074
+#: src/dialogs.c:1278 src/dialogs.c:2085
 msgid "State"
 msgstr "Ê¡"
 
 #. Line 7
-#: src/dialogs.c:1282 src/dialogs.c:2085
+#: src/dialogs.c:1289 src/dialogs.c:2096
 msgid "Country"
 msgstr "¹ú"
 
-#: src/dialogs.c:1327
+#: src/dialogs.c:1334
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - É趨ÐÕÃûµØַ¼"
 
-#: src/dialogs.c:1344
+#: src/dialogs.c:1351
 msgid "New Passwords Do Not Match"
 msgstr "ÐÂÃÜÂë²»Ò»ÖÂ"
 
-#: src/dialogs.c:1344 src/dialogs.c:1349
+#: src/dialogs.c:1351 src/dialogs.c:1356
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ¸ü¸ÄÃÜÂë´íÎó"
 
-#: src/dialogs.c:1349
+#: src/dialogs.c:1356
 msgid "Fill out all fields completely"
 msgstr "°ÑËùÓеıí¸ñ¶¼ÌíÁË"
 
-#: src/dialogs.c:1390
+#: src/dialogs.c:1398
 msgid "Original Password"
 msgstr "¾ÉÃÜÂë"
 
-#: src/dialogs.c:1406
+#: src/dialogs.c:1414
 msgid "New Password"
 msgstr "ÐÂÃÜÂë"
 
-#: src/dialogs.c:1420
+#: src/dialogs.c:1428
 msgid "New Password (again)"
 msgstr "ÐÂÃÜÂ루ȷ¶¨£©"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1465
 msgid "Gaim - Password Change"
 msgstr "Gaim - ¸ü¸ÄÃÜÂë"
 
-#: src/dialogs.c:1519
+#: src/dialogs.c:1528
 msgid "Gaim - Set User Info"
 msgstr "Gaim - É趨Óû§×ÊÁÏ"
 
-#: src/dialogs.c:1674
+#: src/dialogs.c:1684
 msgid "Below are the results of your search: "
 msgstr "ÒÔÏÂÊÇÄãËÑË÷µÄ½á¹û£º"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1816
 #, fuzzy
 msgid "Permit / Deny"
 msgstr "Ö»ÔÊÐíijЩÈË"
 
-#: src/dialogs.c:1817 src/prefs.c:391
+#: src/dialogs.c:1827 src/prefs.c:432
 msgid "Deny"
 msgstr "¾Ü¾ø"
 
-#: src/dialogs.c:1822 src/prefs.c:375 src/prefs.c:432
+#: src/dialogs.c:1832 src/prefs.c:416 src/prefs.c:473
 msgid "Permit"
 msgstr "ÔÊÐí"
 
-#: src/dialogs.c:1863
+#: src/dialogs.c:1873
 msgid "Gaim - Add Permit/Deny"
 msgstr "Gaim - Ôö¼Ó ÔÊÐí£¯½ûÖ¹"
 
-#: src/dialogs.c:1917
+#: src/dialogs.c:1927
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2133
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - ¸ù¾ÝÓû§×ÊÁϲéÑ°ÅóÓÑ"
 
-#: src/dialogs.c:2168
+#: src/dialogs.c:2180
 msgid "Email"
 msgstr "µçÓÊ"
 
-#: src/dialogs.c:2187
+#: src/dialogs.c:2199
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ¸ù¾ÝµçÓʲéÑ°ÅóÓÑ"
 
-#: src/dialogs.c:2269
+#: src/dialogs.c:2283
 msgid "URL"
 msgstr ""
 
-#: src/dialogs.c:2277
+#: src/dialogs.c:2291
 msgid "Description"
 msgstr "ÃèÊö"
 
-#: src/dialogs.c:2303
+#: src/dialogs.c:2317
 msgid "GAIM - Add URL"
 msgstr "GAIM - Ôö¼Ó URL"
 
-#: src/dialogs.c:2446 src/dialogs.c:2459 src/dialogs.c:2496
+#: src/dialogs.c:2460 src/dialogs.c:2473 src/dialogs.c:2510
 msgid "Select Text Color"
 msgstr "É趨ÎÄ×ÖÑÕÉ«"
 
-#: src/dialogs.c:2483
+#: src/dialogs.c:2497
 #, fuzzy
 msgid "Select Background Color"
 msgstr "É趨ÎÄ×ÖÑÕÉ«"
 
-#: src/dialogs.c:2708 src/rvous.c:220
+#: src/dialogs.c:2722 src/rvous.c:220
 #, c-format
 msgid "Error writing file %s"
 msgstr "дÈëÎļþ %s ·¢Éú´íÎó"
 
-#: src/dialogs.c:2725
+#: src/dialogs.c:2739
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - µ¼³öÅóÓÑÁбí"
 
-#: src/dialogs.c:2778 src/rvous.c:491
+#: src/dialogs.c:2792 src/rvous.c:491
 #, c-format
 msgid "Error reading file %s"
 msgstr "¶ÁÈ¡Îļþ %s ·¢Éú´íÎó"
 
-#: src/dialogs.c:2857
+#: src/dialogs.c:2871
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - µ¼ÈëÅóÓÑÁбí"
 
-#: src/dialogs.c:2938
+#: src/dialogs.c:2952
 msgid "Gaim - New away message"
 msgstr "Gaim - ¸üÐÂÔÝʱÀ뿪ÐÅÏ¢"
 
 #. Set up our frame
-#: src/dialogs.c:2944
+#: src/dialogs.c:2959
 #, fuzzy
 msgid "New away message"
 msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
 
 #. Make a label for away entry
-#: src/dialogs.c:2954
+#: src/dialogs.c:2969
 msgid "Away title: "
 msgstr "ÔÝʱÀ뿪±êÌ⣺"
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3004
+#: src/dialogs.c:3019
 #, fuzzy
 msgid "Make Away Now"
 msgstr "Á¢¼´É趨ΪÔÝʱÀ뿪"
 
 #. show everything
-#: src/dialogs.c:3180
+#: src/dialogs.c:3196
 #, fuzzy
 msgid "Smile!"
 msgstr "Îļþ"
 
-#: src/dialogs.c:3246
+#: src/dialogs.c:3263
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:3284
+#: src/dialogs.c:3301
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Ôö¼ÓÅóÓÑ"
@@ -1020,19 +1022,19 @@
 msgid "About..."
 msgstr "¹ØÓÚ¡­¡­"
 
-#: src/gtkhtml.c:1382
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "³¬Îı¾Á¬½Ó£º"
 
-#: src/gtkhtml.c:1791
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "ÔÚÒÑÓеĴ°¿ÚÄÚ´ò¿ª URL"
 
-#: src/gtkhtml.c:1800
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "н¨´°¿Ú´ò¿ª URL"
 
-#: src/gtkhtml.c:1808
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "°Ñ URL ¼ÓÈëÊéÇ©"
 
@@ -1058,71 +1060,71 @@
 msgid "Receieved: '%s'\n"
 msgstr "ÊÕµ½ÁË£º¡°%s¡±\n"
 
-#: src/oscar.c:154 src/oscar.c:181
+#: src/oscar.c:157 src/oscar.c:184
 msgid "Disconnected."
 msgstr "ÒѶϿª¡£"
 
-#: src/oscar.c:162
+#: src/oscar.c:165
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "Á¬½Ó´íÎó£¡\n"
 
-#: src/oscar.c:179
+#: src/oscar.c:182
 #, fuzzy
 msgid "major connection error\n"
 msgstr "Á¬½Ó´íÎó£¡\n"
 
-#: src/oscar.c:193
+#: src/oscar.c:196
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:194
+#: src/oscar.c:197
 #, fuzzy
 msgid "Chat Error!"
 msgstr "´íÎó"
 
-#: src/oscar.c:217
+#: src/oscar.c:220
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Á¬½Óµ½£º %s\n"
 
-#: src/oscar.c:227
+#: src/oscar.c:230
 #, c-format
 msgid "Looking up %s"
 msgstr "Ñ°ÕÒ %s"
 
-#: src/oscar.c:232
+#: src/oscar.c:235
 msgid "internal connection error\n"
 msgstr "ÄÚ²¿Á¬½Ó´íÎó\n"
 
-#: src/oscar.c:237
+#: src/oscar.c:240
 msgid "Unable to login to AIM"
 msgstr "²»ÄܵǼµ½ AIM"
 
-#: src/oscar.c:245
+#: src/oscar.c:248
 msgid "couldn't resolve host\n"
 msgstr "²»ÄܽâÎöÖ÷»ú\n"
 
-#: src/oscar.c:249
+#: src/oscar.c:252
 msgid "couldn't connect to host\n"
 msgstr "²»ÄÜÁ¬½Óµ½Ö÷»ú\n"
 
-#: src/oscar.c:255
+#: src/oscar.c:258
 #, c-format
 msgid "Signon: %s"
 msgstr "µÇ¼£º %s"
 
-#: src/oscar.c:280
+#: src/oscar.c:283
 msgid "Password sent, waiting for response\n"
 msgstr "ÃÜÂëÒÑËͳö£¬µÈºò»ØÓ¦\n"
 
-#: src/oscar.c:296
+#: src/oscar.c:299
 msgid "Signed off.\n"
 msgstr "µÇ³ö¡£\n"
 
 #. connecting too frequently
-#: src/oscar.c:310
+#: src/oscar.c:313
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1130,79 +1132,79 @@
 msgstr ""
 "ÄãÁ¬½Ó£¬¶Ï¿ªµÄƵÂÊÌ«¸ßÁË£¬µÈÊ®·ÖÖÓÔÙÊÔ¡£Èç¹ûÄã·ÇÒª½Ó×ÅÊÔ£¬µÈµÄʱ¼ä»á¸ü³¤¡£"
 
-#: src/oscar.c:310 src/oscar.c:315 src/oscar.c:320 src/oscar.c:753
-#: src/oscar.c:758 src/oscar.c:780 src/oscar.c:799 src/oscar.c:823
+#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:757
+#: src/oscar.c:762 src/oscar.c:784 src/oscar.c:803 src/oscar.c:827
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - ´íÎó %d"
 
 #. client too old
-#: src/oscar.c:320
+#: src/oscar.c:323
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:335
+#: src/oscar.c:338
 msgid "Authentication Failed"
 msgstr "Ñé֤ʧ°Ü"
 
-#: src/oscar.c:355
+#: src/oscar.c:358
 msgid "Internal Error"
 msgstr "ÄÚ²¿´íÎó"
 
-#: src/oscar.c:363
+#: src/oscar.c:366
 msgid "Could Not Connect"
 msgstr "ÎÞ·¨Á¬½Ó"
 
-#: src/oscar.c:394
+#: src/oscar.c:397
 msgid "Connection established, cookie sent"
 msgstr "Á¬½Ó³É¹¦£¬Ëͳö±ý¸É¡£¡£°¡£¡±ý¸É£¿£¡"
 
-#: src/oscar.c:625
+#: src/oscar.c:628
 msgid "Accept Direct IM?"
 msgstr ""
 
-#: src/oscar.c:634
+#: src/oscar.c:638
 #, c-format
 msgid "%s has requested to directly connect to your computer. Do you accept?"
 msgstr ""
 
-#: src/oscar.c:644 src/rvous.c:634
+#: src/oscar.c:648 src/rvous.c:635
 msgid "Accept"
 msgstr "½ÓÊÜ"
 
 #. message too large
-#: src/oscar.c:752
+#: src/oscar.c:756
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
 
-#: src/oscar.c:757
+#: src/oscar.c:761
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:778
+#: src/oscar.c:782
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:779 src/oscar.c:798
+#: src/oscar.c:783 src/oscar.c:802
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:797
+#: src/oscar.c:801
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:822
+#: src/oscar.c:826
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:828
+#: src/oscar.c:832
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1214,11 +1216,11 @@
 "<BR>Á¬Ïßʱ¿Ì£º <B>%s</B><BR>¿Õתʱ¼ä£¨·ÖÖÓ£©£º <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/oscar.c:861
+#: src/oscar.c:865
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:862
+#: src/oscar.c:866
 msgid "AOL error"
 msgstr ""
 
@@ -1235,161 +1237,190 @@
 msgid "Plugin Error"
 msgstr "²å¼þ´íÎó"
 
-#: src/plugins.c:268
+#: src/plugins.c:269
 msgid "Gaim - Plugins"
 msgstr "Gaim - ²å¼þ"
 
-#: src/plugins.c:297
+#: src/plugins.c:298
 msgid "Load Plugin"
 msgstr "ÔØÈë²å¼þ"
 
-#: src/plugins.c:304
+#: src/plugins.c:305
 msgid "Configure Plugin"
 msgstr "É趨²å¼þ"
 
-#: src/plugins.c:310
+#: src/plugins.c:311
 msgid "Unload Plugin"
 msgstr "жÔزå¼þ"
 
-#: src/prefs.c:89
+#: src/prefs.c:90
 #, fuzzy
 msgid "General Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:96 src/prefs.c:209 src/prefs.c:335 src/prefs.c:534
-#: src/prefs.c:621 src/prefs.c:672 src/prefs.c:702 src/prefs.c:1081
-#: src/prefs.c:1166 src/prefs.c:1197 src/prefs.c:1484
+#: src/prefs.c:97 src/prefs.c:349 src/prefs.c:375 src/prefs.c:575
+#: src/prefs.c:662 src/prefs.c:771 src/prefs.c:856 src/prefs.c:1249
+#: src/prefs.c:1334 src/prefs.c:1365 src/prefs.c:1652
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:100
+#: src/prefs.c:101
 #, fuzzy
 msgid "Remember password"
 msgstr "¼ÇסÃÜÂë"
 
-#: src/prefs.c:102
+#: src/prefs.c:103
 msgid "Auto-login"
 msgstr "×Ô¶¯µÇ¼"
 
-#: src/prefs.c:108
+#: src/prefs.c:109
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:109
+#: src/prefs.c:110
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:112
+#: src/prefs.c:113
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:120
+#: src/prefs.c:121
 #, fuzzy
 msgid "Report Idle Times"
 msgstr "ÏÔʾ¿Õתʱ¼ä"
 
-#: src/prefs.c:201
+#: src/prefs.c:198 src/prefs.c:230 src/prefs.c:1974
 #, fuzzy
-msgid "Connection Options"
-msgstr "Á¬½Ó"
+msgid "TOC Options"
+msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:213
-msgid "Use Oscar Protocol (experimental; only takes effect before signon)"
+#: src/prefs.c:206
+msgid ""
+"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
+"other is TOC.\n"
+"\n"
+"TOC is a published protocol; AOL allows people to use the TOC protocol in "
+"their clients to connect. It is a simplified version of Oscar; it is capable "
+"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
+"is published, using TOC in gaim tends to be more stable and reliable.\n"
+"\n"
+"Oscar is a proprietary protocol. AOL has not published any information about "
+"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
+"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
+"or implemented all of the functions of Oscar, it is still able to perform "
+"most functions TOC provides as well as several others. However, using Oscar "
+"in gaim tends to be less reliable, though more usable.\n"
+"\n"
+"Changing this option takes effect at signon time."
 msgstr ""
 
-#: src/prefs.c:219
-msgid "The following options do not apply if you use Oscar."
+#: src/prefs.c:212
+msgid "Use Oscar Protocol"
 msgstr ""
 
-#: src/prefs.c:227
+#: src/prefs.c:242
 msgid "TOC Host:"
 msgstr "TOC Ö÷»ú£º"
 
-#: src/prefs.c:237 src/prefs.c:262 src/prefs.c:296
+#: src/prefs.c:252 src/prefs.c:277 src/prefs.c:311
 msgid "Port:"
 msgstr "¶Ë¿Ú£º"
 
-#: src/prefs.c:252
+#: src/prefs.c:267
 msgid "Login Host:"
 msgstr "µÇÈëÖ÷»ú£º"
 
-#: src/prefs.c:273
+#: src/prefs.c:288
 msgid "No Proxy"
 msgstr "ûÓдúÀí"
 
-#: src/prefs.c:274
+#: src/prefs.c:289
 msgid "HTTP Proxy"
 msgstr "HTTP ´úÀí"
 
-#: src/prefs.c:275
+#: src/prefs.c:290
 #, fuzzy
 msgid "Socks 4 Proxy"
 msgstr "ûÓдúÀí"
 
-#: src/prefs.c:276
+#: src/prefs.c:291
 #, fuzzy
 msgid "Socks 5 Proxy"
 msgstr "ûÓдúÀí"
 
-#: src/prefs.c:282
+#: src/prefs.c:297
 msgid "Proxy Host:"
 msgstr "´úÀíÖ÷»ú£º"
 
-#: src/prefs.c:328
+#: src/prefs.c:342 src/prefs.c:1979
+#, fuzzy
+msgid "Oscar Options"
+msgstr "Ñ¡Ïî"
+
+#: src/prefs.c:353
+msgid "Send Keep-Alive Packet (6 bytes/minute)"
+msgstr ""
+
+#: src/prefs.c:368
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "ÅóÓÑÁбí"
 
-#: src/prefs.c:339
+#: src/prefs.c:379
 msgid "Show numbers in groups"
 msgstr "ÔÚ×éÀïÏÔʾºÅÂë"
 
-#: src/prefs.c:340
+#: src/prefs.c:380
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:381
 msgid "Show idle times"
 msgstr "ÏÔʾ¿Õתʱ¼ä"
 
-#: src/prefs.c:341
+#: src/prefs.c:382
 #, fuzzy
 msgid "Show buddy type icons"
 msgstr "ÏÔʾÅóÓÑÀà±ðͼÐÎ"
 
-#: src/prefs.c:347
+#: src/prefs.c:388
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
-#: src/prefs.c:348
+#: src/prefs.c:389
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:354
+#: src/prefs.c:395
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "±£´æijЩ´°¿Ú´óСºÍλÖÃ"
 
-#: src/prefs.c:356
+#: src/prefs.c:397
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "×Ô¶¯ÏÔʾÅóÓÑÁбí"
 
-#: src/prefs.c:506
+#: src/prefs.c:547
 msgid "Please sign on before editing the permit/deny lists."
 msgstr ""
 
-#: src/prefs.c:507
+#: src/prefs.c:548
 msgid "Please sign on"
 msgstr ""
 
-#: src/prefs.c:527
+#: src/prefs.c:568
 msgid "Permit/Deny List Options"
 msgstr ""
 
-#: src/prefs.c:542
+#: src/prefs.c:583
 msgid ""
 "The permit/deny configuration will change between users,\n"
 "and changes while you are signed off will not be saved."
 msgstr ""
 
-#: src/prefs.c:555
+#: src/prefs.c:596
 #, fuzzy
 msgid "Allow Anyone"
 msgstr "ÈκÎÈ˶¼¿ÉÒÔ"
@@ -1397,321 +1428,334 @@
 #. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
 #. * and merging the two would be very difficult at best, most likely
 #. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:560
+#: src/prefs.c:601
 msgid "Allow only users on Buddy List"
 msgstr ""
 
-#: src/prefs.c:562
+#: src/prefs.c:603
 msgid "Allow only the users in \"Permit\""
 msgstr ""
 
-#: src/prefs.c:568
+#: src/prefs.c:609
 msgid "Block all users"
 msgstr ""
 
-#: src/prefs.c:569
+#: src/prefs.c:610
 msgid "Block the users in \"Deny\""
 msgstr ""
 
-#: src/prefs.c:614
+#: src/prefs.c:655
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:625
+#: src/prefs.c:666
 msgid "Enter sends message"
 msgstr "ÊäÈë·¢ËÍÐÅÏ¢"
 
-#: src/prefs.c:626
+#: src/prefs.c:667
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:627
+#: src/prefs.c:668
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:633
+#: src/prefs.c:674
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "ÏÔʾͼÐÎЦÁ³ £¨ÊÔÑé½×¶Î£©"
 
-#: src/prefs.c:634
+#: src/prefs.c:675
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "ÔÚÐÅÏ¢ÀïÏÔʾʱ¼ä"
 
-#: src/prefs.c:635
+#: src/prefs.c:676
 #, fuzzy
 msgid "Ignore incoming colors"
 msgstr "²»Àí½øÀ´µÄÑÕÉ«"
 
-#: src/prefs.c:636
+#: src/prefs.c:677
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:642
+#: src/prefs.c:683
 #, fuzzy
 msgid "Log all conversations"
 msgstr "¼Ç¼ËùÓжԻ°ÄÚÈÝ"
 
-#: src/prefs.c:643
+#: src/prefs.c:684
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "Çå³ý¼Ç¼ÎļþÄÚµÄ HTML ±ê¼Ç"
 
-#: src/prefs.c:649
+#: src/prefs.c:690
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "×Ô¶¯Í»³öÆ´´íµÄµ¥´Ê"
 
-#: src/prefs.c:650
+#: src/prefs.c:691
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "°Ñ URL ÒÔÁ¬½Ó·½Ê½Ëͳö"
 
-#: src/prefs.c:651
+#: src/prefs.c:692
 msgid "Sending messages removes away status"
 msgstr "·¢³öÐÅϢʱ×Ô¶¯È¡ÏûÔÝʱÀ뿪״̬"
 
-#: src/prefs.c:665
+#: src/prefs.c:733 src/prefs.c:818
+msgid "Pictures and Text"
+msgstr ""
+
+#: src/prefs.c:738 src/prefs.c:823
+msgid "Pictures Only"
+msgstr ""
+
+#: src/prefs.c:743 src/prefs.c:828
+#, fuzzy
+msgid "Text Only"
+msgstr "ÎÄ×ÖÑÕÉ«"
+
+#: src/prefs.c:764
 #, fuzzy
 msgid "IM Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:676
+#: src/prefs.c:775
 #, fuzzy
 msgid "Show logins in window"
 msgstr "ÔÚ½»Ì¸´°¿ÚÏÔʾµÇ¼£¯µÇ³öÐÅÏ¢"
 
-#: src/prefs.c:677 src/prefs.c:707
+#: src/prefs.c:781 src/prefs.c:866
 #, fuzzy
-msgid "Show buttons with text"
+msgid "Show buttons as "
 msgstr "ÏÔʾͼÐΰ´Å¥"
 
-#: src/prefs.c:678 src/prefs.c:708
+#: src/prefs.c:790 src/prefs.c:876
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:679 src/prefs.c:709
+#: src/prefs.c:791 src/prefs.c:877
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "ÊÕµ½ÐÅϢʱÉýÆð´°¿Ú"
 
-#: src/prefs.c:680 src/prefs.c:1404
+#: src/prefs.c:792 src/prefs.c:1572
 msgid "Ignore new conversations when away"
 msgstr "ÔÝʱÀ뿪ʱ£¬ºöÂÔеĶԻ°"
 
-#: src/prefs.c:681
+#: src/prefs.c:793
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "´´×÷ÐÅÏ¢"
 
-#: src/prefs.c:695 src/prefs.c:883
+#: src/prefs.c:849 src/prefs.c:1051
 #, fuzzy
 msgid "Chat Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:706
+#: src/prefs.c:860
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:740 src/prefs.c:742 src/prefs.c:954 src/prefs.c:956
+#: src/prefs.c:908 src/prefs.c:910 src/prefs.c:1122 src/prefs.c:1124
 msgid "Gaim Chat"
 msgstr "Gaim ÁÄÌì"
 
-#: src/prefs.c:900
+#: src/prefs.c:1068
 msgid "Refresh"
 msgstr "Ë¢ÐÂ"
 
-#: src/prefs.c:928
+#: src/prefs.c:1096
 msgid "List of available chats"
 msgstr "ÏÖÓÐÁÄÌìÁбí"
 
-#: src/prefs.c:942
+#: src/prefs.c:1110
 msgid "List of subscribed chats"
 msgstr "¶©ÔĵÄÁÄÌìÁбí"
 
-#: src/prefs.c:1074 src/prefs.c:1831
+#: src/prefs.c:1242 src/prefs.c:2027
 #, fuzzy
 msgid "Font Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:1087
+#: src/prefs.c:1255
 msgid "Underlined Text"
 msgstr "ϼÓÏßÎÄ×Ö"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1256
 msgid "Strike Text"
 msgstr "»®µôµÄÎÄ×Ö"
 
-#: src/prefs.c:1101 src/prefs.c:1118 src/prefs.c:1138
+#: src/prefs.c:1269 src/prefs.c:1286 src/prefs.c:1306
 #, fuzzy
 msgid "Select"
 msgstr "Ñ¡Ôñ×ÖÐÍ"
 
-#: src/prefs.c:1136
+#: src/prefs.c:1304
 msgid "Font Face for Text"
 msgstr "ÎÄ×ÖµÄ×ÖÐÍ"
 
-#: src/prefs.c:1159
+#: src/prefs.c:1327
 #, fuzzy
 msgid "Sound Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:1171
+#: src/prefs.c:1339
 msgid "Sounds go through GNOME"
 msgstr "ÉùÒôͨ¹ý GNOME"
 
-#: src/prefs.c:1173
+#: src/prefs.c:1341
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "ÅóÓѵǼÉù"
 
-#: src/prefs.c:1174 src/prefs.c:1405
+#: src/prefs.c:1342 src/prefs.c:1573
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1175
+#: src/prefs.c:1343
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1190
+#: src/prefs.c:1358
 #, fuzzy
 msgid "Sound Events"
 msgstr "ÉùÒô"
 
-#: src/prefs.c:1201
+#: src/prefs.c:1369
 msgid "Sound when buddy logs in"
 msgstr "ÅóÓѵǼÉù"
 
-#: src/prefs.c:1202
+#: src/prefs.c:1370
 msgid "Sound when buddy logs out"
 msgstr "ÅóÓѵdzöÉù"
 
-#: src/prefs.c:1208
+#: src/prefs.c:1376
 msgid "Sound when message is received"
 msgstr "ÊÕµ½ÐÅÏ¢Éù"
 
-#: src/prefs.c:1209
+#: src/prefs.c:1377
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "ÊÕµ½ÐÅÏ¢Éù"
 
-#: src/prefs.c:1210
+#: src/prefs.c:1378
 msgid "Sound when message is sent"
 msgstr "·¢³öÐÅÏ¢Éù"
 
-#: src/prefs.c:1216
+#: src/prefs.c:1384
 #, fuzzy
 msgid "Sound in chat rooms when people enter/leave"
 msgstr "ÁÄÌìÊÒÀÅóÓѽøÈ룯À뿪Éù"
 
-#: src/prefs.c:1217
+#: src/prefs.c:1385
 #, fuzzy
 msgid "Sound in chat rooms when people talk"
 msgstr "ÁÄÌìÊÒÓÐÈË˵»°Éù"
 
-#: src/prefs.c:1302 src/prefs.c:1858
+#: src/prefs.c:1470 src/prefs.c:2054
 #, fuzzy
 msgid "Away Messages"
 msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
 
-#: src/prefs.c:1318
+#: src/prefs.c:1486
 #, fuzzy
 msgid "Title"
 msgstr "Îļþ"
 
-#: src/prefs.c:1322
+#: src/prefs.c:1490
 #, fuzzy
 msgid "Message"
 msgstr "´´×÷ÐÅÏ¢"
 
-#: src/prefs.c:1362
+#: src/prefs.c:1530
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1366
+#: src/prefs.c:1534
 #, fuzzy
 msgid "Make Away"
 msgstr "Á¢¼´É趨ΪÔÝʱÀ뿪"
 
-#: src/prefs.c:1477
+#: src/prefs.c:1645
 #, fuzzy
 msgid "Browser Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:1488
+#: src/prefs.c:1656
 msgid "Netscape"
 msgstr ""
 
-#: src/prefs.c:1489
+#: src/prefs.c:1657
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1491
+#: src/prefs.c:1659
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1493
+#: src/prefs.c:1661
 #, fuzzy
 msgid "Internal HTML Widget (Quite likely a bad idea!)"
 msgstr "ÄÚ²¿³¬Îı¾Îļþ¿Ø¼þ £¨×îºÃ±ðÓã¡£©"
 
-#: src/prefs.c:1494
+#: src/prefs.c:1662
 msgid "Manual"
 msgstr "Óû§ÊÖ²á"
 
-#: src/prefs.c:1503
+#: src/prefs.c:1671
 msgid "Pop up new window by default"
 msgstr "ȱʡµ¯³öд°¿Ú"
 
-#: src/prefs.c:1547
+#: src/prefs.c:1716
 msgid "Gaim - Preferences"
 msgstr "Gaim - ÓÅÏÈÉ趨"
 
-#: src/prefs.c:1630
+#: src/prefs.c:1801
 msgid "GAIM debug output window"
 msgstr "GAIM ³ý³æÊä³ö´°¿Ú"
 
-#: src/prefs.c:1772
+#: src/prefs.c:1956
 msgid "General"
 msgstr "Ò»°ãÉ趨"
 
-#: src/prefs.c:1783
+#: src/prefs.c:1969
 msgid "Connection"
 msgstr "Á¬½Ó"
 
 #. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:1800
+#: src/prefs.c:1996
 #, fuzzy
 msgid "Permit/Deny"
 msgstr "Ö»ÔÊÐíijЩÈË"
 
-#: src/prefs.c:1811
+#: src/prefs.c:2007
 #, fuzzy
 msgid "Conversations"
 msgstr "¼Ç¼ËùÓжԻ°ÄÚÈÝ"
 
-#: src/prefs.c:1816
+#: src/prefs.c:2012
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:1821
+#: src/prefs.c:2017
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:1826
+#: src/prefs.c:2022
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:1842
+#: src/prefs.c:2038
 msgid "Sounds"
 msgstr "ÉùÒô"
 
-#: src/prefs.c:1847
+#: src/prefs.c:2043
 msgid "Events"
 msgstr ""
 
-#: src/prefs.c:1869
+#: src/prefs.c:2065
 msgid "Browser"
 msgstr "ä¯ÀÀÆ÷"
 
@@ -1733,20 +1777,24 @@
 msgid "Sending %s to %s"
 msgstr "ËÍ %s ¸ø %s"
 
-#: src/rvous.c:661
+#: src/rvous.c:662
 #, c-format
 msgid "%s requests you to accept the file: %s (%d bytes)"
 msgstr "%s ÇëÇóÄã½ÓÊÜÎļþ£º %s (%d ×ÖÔª )"
 
-#: src/rvous.c:664
+#: src/rvous.c:665
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ÇëÇóÄã¸øËûÃÇ·¢ËÍÒ»¸öÎļþ"
 
-#: src/rvous.c:674
+#: src/rvous.c:675
 msgid "Gaim - File Transfer?"
 msgstr "Gaim - ´«ËÍÎļþ£¿"
 
+#, fuzzy
+#~ msgid "Connection Options"
+#~ msgstr "Á¬½Ó"
+
 #~ msgid "Permit some"
 #~ msgstr "Ö»ÔÊÐíijЩÈË"