changeset 429:ccf7fc40263f

[gaim-migrate @ 439] Sometimes I Smoke too much crack rock. committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Fri, 23 Jun 2000 19:13:04 +0000
parents debb1c32def3
children 0cd2ba801eb4
files plugins/Makefile.am po/de.po po/es.po po/fr.po po/ko.po po/zh_CN.po
diffstat 6 files changed, 1377 insertions(+), 1315 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/Makefile.am	Fri Jun 23 19:05:11 2000 +0000
+++ b/plugins/Makefile.am	Fri Jun 23 19:13:04 2000 +0000
@@ -14,7 +14,7 @@
 
 
 if PLUGINS
-plugin_DATA = gtik.so autorecon.so iconaway.so notify.so spellchk.so
+plugin_DATA = autorecon.so iconaway.so notify.so spellchk.so
 plugindir = $(libdir)/gaim
 
 clean distclean clean-recursive distclean-recursive:
--- a/po/de.po	Fri Jun 23 19:05:11 2000 +0000
+++ b/po/de.po	Fri Jun 23 19:13:04 2000 +0000
@@ -2,11 +2,12 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/gnome_applet_mgr.c:353
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2000-06-07 17:19-0700\n"
+"POT-Creation-Date: 2000-06-23 10:39-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"
@@ -20,64 +21,64 @@
 msgstr "Über GAIM v%s"
 
 #. color = gtk_button_new_with_label("Color");
-#: src/about.c:93 src/buddy.c:1728 src/buddy_chat.c:556
-#: src/conversation.c:1099 src/dialogs.c:435 src/plugins.c:259 src/prefs.c:804
+#: src/about.c:93 src/buddy.c:1764 src/buddy_chat.c:711
+#: src/conversation.c:1107 src/dialogs.c:434 src/plugins.c:307 src/prefs.c:807
 msgid "Close"
 msgstr "Schließen"
 
-#: src/aim.c:137
+#: src/aim.c:175
 msgid "Please enter your logon"
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:141
+#: src/aim.c:179
 msgid "You must give your password"
 msgstr "Bitte geben Sie ein Passwort ein"
 
-#: src/aim.c:191 src/buddy.c:1723
+#: src/aim.c:230 src/buddy.c:1759
 msgid "Signoff"
 msgstr "Abmelden"
 
-#: src/aim.c:301 src/aim.c:503 src/buddy.c:366 src/gnome_applet_mgr.c:348
+#: src/aim.c:340 src/aim.c:546 src/buddy.c:369 src/gnome_applet_mgr.c:373
 msgid "Signon"
 msgstr "Los"
 
-#: src/aim.c:302 src/buddy_chat.c:101 src/buddy_chat.c:176 src/dialogs.c:371
-#: src/dialogs.c:627 src/dialogs.c:743 src/dialogs.c:853 src/dialogs.c:982
-#: src/dialogs.c:1113 src/dialogs.c:1184 src/dialogs.c:1272 src/dialogs.c:1464
-#: src/dialogs.c:1649 src/dialogs.c:1747 src/dialogs.c:1836 src/rvous.c:280
-#: src/rvous.c:415 src/rvous.c:636
+#: src/aim.c:341 src/buddy_chat.c:103 src/buddy_chat.c:178 src/dialogs.c:370
+#: src/dialogs.c:645 src/dialogs.c:761 src/dialogs.c:871 src/dialogs.c:1000
+#: src/dialogs.c:1130 src/dialogs.c:1201 src/dialogs.c:1289 src/dialogs.c:1478
+#: src/dialogs.c:1663 src/dialogs.c:1761 src/dialogs.c:1850 src/rvous.c:279
+#: src/rvous.c:414 src/rvous.c:633
 msgid "Cancel"
 msgstr "Ende"
 
-#: src/aim.c:303 src/buddy.c:1720
+#: src/aim.c:342 src/buddy.c:1756
 msgid "Register"
 msgstr "Neu"
 
-#: src/aim.c:304
+#: src/aim.c:343
 msgid "Options"
 msgstr "Einstellungen"
 
-#: src/aim.c:306 src/aim.c:509 src/buddy.c:1785
+#: src/aim.c:345 src/aim.c:552 src/buddy.c:1821
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:369
+#: src/aim.c:408
 msgid "Screen Name: "
 msgstr "Benutzername: "
 
-#: src/aim.c:372
+#: src/aim.c:411
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/aim.c:375
+#: src/aim.c:414
 msgid "Remember Password"
 msgstr "Passwort Speichern"
 
-#: src/aim.c:422
+#: src/aim.c:461
 msgid "Gaim - Login"
 msgstr "Gaim - Anmeldung"
 
-#: src/aim.c:498 src/buddy.c:1782
+#: src/aim.c:541 src/buddy.c:1818
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -93,7 +94,7 @@
 msgid "Gaim - Away!"
 msgstr "Gaim - Abwesenheit!"
 
-#: src/away.c:264 src/gnome_applet_mgr.c:262
+#: src/away.c:264 src/gnome_applet_mgr.c:287
 msgid "New Away Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
@@ -101,75 +102,75 @@
 msgid "Remove Away Message"
 msgstr "Abwesenheits-Mitteilung löschen"
 
-#: src/buddy.c:143
+#: src/buddy.c:146
 #, c-format
 msgid "%d/%d Buddies Online"
 msgstr "%d/%d Buddies Online"
 
-#: src/buddy.c:270 src/buddy.c:275 src/buddy.c:278 src/buddy.c:283
-#: src/buddy.c:1882 src/buddy.c:1951 src/conversation.c:368
-#: src/conversation.c:1104 src/dialogs.c:744 src/dialogs.c:1465
-#: src/dialogs.c:1489 src/prefs.c:994
+#: src/buddy.c:273 src/buddy.c:278 src/buddy.c:281 src/buddy.c:286
+#: src/buddy.c:1918 src/buddy.c:1987 src/conversation.c:368
+#: src/conversation.c:1112 src/dialogs.c:762 src/dialogs.c:1479
+#: src/dialogs.c:1503 src/prefs.c:997
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/buddy.c:271 src/buddy.c:276 src/buddy.c:279 src/buddy.c:284
-#: src/buddy.c:1883 src/buddy.c:1952 src/conversation.c:1101 src/dialogs.c:691
-#: src/prefs.c:995
+#: src/buddy.c:274 src/buddy.c:279 src/buddy.c:282 src/buddy.c:287
+#: src/buddy.c:1919 src/buddy.c:1988 src/conversation.c:1109 src/dialogs.c:709
+#: src/prefs.c:998
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/buddy.c:272 src/buddy.c:280 src/buddy.c:1831
+#: src/buddy.c:275 src/buddy.c:283 src/buddy.c:1867
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:273 src/buddy.c:281 src/buddy.c:434 src/buddy.c:1829
-#: src/buddy_chat.c:561
+#: src/buddy.c:276 src/buddy.c:284 src/buddy.c:437 src/buddy.c:1865
+#: src/buddy_chat.c:716
 msgid "IM"
 msgstr "Telegramm"
 
-#: src/buddy.c:274 src/buddy.c:282 src/buddy.c:440 src/buddy.c:1830
-#: src/buddy_chat.c:563 src/conversation.c:1096 src/rvous.c:634
+#: src/buddy.c:277 src/buddy.c:285 src/buddy.c:443 src/buddy.c:1866
+#: src/buddy_chat.c:718 src/conversation.c:1104 src/rvous.c:631
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:446
+#: src/buddy.c:449
 msgid "Dir Info"
 msgstr "Profil"
 
-#: src/buddy.c:453
+#: src/buddy.c:456
 msgid "Away Msg"
 msgstr "Abwesenht."
 
-#: src/buddy.c:460
+#: src/buddy.c:463
 msgid "Toggle Logging"
 msgstr "Mitschnitt ein"
 
-#: src/buddy.c:466
+#: src/buddy.c:469
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alert Hinzufügen"
 
-#: src/buddy.c:569 src/buddy.c:1017 src/buddy.c:1987 src/dialogs.c:1480
+#: src/buddy.c:572 src/buddy.c:1020 src/buddy.c:2023 src/dialogs.c:1494
 msgid "Permit"
 msgstr "Zulassen"
 
-#: src/buddy.c:585 src/dialogs.c:1475
+#: src/buddy.c:588 src/dialogs.c:1489
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: src/buddy.c:1298
+#: src/buddy.c:1336
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alert"
 
-#: src/buddy.c:1316
+#: src/buddy.c:1354
 msgid "Remove Buddy Pounce"
 msgstr "Lösche Buddy-Alert"
 
-#: src/buddy.c:1425
+#: src/buddy.c:1463
 msgid "Warnings: %d%%\n"
 msgstr "Warnungen: %d%%\n"
 
-#: src/buddy.c:1430
+#: src/buddy.c:1468
 #, c-format
 msgid ""
 "Name: %s                \n"
@@ -180,257 +181,291 @@
 "Angemeldet seit: %s\n"
 "%s%s%s"
 
-
-
-#: src/buddy.c:1430
+#: src/buddy.c:1468
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-
-#: src/buddy.c:1478
+#: src/buddy.c:1516
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr ""
 
-#: src/buddy.c:1576
+#: src/buddy.c:1614
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr ""
 
-#: src/buddy.c:1709
+#: src/buddy.c:1745
 msgid "File"
 msgstr "Datei"
 
-#: src/buddy.c:1713
+#: src/buddy.c:1749
 msgid "Add A Buddy"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:1715
+#: src/buddy.c:1751
 msgid "Import Buddy List"
 msgstr "Buddy-Liste importieren"
 
-#: src/buddy.c:1716
+#: src/buddy.c:1752
 msgid "Export Buddy List"
 msgstr "Buddy-Liste exportieren"
 
-#: src/buddy.c:1726
+#: src/buddy.c:1762
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/buddy.c:1733
+#: src/buddy.c:1769
 msgid "Tools"
 msgstr "Tools"
 
-#: src/buddy.c:1738 src/gnome_applet_mgr.c:175 src/gnome_applet_mgr.c:259
-#: src/prefs.c:596
+#: src/buddy.c:1774 src/gnome_applet_mgr.c:199 src/gnome_applet_mgr.c:284
+#: src/prefs.c:597
 msgid "Away"
 msgstr "Abwesenheit"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1779
 msgid "Buddy Pounce"
 msgstr "Buddy-Alert"
 
-#: src/buddy.c:1751
+#: src/buddy.c:1787
 msgid "Search for Buddy"
 msgstr "Buddies suchen"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1790
 msgid "by Email"
 msgstr "nach Email"
 
-#: src/buddy.c:1758
+#: src/buddy.c:1794
 msgid "by Dir Info"
 msgstr "nach Profil"
 
-#: src/buddy.c:1765
+#: src/buddy.c:1801
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/buddy.c:1768
+#: src/buddy.c:1804
 msgid "User Info"
 msgstr "Benutzer-Info"
 
-#: src/buddy.c:1772
+#: src/buddy.c:1808
 msgid "Directory Info"
 msgstr "Profil"
 
-#: src/buddy.c:1776
+#: src/buddy.c:1812
 msgid "Change Password"
 msgstr ""
 
-#: src/buddy.c:1790
+#: src/buddy.c:1826
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/buddy.c:1795
+#: src/buddy.c:1831
 msgid "About"
 msgstr "Info Über"
 
-#: src/buddy.c:1843
+#: src/buddy.c:1879
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: src/buddy.c:1866
+#: src/buddy.c:1902
 msgid "Information on selected Buddy"
 msgstr "Info über gewählten Buddy"
 
-#: src/buddy.c:1867
+#: src/buddy.c:1903
 msgid "Send Instant Message"
 msgstr "Telegramm"
 
-#: src/buddy.c:1868
+#: src/buddy.c:1904
 msgid "Start/join a Buddy Chat"
 msgstr "Chat starten"
 
-#: src/buddy.c:1903
+#: src/buddy.c:1939
 msgid "Add a new Buddy"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:1904
+#: src/buddy.c:1940
 msgid "Remove selected Buddy"
 msgstr "Gewählten Buddy entfernen"
 
-#: src/buddy.c:1927
+#: src/buddy.c:1963
 msgid "Allow anyone"
 msgstr "Jeden zulassen"
 
-#: src/buddy.c:1934
+#: src/buddy.c:1970
 msgid "Permit some"
 msgstr "Bestimmte zulassen"
 
-#: src/buddy.c:1942
+#: src/buddy.c:1978
 msgid "Deny some"
 msgstr "Bestimmte sperren"
 
-#: src/buddy.c:1963
+#: src/buddy.c:1999
 msgid "Add buddy to permit/deny"
 msgstr "Buddy zu Sperren/Zulassen hinzufügen"
 
-#: src/buddy.c:1964
+#: src/buddy.c:2000
 msgid "Remove buddy from permit/deny"
 msgstr "Buddy aus Sperren/Zulassen löschen"
 
-#: src/buddy.c:1983
+#: src/buddy.c:2019
 msgid "Online"
 msgstr "Online"
 
-#: src/buddy.c:1985
+#: src/buddy.c:2021
 msgid "Edit Buddies"
 msgstr "Budies bearbeiten"
 
-#: src/buddy.c:2034
+#: src/buddy.c:2070
 msgid "Gaim - Buddy List"
 msgstr "gAIM - Buddy-Liste"
 
-#: src/buddy_chat.c:102
+#: src/buddy_chat.c:104
 msgid "Join"
 msgstr "Teilnehmen"
 
-#: src/buddy_chat.c:112
+#: src/buddy_chat.c:114
 msgid "Join what group:"
 msgstr "An wlecher Gruppe teinlnehmen:"
 
-#: src/buddy_chat.c:138
+#: src/buddy_chat.c:140
 msgid "Join Chat"
 msgstr ""
 
-#: src/buddy_chat.c:177 src/buddy_chat.c:557
+#: src/buddy_chat.c:179 src/buddy_chat.c:712
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/buddy_chat.c:188
+#: src/buddy_chat.c:190
 msgid "Invite who?"
 msgstr "Wen einladen"
 
-#: src/buddy_chat.c:192
+#: src/buddy_chat.c:194
 msgid "With message:"
 msgstr "Mit Nachricht:"
 
-#: src/buddy_chat.c:219
+#: src/buddy_chat.c:221
 msgid "Invite to Buddy Chat"
 msgstr "Zum Buddy-Chat einladen"
 
-#: src/buddy_chat.c:558
+#: src/buddy_chat.c:713
 msgid "Whisper"
 msgstr "Flüstern"
 
-#: src/buddy_chat.c:559 src/conversation.c:1095 src/dialogs.c:1273
+#: src/buddy_chat.c:714 src/conversation.c:1103 src/dialogs.c:1290
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:562
+#: src/buddy_chat.c:717
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: src/buddy_chat.c:627 src/conversation.c:1180
+#: src/buddy_chat.c:803 src/conversation.c:1188
 msgid "Bold"
 msgstr "Fetter"
 
-#: src/buddy_chat.c:627 src/conversation.c:1180 src/prefs.c:773
+#: src/buddy_chat.c:803 src/conversation.c:1188 src/prefs.c:776
 msgid "Bold Text"
 msgstr "Fetter Text"
 
-#: src/buddy_chat.c:631 src/buddy_chat.c:632 src/conversation.c:1184
-#: src/conversation.c:1185
+#: src/buddy_chat.c:807 src/buddy_chat.c:808 src/conversation.c:1192
+#: src/conversation.c:1193
 msgid "Italics"
 msgstr "Kursiver"
 
-#: src/buddy_chat.c:631 src/conversation.c:1184 src/prefs.c:774
+#: src/buddy_chat.c:807 src/conversation.c:1192 src/prefs.c:777
 msgid "Italics Text"
 msgstr "Kursiver Text"
 
-#: src/buddy_chat.c:635 src/buddy_chat.c:636 src/conversation.c:1188
-#: src/conversation.c:1189
+#: src/buddy_chat.c:811 src/buddy_chat.c:812 src/conversation.c:1196
+#: src/conversation.c:1197
 msgid "Underline"
 msgstr "Unterstrichener"
 
-#: src/buddy_chat.c:635 src/conversation.c:1188
+#: src/buddy_chat.c:811 src/conversation.c:1196
 msgid "Underline Text"
 msgstr "Unterstrichener Text"
 
-#: src/buddy_chat.c:639 src/buddy_chat.c:640 src/conversation.c:1192
-#: src/conversation.c:1193
+#: src/buddy_chat.c:815 src/buddy_chat.c:816 src/conversation.c:1200
+#: src/conversation.c:1201
 msgid "Strike"
 msgstr "Durchgestrichener through"
 
-#: src/buddy_chat.c:639 src/conversation.c:1192
+#: src/buddy_chat.c:815 src/conversation.c:1200
 msgid "Strike through Text"
 msgstr "Durchgestrichener through Text"
 
-#: src/buddy_chat.c:642 src/conversation.c:1195
+#: src/buddy_chat.c:818 src/conversation.c:1203
 msgid "Small"
 msgstr ""
 
-#: src/buddy_chat.c:642 src/conversation.c:1195
+#: src/buddy_chat.c:818 src/conversation.c:1203
 msgid "Decrease font size"
 msgstr "Schrift kleiner"
 
-#: src/buddy_chat.c:643 src/conversation.c:1196
+#: src/buddy_chat.c:819 src/conversation.c:1204
 msgid "Normal"
 msgstr "Normal"
 
-#: src/buddy_chat.c:643 src/conversation.c:1196
+#: src/buddy_chat.c:819 src/conversation.c:1204
 msgid "Normal font size"
 msgstr "Schrift normal"
 
-#: src/buddy_chat.c:644 src/conversation.c:1197
+#: src/buddy_chat.c:820 src/conversation.c:1205
 msgid "Big"
 msgstr "Groß"
 
-#: src/buddy_chat.c:644 src/conversation.c:1197
+#: src/buddy_chat.c:820 src/conversation.c:1205
 msgid "Increase font size"
 msgstr "Schrift größer"
 
-#: src/buddy_chat.c:648 src/buddy_chat.c:649 src/conversation.c:1208
+#: src/buddy_chat.c:823 src/buddy_chat.c:824 src/conversation.c:1208
 #: src/conversation.c:1209
+msgid "Font"
+msgstr "Schriftart"
+
+#: src/buddy_chat.c:823 src/conversation.c:1208 src/dialogs.c:2075
+#: src/dialogs.c:2094 src/prefs.c:782
+msgid "Select Font"
+msgstr "Schriftart wählen "
+
+#: src/buddy_chat.c:829 src/buddy_chat.c:830 src/conversation.c:1216
+#: src/conversation.c:1217
 msgid "Link"
 msgstr "Link"
 
-#: src/buddy_chat.c:648 src/conversation.c:1208
+#: src/buddy_chat.c:829 src/conversation.c:1216
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: src/buddy_chat.c:792 src/buddy_chat.c:804
+#: src/buddy_chat.c:833 src/buddy_chat.c:834 src/conversation.c:1220
+#: src/conversation.c:1221
+msgid "Color"
+msgstr "Farbe"
+
+#: src/buddy_chat.c:833 src/conversation.c:1220
+msgid "Text Color"
+msgstr "Text-Farbe"
+
+#: src/buddy_chat.c:838 src/buddy_chat.c:839 src/conversation.c:1224
+#: src/conversation.c:1225
+msgid "Logging"
+msgstr "Mitschnitt"
+
+#: src/buddy_chat.c:838 src/conversation.c:1224
+msgid "Enable logging"
+msgstr "Mitschnitt ein"
+
+#: src/buddy_chat.c:844 src/buddy_chat.c:845 src/conversation.c:1228
+#: src/conversation.c:1229
+msgid "Sound"
+msgstr "Klänge"
+
+#: src/buddy_chat.c:844 src/conversation.c:1228
+msgid "Enable sounds"
+msgstr "Klänge aktivieren"
+
+#: src/buddy_chat.c:996 src/buddy_chat.c:1008
 msgid "Buddy Chat"
 msgstr "Buddy-Chat"
 
@@ -439,194 +474,165 @@
 msgid "Removing '%s' from buddylist.\n"
 msgstr ""
 
-#: src/conversation.c:496
+#: src/conversation.c:500
 msgid "Message too long, some data truncated."
 msgstr "Nachricht zu lange. Sie wurde gekürzt."
 
-#: src/conversation.c:496 src/dialogs.c:2168 src/dialogs.c:2239
-#: src/rvous.c:222 src/rvous.c:491
+#: src/conversation.c:500 src/dialogs.c:2182 src/dialogs.c:2253
+#: src/rvous.c:221 src/rvous.c:488
 msgid "Error"
 msgstr "Fehler"
 
-#: src/conversation.c:670
+#: src/conversation.c:674
 #, c-format
 msgid "Currently at %d\n"
 msgstr ""
 
-#: src/conversation.c:677
+#: src/conversation.c:681
 #, c-format
 msgid "Setting position to %d\n"
 msgstr ""
 
-#: src/conversation.c:1097 src/dialogs.c:372 src/rvous.c:635
+#: src/conversation.c:1105 src/dialogs.c:371 src/rvous.c:632
 msgid "Warn"
 msgstr "Warnen"
 
-#: src/conversation.c:1106
+#: src/conversation.c:1114
 msgid "Block"
 msgstr "Sperren"
 
-#: src/conversation.c:1200 src/conversation.c:1201
-msgid "Font"
-msgstr "Schriftart"
-
-#: src/conversation.c:1200 src/dialogs.c:2061 src/dialogs.c:2080
-#: src/prefs.c:779
-msgid "Select Font"
-msgstr "Schriftart wählen "
-
-#: src/conversation.c:1212 src/conversation.c:1213
-msgid "Color"
-msgstr "Farbe"
-
-#: src/conversation.c:1212
-msgid "Text Color"
-msgstr "Text-Farbe"
-
-#: src/conversation.c:1216 src/conversation.c:1217
-msgid "Logging"
-msgstr "Mitschnitt"
-
-#: src/conversation.c:1216
-msgid "Enable logging"
-msgstr "Mitschnitt ein"
-
-#: src/conversation.c:1220 src/conversation.c:1221
-msgid "Sound"
-msgstr "Klänge"
-
-#: src/conversation.c:1220
-msgid "Enable sounds"
-msgstr "Klänge aktivieren"
-
-#: src/dialogs.c:197
+#: src/dialogs.c:195
 msgid "Error Resolving Mail Server.\n"
 msgstr "Konnte Mail-Server nicht finden.\n"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:201
 msgid "Error Connecting to Socket.\n"
 msgstr "Fehler beim Verbinden mit Socket.\n"
 
-#: src/dialogs.c:380
+#: src/dialogs.c:379
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Wollen Sie %s wirklich verwarnen?"
 
-#: src/dialogs.c:384
+#: src/dialogs.c:383
 msgid "Warn anonymously?"
 msgstr "Anonym warnen?"
 
-#: src/dialogs.c:387
+#: src/dialogs.c:386
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyme Warnungen sind weniger wirkungsvoll"
 
-#: src/dialogs.c:408
+#: src/dialogs.c:407
 msgid "Gaim - Warn user?"
 msgstr "gAIM - Benutzer warnen?"
 
-#: src/dialogs.c:464
+#: src/dialogs.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Konnte Datei %s nicht schrieben."
 
-#: src/dialogs.c:467
+#: src/dialogs.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Konnte Datei %s nicht lesen."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Nachricht zu lange, letzten %s Bytes abgeschnitten."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ist zur Zeit nicht online."
 
-#: src/dialogs.c:476
+#: src/dialogs.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Verwarnung von %s nicht erlaubt."
 
-#: src/dialogs.c:479
+#: src/dialogs.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Eine Nachricht ging verloren. Sie überschreiten die Geschwindigkeit des Servers."
+msgstr ""
+"Eine Nachricht ging verloren. Sie überschreiten die Geschwindigkeit des "
+"Servers."
 
-#: src/dialogs.c:482
+#: src/dialogs.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s ist nicht verfügbar."
 
-#: src/dialogs.c:485
+#: src/dialogs.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: src/dialogs.c:488
+#: src/dialogs.c:506
 #, 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:491
+#: src/dialogs.c:509
 #, 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."
+msgstr ""
+"Eine Nachricht von %s hat Sie nicht erreicht, da sie zu schnell gesendet "
+"wurde."
 
-#: src/dialogs.c:494
+#: src/dialogs.c:512
 msgid "Failure."
 msgstr "Fehler."
 
-#: src/dialogs.c:497
+#: src/dialogs.c:515
 msgid "Too many matches."
 msgstr "Zu viele Übereinstimmungen."
 
-#: src/dialogs.c:500
+#: src/dialogs.c:518
 msgid "Need more qualifiers."
 msgstr "Benötige mehr Angaben."
 
-#: src/dialogs.c:503
+#: src/dialogs.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Profil-Service ist zur Zeit nicht verfügbar."
 
-#: src/dialogs.c:506
+#: src/dialogs.c:524
 msgid "Email lookup restricted."
 msgstr "eMail-Suche eingeschränkt."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:527
 msgid "Keyword ignored."
 msgstr "Stichwort ignoriert."
 
-#: src/dialogs.c:512
+#: src/dialogs.c:530
 msgid "No keywords."
 msgstr "Keine Stichwörter."
 
-#: src/dialogs.c:515
+#: src/dialogs.c:533
 msgid "User has no directory information."
 msgstr "Der Benutzer hat kein Profil."
 
-#: src/dialogs.c:519
+#: src/dialogs.c:537
 msgid "Country not supported."
 msgstr "Land nicht unterstützt."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Unbekannter Fehler: %s."
 
-#: src/dialogs.c:525 src/oscar.c:216
+#: src/dialogs.c:543
 msgid "Incorrect nickname or password."
 msgstr "Ungülter Benutzername oder Passwort."
 
-#: src/dialogs.c:528
+#: src/dialogs.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Der Service ist zur Zeit nicht erreichbar."
 
-#: src/dialogs.c:531
+#: src/dialogs.c:549
 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:534 src/oscar.c:213
+#: src/dialogs.c:552
 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."
@@ -634,258 +640,257 @@
 "Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
 "versuchen Sie es noch einmal."
 
-
-#: src/dialogs.c:537
+#: src/dialogs.c:555
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Unbekannter Anmeldungsfehler: %s."
 
-#: src/dialogs.c:540
+#: src/dialogs.c:558
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Unbekannter Fehler: %d. Info: %s"
 
-#: src/dialogs.c:543
+#: src/dialogs.c:561
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "gAIM - Fehler %d"
 
-#: src/dialogs.c:583 src/dialogs.c:628 src/dialogs.c:854 src/dialogs.c:1365
-#: src/dialogs.c:1650 src/dialogs.c:1748
+#: src/dialogs.c:601 src/dialogs.c:646 src/dialogs.c:872 src/dialogs.c:1379
+#: src/dialogs.c:1664 src/dialogs.c:1762
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:637
+#: src/dialogs.c:655
 msgid "IM who: "
 msgstr "Telegramm an:"
 
-#: src/dialogs.c:663
+#: src/dialogs.c:681
 msgid "Gaim - IM user"
 msgstr "gAIM - Telegramm"
 
-#: src/dialogs.c:715
+#: src/dialogs.c:733
 msgid "Buddies"
 msgstr "Buddies"
 
-#: src/dialogs.c:759
+#: src/dialogs.c:777
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
 
-#: src/dialogs.c:761
+#: src/dialogs.c:779
 msgid "Buddy"
 msgstr "Buddy"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:786
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/dialogs.c:798
+#: src/dialogs.c:816
 msgid "Gaim - Add Buddy"
 msgstr "gAIM - Buddy hinzufügen"
 
-#: src/dialogs.c:864
+#: src/dialogs.c:882
 msgid "Buddy To Pounce:"
 msgstr "Buddy-Alert für:"
 
-#: src/dialogs.c:869
+#: src/dialogs.c:887
 msgid "Open IM Window on Buddy Logon"
 msgstr "Öffne Telegrammfenster wenn Buddy sich anmeldet"
 
-#: src/dialogs.c:872
+#: src/dialogs.c:890
 msgid "Send IM on Buddy Logon"
 msgstr "Schicke Telegramm wenn Buddy sich anmeldet"
 
-#: src/dialogs.c:880
+#: src/dialogs.c:898
 msgid "Message to send:"
 msgstr "Nachricht:"
 
-#: src/dialogs.c:907
+#: src/dialogs.c:925
 msgid "Gaim - New Buddy Pounce"
 msgstr "gAIM - Neuer Buddy-Alert"
 
-#: src/dialogs.c:983 src/dialogs.c:1185
+#: src/dialogs.c:1001 src/dialogs.c:1202
 msgid "Save"
 msgstr "Speichern"
 
-#: src/dialogs.c:1005
+#: src/dialogs.c:1023
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Ermöglicht Personen Ihr Profil im Web zu finden"
 
-#: src/dialogs.c:1007 src/dialogs.c:1667
+#: src/dialogs.c:1025 src/dialogs.c:1681
 msgid "First Name"
 msgstr "Vorname"
 
-#: src/dialogs.c:1012 src/dialogs.c:1672
+#: src/dialogs.c:1030 src/dialogs.c:1686
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
-#: src/dialogs.c:1017 src/dialogs.c:1677
+#: src/dialogs.c:1035 src/dialogs.c:1691
 msgid "Last Name"
 msgstr "Nachname"
 
-#: src/dialogs.c:1022 src/dialogs.c:1682
+#: src/dialogs.c:1040 src/dialogs.c:1696
 msgid "Maiden Name"
 msgstr "Mädchenname"
 
-#: src/dialogs.c:1027 src/dialogs.c:1687
+#: src/dialogs.c:1045 src/dialogs.c:1701
 msgid "City"
 msgstr "Stadt"
 
-#: src/dialogs.c:1032 src/dialogs.c:1692
+#: src/dialogs.c:1050 src/dialogs.c:1706
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: src/dialogs.c:1037 src/dialogs.c:1697
+#: src/dialogs.c:1055 src/dialogs.c:1711
 msgid "Country"
 msgstr "Land"
 
-#: src/dialogs.c:1068
+#: src/dialogs.c:1086
 msgid "Gaim - Set Dir Info"
 msgstr "gAIM - Profil anlegen"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1103
 msgid "New Passwords Do Not Match"
 msgstr "Die neuen Passwörter stimmen nicht überein"
 
-#: src/dialogs.c:1086 src/dialogs.c:1091
+#: src/dialogs.c:1103 src/dialogs.c:1108
 msgid "Gaim - Change Password Error"
 msgstr "gAIM - Fehler Passwort ändern"
 
-#: src/dialogs.c:1091
+#: src/dialogs.c:1108
 msgid "Fill out all fields completely"
 msgstr "Bitte alle Felder komplett ausfüllen"
 
-#: src/dialogs.c:1112 src/dialogs.c:1837
+#: src/dialogs.c:1129 src/dialogs.c:1851
 msgid "Ok"
 msgstr "OK"
 
-#: src/dialogs.c:1122
+#: src/dialogs.c:1139
 msgid "Original Password"
 msgstr "Altes Passwort"
 
-#: src/dialogs.c:1130
+#: src/dialogs.c:1147
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: src/dialogs.c:1138
+#: src/dialogs.c:1155
 msgid "New Password (again)"
 msgstr "Neues Passwort (Wiederholen)"
 
-#: src/dialogs.c:1161
+#: src/dialogs.c:1178
 msgid "Gaim - Password Change"
 msgstr "gAIM - Password Änderung"
 
-#: src/dialogs.c:1224
+#: src/dialogs.c:1241
 msgid "Gaim - Set User Info"
 msgstr "gAIM - Mitgliederinfo"
 
-#: src/dialogs.c:1371
+#: src/dialogs.c:1385
 msgid "Below are the results of your search: "
 msgstr "Das Resultat Ihrer Suche:"
 
-#: src/dialogs.c:1518
+#: src/dialogs.c:1532
 msgid "Gaim - Add Permit/Deny"
 msgstr "gAIM - Sperren/Zulassen hinzufügen"
 
-#: src/dialogs.c:1579
+#: src/dialogs.c:1593
 msgid "Gaim - Log Conversation"
 msgstr "gAIM - Telegramm-Mitschnitt"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1738
 msgid "Gaim - Find Buddy By Info"
 msgstr "gAIM - Buddy nach Profil finden"
 
-#: src/dialogs.c:1759
+#: src/dialogs.c:1773
 msgid "Email"
 msgstr "eMail"
 
-#: src/dialogs.c:1782
+#: src/dialogs.c:1796
 msgid "Gaim - Find Buddy By Email"
 msgstr "gAIM - Buddy nach eMail-Adresse suchen"
 
-#: src/dialogs.c:1853
+#: src/dialogs.c:1867
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:1858
+#: src/dialogs.c:1872
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/dialogs.c:1880
+#: src/dialogs.c:1894
 msgid "GAIM - Add URL"
 msgstr "gAIM - Url hinzufügen"
 
-#: src/dialogs.c:1945
+#: src/dialogs.c:1959
 msgid "Select Text Color"
 msgstr "Textfarbe wählen"
 
-#: src/dialogs.c:2167 src/rvous.c:221
+#: src/dialogs.c:2181 src/rvous.c:220
 #, c-format
 msgid "Error writing file %s"
 msgstr "Fehler beim Schreiben von %s"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2198
 msgid "Gaim - Export Buddy List"
 msgstr "gAIM - Buddy-Liste speichern"
 
-#: src/dialogs.c:2238 src/rvous.c:490
+#: src/dialogs.c:2252 src/rvous.c:487
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: src/dialogs.c:2304
+#: src/dialogs.c:2318
 msgid "Gaim - Import Buddy List"
 msgstr "gAIM - Buddy-Liste laden"
 
-#: src/dialogs.c:2379
+#: src/dialogs.c:2393
 msgid "Gaim - New away message"
 msgstr "gAIM - Neue Abwesenheits-Mitteilung"
 
 #. Make a label for away entry
-#: src/dialogs.c:2389
+#: src/dialogs.c:2403
 msgid "Away title: "
 msgstr "Abwesenheits-Titel:"
 
 #. make create button
-#: src/dialogs.c:2411
+#: src/dialogs.c:2425
 msgid "Create new message"
 msgstr "Neue Mitteilung erstellen"
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:2416
+#: src/dialogs.c:2430
 msgid "Make away now"
 msgstr "Jetzt abwesend"
 
-#: src/gnome_applet_mgr.c:115
+#: src/gnome_applet_mgr.c:117
 #, c-format
 msgid "file not found: %s\n"
 msgstr "Datei nicht gefunden: %s\n"
 
-#: src/gnome_applet_mgr.c:148
+#: src/gnome_applet_mgr.c:171
 msgid "Offilne. Click to bring up login box."
 msgstr "Offline. Hier klicken, um das Anmeldefenster zu öffnen."
 
-#: src/gnome_applet_mgr.c:155
+#: src/gnome_applet_mgr.c:178
 msgid "Attempting to sign on...."
 msgstr "Anmeldung..."
 
-#: src/gnome_applet_mgr.c:326
+#: src/gnome_applet_mgr.c:351
 msgid "GAIM"
 msgstr "gAIM"
 
-#: src/gnome_applet_mgr.c:528
+#: src/gnome_applet_mgr.c:553
 msgid "Can't create GAIM applet!"
 msgstr "Kann gAIM-Applet nicht erstellen"
 
-#: src/gnome_applet_mgr.c:560
+#: src/gnome_applet_mgr.c:587
 msgid "Offline"
 msgstr "Offline"
 
-#: src/gnome_applet_mgr.c:571
+#: src/gnome_applet_mgr.c:598
 msgid "Font does not exist"
 msgstr "Schriftart existiert nicht"
 
-#: src/gnome_applet_mgr.c:587
+#: src/gnome_applet_mgr.c:614
 msgid "About..."
 msgstr "Über..."
 
@@ -927,106 +932,70 @@
 msgid "Receieved: '%s'\n"
 msgstr "Empfangen: '%s'\n"
 
-#: src/oscar.c:93 src/oscar.c:103
+#: src/oscar.c:94 src/oscar.c:104
 msgid "Disconnected."
 msgstr "Verbindung unterbrochen"
 
-#: src/oscar.c:101
+#: src/oscar.c:102
 msgid "connection error!\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/oscar.c:120
+#: src/oscar.c:121
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Melde an %s\n"
 
-#: src/oscar.c:130
+#: src/oscar.c:131
 #, c-format
 msgid "Looking up %s"
 msgstr "Suche %s"
 
-#: src/oscar.c:135
+#: src/oscar.c:136
 msgid "internal connection error\n"
 msgstr "Interner Verbindungsfehler\n"
 
-#: src/oscar.c:140
+#: src/oscar.c:141
 msgid "Unable to login to AIM"
 msgstr "Anmeldung nicht möglich"
 
-#: src/oscar.c:148
+#: src/oscar.c:149
 msgid "couldn't resolve host\n"
 msgstr "Konnte Server nicht finden\n"
 
-#: src/oscar.c:152
+#: src/oscar.c:153
 msgid "couldn't connect to host\n"
 msgstr "Keine Verbindung zum Server\n"
 
-#: src/oscar.c:158
+#: src/oscar.c:159
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: src/oscar.c:186
+#: src/oscar.c:187
 msgid "Password sent, waiting for response\n"
 msgstr "Passwort übertragen, warte auf Antwort\n"
 
-#: src/oscar.c:200
+#: src/oscar.c:201
 msgid "Signed off.\n"
 msgstr "Abgemeldet.\n"
 
-#: src/oscar.c:213 src/oscar.c:216 src/oscar.c:219 src/oscar.c:580
-msgid "Gaim - Error"
-msgstr "gAIM - Fehler"
-
-#: src/oscar.c:219
-msgid ""
-"AOL has decided your client is too old. Please download a newer version from "
-"http://www.marko.net/gaim/"
-msgstr ""
-"Ihre AIM-Software ist zu alt. Aktuelle Software finden Sie auf "
-"http://www.aim.de"
-
-#: src/oscar.c:232
+#: src/oscar.c:236
 msgid "Authentication Failed"
 msgstr ""
 
-#: src/oscar.c:253
+#: src/oscar.c:257
 msgid "Internal Error"
 msgstr ""
 
-#: src/oscar.c:261
+#: src/oscar.c:265
 msgid "Could Not Connect"
 msgstr ""
 
-#: src/oscar.c:287
+#: src/oscar.c:291
 msgid "Connection established, cookie sent"
 msgstr ""
 
-#: src/oscar.c:589
-msgid "You are sending messages too fast."
-msgstr ""
-
-#: src/oscar.c:593
-msgid "Unknown SNAC error (I'm hungry)"
-msgstr ""
-
-#: src/oscar.c:597
-msgid "User is not online."
-msgstr ""
-
-#: src/oscar.c:599
-msgid "A message has been dropped."
-msgstr ""
-
-#: src/oscar.c:625
-msgid "User has no info/away message."
-msgstr ""
-
-#: src/oscar.c:626
-msgid "Gaim - User Info"
-msgstr ""
-
-#: src/oscar.c:630
+#: src/oscar.c:636
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1034,82 +1003,97 @@
 "<BR><HR><BR>%s\n"
 msgstr ""
 
-#: src/plugins.c:102
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr ""
 
-#: src/plugins.c:162 src/plugins.c:169
+#: src/plugins.c:156
+#, c-format
+msgid "Already loaded %s, not reloading.\n"
+msgstr ""
+
+#: src/plugins.c:179 src/plugins.c:186 src/plugins.c:217
 msgid "Plugin Error"
 msgstr ""
 
-#: src/plugins.c:216
+#: src/plugins.c:264
 msgid "Gaim - Plugins"
 msgstr ""
 
-#: src/plugins.c:245
+#: src/plugins.c:293
 msgid "Load Plugin"
 msgstr ""
 
-#: src/plugins.c:250
+#: src/plugins.c:298
 msgid "Configure Plugin"
 msgstr ""
 
-#: src/plugins.c:254
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr ""
 
-#: src/prefs.c:360
+#: src/prefs.c:358
 msgid "Gaim - Preferences"
 msgstr ""
 
-#: src/prefs.c:372
+#: src/prefs.c:370
 msgid "General"
 msgstr ""
 
-#: src/prefs.c:377
+#: src/prefs.c:375
 msgid "Idle"
 msgstr ""
 
+#: src/prefs.c:383
+msgid "Enter sends message"
+msgstr "Enter verschickt Nachricht"
+
+#: src/prefs.c:384
+msgid "Auto-login"
+msgstr ""
+
 #: src/prefs.c:385
-msgid "Enter sends message"
-msgstr "Enter verschickt Nachricht"
-
-#: src/prefs.c:386
-msgid "Auto-login"
-msgstr ""
-
-#: src/prefs.c:387
 msgid "Log All Conversations"
 msgstr "Alles Mitschneiten"
 
-#: src/prefs.c:388
+#: src/prefs.c:386
 msgid "Strip HTML from log files"
 msgstr "HTML aus Mitschnitt entfernen"
 
-#: src/prefs.c:389
+#: src/prefs.c:387
 msgid "Raise windows when message recieved"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:390
+#: src/prefs.c:388
+#, fuzzy
+msgid "Raise chat windows when people speak"
+msgstr "Fenster nach Oben, bei neuer Nachricht"
+
+#: src/prefs.c:389
 msgid "Send URLs as links"
 msgstr "URLs als Link verschicken"
 
-#: src/prefs.c:391
+#: src/prefs.c:390
 msgid "Show Lag-O-Meter"
 msgstr "Warnlevel zeigen"
 
-#: src/prefs.c:392
+#: src/prefs.c:391
 msgid "Save some window size/positions"
 msgstr "Fensterposition und -größe speichern"
 
-#: src/prefs.c:393
+#: src/prefs.c:392
 msgid "Ignore new conversations when away"
 msgstr "Neue Telegramme bei Abwesenheit ignorieren"
 
-#: src/prefs.c:394
+#: src/prefs.c:393
 msgid "Automagically highlight misspelled words"
 msgstr ""
 
+#: src/prefs.c:394
+#, fuzzy
+msgid "Sending messages removes away status"
+msgstr "Sie verschicken die Nachrichten an %s zu schnell."
+
 #: src/prefs.c:397
 msgid "Enable debug mode"
 msgstr "Debugmodus aktivieren"
@@ -1138,183 +1122,199 @@
 msgid "Buddy list displays near the applet"
 msgstr ""
 
-#: src/prefs.c:456
+#: src/prefs.c:455
 msgid "Connection"
 msgstr ""
 
-#: src/prefs.c:461
+#: src/prefs.c:459
+msgid "Use Oscar Protocol (experimental; only takes effect before signon)"
+msgstr ""
+
+#: src/prefs.c:460
+msgid "The following options do not apply if you use Oscar."
+msgstr ""
+
+#: src/prefs.c:464
 msgid "TOC Host:"
 msgstr ""
 
-#: src/prefs.c:468 src/prefs.c:490 src/prefs.c:543
+#: src/prefs.c:471 src/prefs.c:493 src/prefs.c:546
 msgid "Port:"
 msgstr ""
 
-#: src/prefs.c:483
+#: src/prefs.c:486
 msgid "Login Host:"
 msgstr ""
 
-#: src/prefs.c:504
+#: src/prefs.c:507
 msgid "No Proxy"
 msgstr ""
 
-#: src/prefs.c:511
+#: src/prefs.c:514
 msgid "HTTP Proxy"
 msgstr ""
 
-#: src/prefs.c:519
+#: src/prefs.c:522
 msgid "SOCKS v4 Proxy"
 msgstr ""
 
-#: src/prefs.c:527
+#: src/prefs.c:530
 msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 msgstr ""
 
-#: src/prefs.c:536
+#: src/prefs.c:539
 msgid "Proxy Host:"
 msgstr ""
 
-#: src/prefs.c:623
+#: src/prefs.c:624
 msgid "Create Message"
 msgstr ""
 
-#: src/prefs.c:627
+#: src/prefs.c:628
 msgid "Remove Message"
 msgstr ""
 
-#: src/prefs.c:666
+#: src/prefs.c:667
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:669
+#: src/prefs.c:670
 msgid "Sound when buddy logs in"
 msgstr ""
 
-#: src/prefs.c:670
+#: src/prefs.c:671
 msgid "Sound when buddy logs out"
 msgstr ""
 
-#: src/prefs.c:671
-msgid "Sound when message is received"
-msgstr ""
-
 #: src/prefs.c:672
-msgid "Sound when message is sent"
+msgid "Sound when message is received"
 msgstr ""
 
 #: src/prefs.c:673
-msgid "Sound when first message is received"
+msgid "Sound when message is sent"
 msgstr ""
 
 #: src/prefs.c:674
-msgid "Sound when message is received if away"
+msgid "Sound when first message is received"
 msgstr ""
 
 #: src/prefs.c:675
+msgid "Sound when message is received if away"
+msgstr ""
+
+#: src/prefs.c:676
 msgid "No sound for buddies signed on when you log in"
 msgstr ""
 
-#: src/prefs.c:682
+#: src/prefs.c:677
+msgid "Sounds in chat rooms when people enter/leave"
+msgstr ""
+
+#: src/prefs.c:678
+msgid "Sounds in chat rooms when people talk"
+msgstr ""
+
+#: src/prefs.c:685
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:687
+#: src/prefs.c:690
 msgid "Netscape"
 msgstr ""
 
-#: src/prefs.c:694
+#: src/prefs.c:697
 msgid "KFM (The KDE browser)"
 msgstr ""
 
-#: src/prefs.c:702
+#: src/prefs.c:705
 msgid "Internal HTML widget (Quite likely a bad idea!)"
 msgstr ""
 
-#: src/prefs.c:710
+#: src/prefs.c:713
 msgid "Manual"
 msgstr ""
 
-#: src/prefs.c:724
+#: src/prefs.c:727
 msgid "Pop up new window by default"
 msgstr ""
 
-#: src/prefs.c:748
+#: src/prefs.c:751
 msgid "Appearance"
 msgstr ""
 
-#: src/prefs.c:752
+#: src/prefs.c:755
 msgid "Font Properties"
 msgstr ""
 
-#: src/prefs.c:759
+#: src/prefs.c:762
 msgid "Show time on messages"
 msgstr ""
 
-#: src/prefs.c:760
+#: src/prefs.c:763
 msgid "Show numbers in groups"
 msgstr ""
 
-#: src/prefs.c:761
+#: src/prefs.c:764
 msgid "Show buddy-type pixmaps"
 msgstr ""
 
-#: src/prefs.c:762
+#: src/prefs.c:765
 msgid "Show idle times"
 msgstr ""
 
-#: src/prefs.c:763
+#: src/prefs.c:766
 msgid "Show button pixmaps"
 msgstr ""
 
-#: src/prefs.c:764
+#: src/prefs.c:767
 msgid "Ignore incoming colours"
 msgstr ""
 
-#: src/prefs.c:768
+#: src/prefs.c:771
 msgid "Show logon/logoffs in conversation windows"
 msgstr ""
 
-#: src/prefs.c:769
+#: src/prefs.c:772
 msgid "Use devil icons"
 msgstr ""
 
-#: src/prefs.c:770
-msgid "Show graphical smileys"
+#: src/prefs.c:773
+msgid "Show graphical smileys (experimental)"
 msgstr ""
 
-#: src/prefs.c:775
+#: src/prefs.c:778
 msgid "Underlined Text"
 msgstr ""
 
-#: src/prefs.c:776
+#: src/prefs.c:779
 msgid "Strike Text"
 msgstr ""
 
-#: src/prefs.c:777
+#: src/prefs.c:780
 msgid "Font Face for Text"
 msgstr ""
 
-#: src/prefs.c:795
+#: src/prefs.c:798
 msgid "Buddy Chats"
 msgstr ""
 
-#: src/prefs.c:918 src/prefs.c:920 src/prefs.c:1050 src/prefs.c:1052
+#: src/prefs.c:921 src/prefs.c:923 src/prefs.c:1053 src/prefs.c:1055
 msgid "Gaim Chat"
 msgstr ""
 
-#: src/prefs.c:993
+#: src/prefs.c:996
 msgid "Refresh"
 msgstr ""
 
-#: src/prefs.c:1024
+#: src/prefs.c:1027
 msgid "List of available chats"
 msgstr ""
 
-#: src/prefs.c:1038
+#: src/prefs.c:1041
 msgid "List of subscribed chats"
 msgstr ""
 
-#: src/prefs.c:1095
+#: src/prefs.c:1098
 msgid "GAIM debug output window"
 msgstr ""
 
@@ -1322,34 +1322,44 @@
 msgid "Gaim - Save As..."
 msgstr ""
 
-#: src/rvous.c:270
+#: src/rvous.c:269
 #, c-format
 msgid "Receiving %s from %s"
 msgstr ""
 
-#: src/rvous.c:284 src/rvous.c:419
+#: src/rvous.c:283 src/rvous.c:418
 msgid "Gaim - File Transfer"
 msgstr ""
 
-#: src/rvous.c:405
+#: src/rvous.c:404
 #, c-format
 msgid "Sending %s to %s"
 msgstr ""
 
-#: src/rvous.c:633
+#: src/rvous.c:630
 msgid "Accept"
 msgstr ""
 
-#: src/rvous.c:652
+#: src/rvous.c:649
 #, c-format
 msgid "%s requests you to accept the file: %s (%d bytes)"
 msgstr ""
 
-#: src/rvous.c:655
+#: src/rvous.c:652
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
 
-#: src/rvous.c:665
+#: src/rvous.c:662
 msgid "Gaim - File Transfer?"
 msgstr ""
+
+#~ msgid "Gaim - Error"
+#~ msgstr "gAIM - Fehler"
+
+#~ msgid ""
+#~ "AOL has decided your client is too old. Please download a newer version from "
+#~ "http://www.marko.net/gaim/"
+#~ msgstr ""
+#~ "Ihre AIM-Software ist zu alt. Aktuelle Software finden Sie auf "
+#~ "http://www.aim.de"
--- a/po/es.po	Fri Jun 23 19:05:11 2000 +0000
+++ b/po/es.po	Fri Jun 23 19:13:04 2000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 09:33-0700\n"
+"POT-Creation-Date: 2000-06-23 10:39-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"
@@ -21,8 +21,8 @@
 msgstr "Sobre GAIM v%s"
 
 #. color = gtk_button_new_with_label("Color");
-#: src/about.c:93 src/buddy.c:1766 src/buddy_chat.c:711
-#: src/conversation.c:1107 src/dialogs.c:434 src/plugins.c:294 src/prefs.c:811
+#: src/about.c:93 src/buddy.c:1764 src/buddy_chat.c:711
+#: src/conversation.c:1107 src/dialogs.c:434 src/plugins.c:307 src/prefs.c:807
 msgid "Close"
 msgstr "Cerrar"
 
@@ -34,51 +34,51 @@
 msgid "You must give your password"
 msgstr "Tiene que introduzir su contraseña"
 
-#: src/aim.c:229 src/buddy.c:1761
+#: src/aim.c:230 src/buddy.c:1759
 msgid "Signoff"
 msgstr "Desconectar"
 
-#: src/aim.c:339 src/aim.c:545 src/buddy.c:369 src/gnome_applet_mgr.c:373
+#: src/aim.c:340 src/aim.c:546 src/buddy.c:369 src/gnome_applet_mgr.c:373
 msgid "Signon"
 msgstr "Conectar"
 
-#: src/aim.c:340 src/buddy_chat.c:103 src/buddy_chat.c:178 src/dialogs.c:370
-#: src/dialogs.c:644 src/dialogs.c:760 src/dialogs.c:870 src/dialogs.c:999
-#: src/dialogs.c:1129 src/dialogs.c:1200 src/dialogs.c:1288 src/dialogs.c:1477
-#: src/dialogs.c:1662 src/dialogs.c:1760 src/dialogs.c:1849 src/rvous.c:279
+#: src/aim.c:341 src/buddy_chat.c:103 src/buddy_chat.c:178 src/dialogs.c:370
+#: src/dialogs.c:645 src/dialogs.c:761 src/dialogs.c:871 src/dialogs.c:1000
+#: src/dialogs.c:1130 src/dialogs.c:1201 src/dialogs.c:1289 src/dialogs.c:1478
+#: src/dialogs.c:1663 src/dialogs.c:1761 src/dialogs.c:1850 src/rvous.c:279
 #: src/rvous.c:414 src/rvous.c:633
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/aim.c:341 src/buddy.c:1758
+#: src/aim.c:342 src/buddy.c:1756
 msgid "Register"
 msgstr "Registrar"
 
-#: src/aim.c:342
+#: src/aim.c:343
 msgid "Options"
 msgstr "Opciones"
 
-#: src/aim.c:344 src/aim.c:551 src/buddy.c:1823
+#: src/aim.c:345 src/aim.c:552 src/buddy.c:1821
 msgid "Plugins"
 msgstr "Aditivos"
 
-#: src/aim.c:407
+#: src/aim.c:408
 msgid "Screen Name: "
 msgstr "Nomre de Usuario:"
 
-#: src/aim.c:410
+#: src/aim.c:411
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: src/aim.c:413
+#: src/aim.c:414
 msgid "Remember Password"
 msgstr "Acordarse de la Constraseña"
 
-#: src/aim.c:460
+#: src/aim.c:461
 msgid "Gaim - Login"
 msgstr "Conectación - Gaim"
 
-#: src/aim.c:540 src/buddy.c:1820
+#: src/aim.c:541 src/buddy.c:1818
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -108,28 +108,28 @@
 msgstr "%d/%d Amigos en línea"
 
 #: src/buddy.c:273 src/buddy.c:278 src/buddy.c:281 src/buddy.c:286
-#: src/buddy.c:1920 src/buddy.c:1989 src/conversation.c:368
-#: src/conversation.c:1112 src/dialogs.c:761 src/dialogs.c:1478
-#: src/dialogs.c:1502 src/prefs.c:1001
+#: src/buddy.c:1918 src/buddy.c:1987 src/conversation.c:368
+#: src/conversation.c:1112 src/dialogs.c:762 src/dialogs.c:1479
+#: src/dialogs.c:1503 src/prefs.c:997
 msgid "Add"
 msgstr "Agregar"
 
 #: src/buddy.c:274 src/buddy.c:279 src/buddy.c:282 src/buddy.c:287
-#: src/buddy.c:1921 src/buddy.c:1990 src/conversation.c:1109 src/dialogs.c:708
-#: src/prefs.c:1002
+#: src/buddy.c:1919 src/buddy.c:1988 src/conversation.c:1109 src/dialogs.c:709
+#: src/prefs.c:998
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/buddy.c:275 src/buddy.c:283 src/buddy.c:1869
+#: src/buddy.c:275 src/buddy.c:283 src/buddy.c:1867
 msgid "Chat"
 msgstr "Hablar"
 
-#: src/buddy.c:276 src/buddy.c:284 src/buddy.c:437 src/buddy.c:1867
+#: src/buddy.c:276 src/buddy.c:284 src/buddy.c:437 src/buddy.c:1865
 #: src/buddy_chat.c:716
 msgid "IM"
 msgstr "Mensaje"
 
-#: src/buddy.c:277 src/buddy.c:285 src/buddy.c:443 src/buddy.c:1868
+#: src/buddy.c:277 src/buddy.c:285 src/buddy.c:443 src/buddy.c:1866
 #: src/buddy_chat.c:718 src/conversation.c:1104 src/rvous.c:631
 msgid "Info"
 msgstr "Información"
@@ -150,11 +150,11 @@
 msgid "Add Buddy Pounce"
 msgstr "Agregar Calada de Amigo"
 
-#: src/buddy.c:572 src/buddy.c:1020 src/buddy.c:2025 src/dialogs.c:1493
+#: src/buddy.c:572 src/buddy.c:1020 src/buddy.c:2023 src/dialogs.c:1494
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/buddy.c:588 src/dialogs.c:1488
+#: src/buddy.c:588 src/dialogs.c:1489
 msgid "Deny"
 msgstr "Negar"
 
@@ -195,128 +195,128 @@
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s desconectado%s%s.</B><BR><HR>"
 
-#: src/buddy.c:1747
+#: src/buddy.c:1745
 msgid "File"
 msgstr "Archivo"
 
-#: src/buddy.c:1751
+#: src/buddy.c:1749
 msgid "Add A Buddy"
 msgstr "Agregar Amigo"
 
-#: src/buddy.c:1753
+#: src/buddy.c:1751
 msgid "Import Buddy List"
 msgstr "Importar Lista de Amigos"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1752
 msgid "Export Buddy List"
 msgstr "Exportar Lista de Amigos"
 
-#: src/buddy.c:1764
+#: src/buddy.c:1762
 msgid "Quit"
 msgstr "Salir"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1769
 msgid "Tools"
 msgstr "Herramientas"
 
-#: src/buddy.c:1776 src/gnome_applet_mgr.c:199 src/gnome_applet_mgr.c:284
-#: src/prefs.c:601
+#: src/buddy.c:1774 src/gnome_applet_mgr.c:199 src/gnome_applet_mgr.c:284
+#: src/prefs.c:597
 msgid "Away"
 msgstr "Ausente"
 
-#: src/buddy.c:1781
+#: src/buddy.c:1779
 msgid "Buddy Pounce"
 msgstr "Calada de Amigo"
 
-#: src/buddy.c:1789
+#: src/buddy.c:1787
 msgid "Search for Buddy"
 msgstr "Buscar un Amigo"
 
-#: src/buddy.c:1792
+#: src/buddy.c:1790
 msgid "by Email"
 msgstr "por Correo Electronico"
 
-#: src/buddy.c:1796
+#: src/buddy.c:1794
 msgid "by Dir Info"
 msgstr "por Información de Directorio"
 
-#: src/buddy.c:1803
+#: src/buddy.c:1801
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/buddy.c:1806
+#: src/buddy.c:1804
 msgid "User Info"
 msgstr "Información de Usuario"
 
-#: src/buddy.c:1810
+#: src/buddy.c:1808
 msgid "Directory Info"
 msgstr "Información del Directorio"
 
-#: src/buddy.c:1814
+#: src/buddy.c:1812
 msgid "Change Password"
 msgstr "Cambiar Contraseña"
 
-#: src/buddy.c:1828
+#: src/buddy.c:1826
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/buddy.c:1833
+#: src/buddy.c:1831
 msgid "About"
 msgstr "Sobre"
 
-#: src/buddy.c:1881
+#: src/buddy.c:1879
 msgid "Buddy List"
 msgstr "Lista de Amigos"
 
-#: src/buddy.c:1904
+#: src/buddy.c:1902
 msgid "Information on selected Buddy"
 msgstr "Informacion sobre Amigo Escogido"
 
-#: src/buddy.c:1905
+#: src/buddy.c:1903
 msgid "Send Instant Message"
 msgstr "Mandar Mensaje Instantaneo"
 
-#: src/buddy.c:1906
+#: src/buddy.c:1904
 msgid "Start/join a Buddy Chat"
 msgstr "Empezar/Unirse a Conversación de Amigos"
 
-#: src/buddy.c:1941
+#: src/buddy.c:1939
 msgid "Add a new Buddy"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:1942
+#: src/buddy.c:1940
 msgid "Remove selected Buddy"
 msgstr "Quitar Amigo Escogido"
 
-#: src/buddy.c:1965
+#: src/buddy.c:1963
 msgid "Allow anyone"
 msgstr "Permitir a todos"
 
-#: src/buddy.c:1972
+#: src/buddy.c:1970
 msgid "Permit some"
 msgstr "Permitir algunos"
 
-#: src/buddy.c:1980
+#: src/buddy.c:1978
 msgid "Deny some"
 msgstr "Negar algunos"
 
-#: src/buddy.c:2001
+#: src/buddy.c:1999
 msgid "Add buddy to permit/deny"
 msgstr "Agregar amigo a autorizar/negar"
 
-#: src/buddy.c:2002
+#: src/buddy.c:2000
 msgid "Remove buddy from permit/deny"
 msgstr "Quitar amigo de autorizar/negar"
 
-#: src/buddy.c:2021
+#: src/buddy.c:2019
 msgid "Online"
 msgstr "En Linea"
 
-#: src/buddy.c:2023
+#: src/buddy.c:2021
 msgid "Edit Buddies"
 msgstr "Corregir Amigos["
 
-#: src/buddy.c:2072
+#: src/buddy.c:2070
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista de Amigos"
 
@@ -352,7 +352,7 @@
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/buddy_chat.c:714 src/conversation.c:1103 src/dialogs.c:1289
+#: src/buddy_chat.c:714 src/conversation.c:1103 src/dialogs.c:1290
 msgid "Send"
 msgstr "Mandar"
 
@@ -364,7 +364,7 @@
 msgid "Bold"
 msgstr "Negritas"
 
-#: src/buddy_chat.c:803 src/conversation.c:1188 src/prefs.c:780
+#: src/buddy_chat.c:803 src/conversation.c:1188 src/prefs.c:776
 msgid "Bold Text"
 msgstr "Texto en Negritas"
 
@@ -373,7 +373,7 @@
 msgid "Italics"
 msgstr "Inclinados"
 
-#: src/buddy_chat.c:807 src/conversation.c:1192 src/prefs.c:781
+#: src/buddy_chat.c:807 src/conversation.c:1192 src/prefs.c:777
 msgid "Italics Text"
 msgstr "Texto Inclinado"
 
@@ -424,8 +424,8 @@
 msgid "Font"
 msgstr "Texto"
 
-#: src/buddy_chat.c:823 src/conversation.c:1208 src/dialogs.c:2074
-#: src/dialogs.c:2093 src/prefs.c:786
+#: src/buddy_chat.c:823 src/conversation.c:1208 src/dialogs.c:2075
+#: src/dialogs.c:2094 src/prefs.c:782
 msgid "Select Font"
 msgstr "Seleccionar un Texto"
 
@@ -478,7 +478,7 @@
 msgid "Message too long, some data truncated."
 msgstr "Mensaje demasiado largo, algunas partes fueron cortadas."
 
-#: src/conversation.c:500 src/dialogs.c:2181 src/dialogs.c:2252
+#: src/conversation.c:500 src/dialogs.c:2182 src/dialogs.c:2253
 #: src/rvous.c:221 src/rvous.c:488
 msgid "Error"
 msgstr "Error"
@@ -526,111 +526,111 @@
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Advertir usuario?"
 
-#: src/dialogs.c:481
+#: src/dialogs.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No se pudo escribir archivo %s."
 
-#: src/dialogs.c:484
+#: src/dialogs.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No se pudo leer archivo %s."
 
-#: src/dialogs.c:487
+#: src/dialogs.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensaje demasiado largo, ultimos %s bytes fueron borrados."
 
-#: src/dialogs.c:490
+#: src/dialogs.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s no esta en linea ahorita."
 
-#: src/dialogs.c:493
+#: src/dialogs.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Advertencias para %s estan prohibidas."
 
-#: src/dialogs.c:496
+#: src/dialogs.c:497
 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:499
+#: src/dialogs.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Conversación en %s no esta disponible."
 
-#: src/dialogs.c:502
+#: src/dialogs.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esta mandando los mensajes demasiado rapido a %s."
 
-#: src/dialogs.c:505
+#: src/dialogs.c:506
 #, 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:508
+#: src/dialogs.c:509
 #, 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:511
+#: src/dialogs.c:512
 msgid "Failure."
 msgstr "Falla"
 
-#: src/dialogs.c:514
+#: src/dialogs.c:515
 msgid "Too many matches."
 msgstr "Demasiados resultados"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:518
 msgid "Need more qualifiers."
 msgstr "Necesito mas calificadores"
 
-#: src/dialogs.c:520
+#: src/dialogs.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio no esta disponible ahorita."
 
-#: src/dialogs.c:523
+#: src/dialogs.c:524
 msgid "Email lookup restricted."
 msgstr "Busqueda de correos electronicos es restringida."
 
-#: src/dialogs.c:526
+#: src/dialogs.c:527
 msgid "Keyword ignored."
 msgstr "Palabra ignorada"
 
-#: src/dialogs.c:529
+#: src/dialogs.c:530
 msgid "No keywords."
 msgstr "Sin palabras"
 
-#: src/dialogs.c:532
+#: src/dialogs.c:533
 msgid "User has no directory information."
 msgstr "El usuario no tiene información en el directorio."
 
-#: src/dialogs.c:536
+#: src/dialogs.c:537
 msgid "Country not supported."
 msgstr "País no apoyado"
 
-#: src/dialogs.c:539
+#: src/dialogs.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Falla desconocida: %s."
 
-#: src/dialogs.c:542
+#: src/dialogs.c:543
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contraseña incorrecta."
 
-#: src/dialogs.c:545
+#: src/dialogs.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Este servicio no esta disponible en este momento."
 
-#: src/dialogs.c:548
+#: src/dialogs.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "Su nivel de advertencias es demasiado alto para conectarse."
 
-#: src/dialogs.c:551
+#: src/dialogs.c:552
 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."
@@ -638,224 +638,224 @@
 "Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
 "intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
 
-#: src/dialogs.c:554
+#: src/dialogs.c:555
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Un error al conectarse ha ocurrido: %s."
 
-#: src/dialogs.c:557
+#: src/dialogs.c:558
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Un error desconocido, %d, ha ocurrido.  Informacion: %s"
 
-#: src/dialogs.c:560
+#: src/dialogs.c:561
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - Error %d"
 
-#: src/dialogs.c:600 src/dialogs.c:645 src/dialogs.c:871 src/dialogs.c:1378
-#: src/dialogs.c:1663 src/dialogs.c:1761
+#: src/dialogs.c:601 src/dialogs.c:646 src/dialogs.c:872 src/dialogs.c:1379
+#: src/dialogs.c:1664 src/dialogs.c:1762
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:654
+#: src/dialogs.c:655
 msgid "IM who: "
 msgstr "Quien: "
 
-#: src/dialogs.c:680
+#: src/dialogs.c:681
 msgid "Gaim - IM user"
 msgstr "Gaim - Usuario"
 
-#: src/dialogs.c:732
+#: src/dialogs.c:733
 msgid "Buddies"
 msgstr "Amigos"
 
-#: src/dialogs.c:776
+#: src/dialogs.c:777
 msgid "Add Buddy"
 msgstr "Agregar Amigo"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:779
 msgid "Buddy"
 msgstr "Amigo"
 
-#: src/dialogs.c:785
+#: src/dialogs.c:786
 msgid "Group"
 msgstr "Grupo"
 
-#: src/dialogs.c:815
+#: src/dialogs.c:816
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:881
+#: src/dialogs.c:882
 msgid "Buddy To Pounce:"
 msgstr "Amigo a calar:"
 
-#: src/dialogs.c:886
+#: src/dialogs.c:887
 msgid "Open IM Window on Buddy Logon"
 msgstr "Abrir Ventana de Mensage cuando se conecte este amigo"
 
-#: src/dialogs.c:889
+#: src/dialogs.c:890
 msgid "Send IM on Buddy Logon"
 msgstr "Mandar un mensaje cuando se conecte este amigo"
 
-#: src/dialogs.c:897
+#: src/dialogs.c:898
 msgid "Message to send:"
 msgstr "Mensaje a mandar:"
 
-#: src/dialogs.c:924
+#: src/dialogs.c:925
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuevo amigo a calar"
 
-#: src/dialogs.c:1000 src/dialogs.c:1201
+#: src/dialogs.c:1001 src/dialogs.c:1202
 msgid "Save"
 msgstr "Guardar"
 
-#: src/dialogs.c:1022
+#: src/dialogs.c:1023
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dejar que busquedas en el Web encuentren su informacion"
 
-#: src/dialogs.c:1024 src/dialogs.c:1680
+#: src/dialogs.c:1025 src/dialogs.c:1681
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/dialogs.c:1029 src/dialogs.c:1685
+#: src/dialogs.c:1030 src/dialogs.c:1686
 msgid "Middle Name"
 msgstr "Segundo Nombre"
 
-#: src/dialogs.c:1034 src/dialogs.c:1690
+#: src/dialogs.c:1035 src/dialogs.c:1691
 msgid "Last Name"
 msgstr "Apellido"
 
-#: src/dialogs.c:1039 src/dialogs.c:1695
+#: src/dialogs.c:1040 src/dialogs.c:1696
 msgid "Maiden Name"
 msgstr "Apellido Materno"
 
-#: src/dialogs.c:1044 src/dialogs.c:1700
+#: src/dialogs.c:1045 src/dialogs.c:1701
 msgid "City"
 msgstr "Ciudad"
 
-#: src/dialogs.c:1049 src/dialogs.c:1705
+#: src/dialogs.c:1050 src/dialogs.c:1706
 msgid "State"
 msgstr "Estado"
 
-#: src/dialogs.c:1054 src/dialogs.c:1710
+#: src/dialogs.c:1055 src/dialogs.c:1711
 msgid "Country"
 msgstr "País"
 
-#: src/dialogs.c:1085
+#: src/dialogs.c:1086
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Crear Información del directorio"
 
-#: src/dialogs.c:1102
+#: src/dialogs.c:1103
 msgid "New Passwords Do Not Match"
 msgstr "Las contraseñas nuevas no son iguales"
 
-#: src/dialogs.c:1102 src/dialogs.c:1107
+#: src/dialogs.c:1103 src/dialogs.c:1108
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Error sobre el cambio de contraseña"
 
-#: src/dialogs.c:1107
+#: src/dialogs.c:1108
 msgid "Fill out all fields completely"
 msgstr "Llene todos los campos completamente"
 
-#: src/dialogs.c:1128 src/dialogs.c:1850
+#: src/dialogs.c:1129 src/dialogs.c:1851
 msgid "Ok"
 msgstr "OK"
 
-#: src/dialogs.c:1138
+#: src/dialogs.c:1139
 msgid "Original Password"
 msgstr "Contraseña Original"
 
-#: src/dialogs.c:1146
+#: src/dialogs.c:1147
 msgid "New Password"
 msgstr "Contraseña Nueva"
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1155
 msgid "New Password (again)"
 msgstr "Contraseña Nueva (de nuevo)"
 
-#: src/dialogs.c:1177
+#: src/dialogs.c:1178
 msgid "Gaim - Password Change"
 msgstr "Gaim - Cambiar Contraseña"
 
-#: src/dialogs.c:1240
+#: src/dialogs.c:1241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Crear Información del Usuario"
 
-#: src/dialogs.c:1384
+#: src/dialogs.c:1385
 msgid "Below are the results of your search: "
 msgstr "Siguientemente estan los resultados de su búsqueda: "
 
-#: src/dialogs.c:1531
+#: src/dialogs.c:1532
 msgid "Gaim - Add Permit/Deny"
 msgstr "Gaim - Agregar Autorizar/Negar"
 
-#: src/dialogs.c:1592
+#: src/dialogs.c:1593
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/dialogs.c:1737
+#: src/dialogs.c:1738
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Encontrar amgio por información"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1773
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: src/dialogs.c:1795
+#: src/dialogs.c:1796
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electrónico"
 
-#: src/dialogs.c:1866
+#: src/dialogs.c:1867
 msgid "URL"
 msgstr "Dirección"
 
-#: src/dialogs.c:1871
+#: src/dialogs.c:1872
 msgid "Description"
 msgstr "Descripción"
 
-#: src/dialogs.c:1893
+#: src/dialogs.c:1894
 msgid "GAIM - Add URL"
 msgstr "GAIM - Agregar dirección"
 
-#: src/dialogs.c:1958
+#: src/dialogs.c:1959
 msgid "Select Text Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2180 src/rvous.c:220
+#: src/dialogs.c:2181 src/rvous.c:220
 #, c-format
 msgid "Error writing file %s"
 msgstr "Error creando el archivo %s"
 
-#: src/dialogs.c:2197
+#: src/dialogs.c:2198
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Exportar lista de amigos"
 
-#: src/dialogs.c:2251 src/rvous.c:487
+#: src/dialogs.c:2252 src/rvous.c:487
 #, c-format
 msgid "Error reading file %s"
 msgstr "Error leyendo el archivo %s"
 
-#: src/dialogs.c:2317
+#: src/dialogs.c:2318
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar lista de amigos"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2393
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo mensaje de ausencia"
 
 #. Make a label for away entry
-#: src/dialogs.c:2402
+#: src/dialogs.c:2403
 msgid "Away title: "
 msgstr "Titulo del mensaje: "
 
 #. make create button
-#: src/dialogs.c:2424
+#: src/dialogs.c:2425
 msgid "Create new message"
 msgstr "Crear un nuevo mensaje"
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:2429
+#: src/dialogs.c:2430
 msgid "Make away now"
 msgstr "Hacerme ausente ahora"
 
@@ -993,7 +993,7 @@
 msgid "Connection established, cookie sent"
 msgstr "Conección establesida, cookie enviado"
 
-#: src/oscar.c:640
+#: src/oscar.c:636
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1005,305 +1005,318 @@
 "<BR>En línea desde : <B>%s</B><BR>Minutos Desocupados : <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/plugins.c:103
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista de aditivos"
 
-#: src/plugins.c:166 src/plugins.c:173 src/plugins.c:204
+#: src/plugins.c:156
+#, c-format
+msgid "Already loaded %s, not reloading.\n"
+msgstr ""
+
+#: src/plugins.c:179 src/plugins.c:186 src/plugins.c:217
 msgid "Plugin Error"
 msgstr "Error de aditivo"
 
-#: src/plugins.c:251
+#: src/plugins.c:264
 msgid "Gaim - Plugins"
 msgstr "Gaim - Aditivos"
 
-#: src/plugins.c:280
+#: src/plugins.c:293
 msgid "Load Plugin"
 msgstr "Usar Aditivo"
 
-#: src/plugins.c:285
+#: src/plugins.c:298
 msgid "Configure Plugin"
 msgstr "Configurar Aditivo"
 
-#: src/plugins.c:289
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr "Desocupar Aditivo"
 
-#: src/prefs.c:363
+#: src/prefs.c:358
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
-#: src/prefs.c:375
+#: src/prefs.c:370
 msgid "General"
 msgstr "General"
 
-#: src/prefs.c:380
+#: src/prefs.c:375
 msgid "Idle"
 msgstr "Desocupado"
 
-#: src/prefs.c:388
+#: src/prefs.c:383
 msgid "Enter sends message"
 msgstr "Enter manda el mensaje"
 
-#: src/prefs.c:389
+#: src/prefs.c:384
 msgid "Auto-login"
 msgstr "Auto-conectar"
 
-#: src/prefs.c:390
+#: src/prefs.c:385
 msgid "Log All Conversations"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:391
+#: src/prefs.c:386
 msgid "Strip HTML from log files"
 msgstr "Quitar HTML de todas las conversaciones guardadas"
 
-#: src/prefs.c:392
+#: src/prefs.c:387
 msgid "Raise windows when message recieved"
 msgstr "Alzar ventanas cuando un mensaje sea recibido"
 
-#: src/prefs.c:393
+#: src/prefs.c:388
 msgid "Raise chat windows when people speak"
 msgstr "Alzar ventana de conversación cuando alguien hable"
 
-#: src/prefs.c:394
+#: src/prefs.c:389
 msgid "Send URLs as links"
 msgstr "Mandar direcciones como enlaze"
 
-#: src/prefs.c:395
+#: src/prefs.c:390
 msgid "Show Lag-O-Meter"
 msgstr "Demuestre Indicador de Demora"
 
-#: src/prefs.c:396
+#: src/prefs.c:391
 msgid "Save some window size/positions"
 msgstr "Guardar algunas configuraciones de tamaño/posicion de ventanas"
 
-#: src/prefs.c:397
+#: src/prefs.c:392
 msgid "Ignore new conversations when away"
 msgstr "Ignorar nuevas conversaciones mientras este ausente"
 
-#: src/prefs.c:398
+#: src/prefs.c:393
 msgid "Automagically highlight misspelled words"
 msgstr "Automagicamente destaque las faltas de ortografía"
 
-#: src/prefs.c:399
+#: src/prefs.c:394
 msgid "Sending messages removes away status"
 msgstr "Mandando un mensaje quita el estado de ausente"
 
-#: src/prefs.c:402
+#: src/prefs.c:397
 msgid "Enable debug mode"
 msgstr "Usar el modo de debug"
 
-#: src/prefs.c:405
+#: src/prefs.c:400
 msgid "No Idle"
 msgstr "No desocupado"
 
-#: src/prefs.c:412
+#: src/prefs.c:407
 msgid "GAIM Use"
 msgstr "GAIM Usar"
 
-#: src/prefs.c:440
+#: src/prefs.c:435
 msgid "Applet"
 msgstr "Applet"
 
-#: src/prefs.c:447
+#: src/prefs.c:442
 msgid "Automatically Show Buddy List"
 msgstr "Automaticamente demuestre la lista de amigos"
 
-#: src/prefs.c:448
+#: src/prefs.c:443
 msgid "Sounds go through GNOME"
 msgstr "Sonidos pasan por GNOME"
 
-#: src/prefs.c:449
+#: src/prefs.c:444
 msgid "Buddy list displays near the applet"
 msgstr "Lista de amigos se demuestra cerca del applet"
 
-#: src/prefs.c:461
+#: src/prefs.c:455
 msgid "Connection"
 msgstr "Connección"
 
-#: src/prefs.c:466
+#: src/prefs.c:459
+msgid "Use Oscar Protocol (experimental; only takes effect before signon)"
+msgstr ""
+
+#: src/prefs.c:460
+msgid "The following options do not apply if you use Oscar."
+msgstr ""
+
+#: src/prefs.c:464
 msgid "TOC Host:"
 msgstr "Patrón TOC: "
 
-#: src/prefs.c:473 src/prefs.c:495 src/prefs.c:548
+#: src/prefs.c:471 src/prefs.c:493 src/prefs.c:546
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/prefs.c:488
+#: src/prefs.c:486
 msgid "Login Host:"
 msgstr "Patrón de Conección"
 
-#: src/prefs.c:509
+#: src/prefs.c:507
 msgid "No Proxy"
 msgstr "No Proxy"
 
-#: src/prefs.c:516
+#: src/prefs.c:514
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: src/prefs.c:524
+#: src/prefs.c:522
 msgid "SOCKS v4 Proxy"
 msgstr "Proxy SOCKS v4"
 
-#: src/prefs.c:532
+#: src/prefs.c:530
 msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 msgstr "Proxy SOCKS v5 (NO SIRVE!)"
 
-#: src/prefs.c:541
+#: src/prefs.c:539
 msgid "Proxy Host:"
 msgstr "Patrón Proxy:"
 
-#: src/prefs.c:628
+#: src/prefs.c:624
 msgid "Create Message"
 msgstr "Crear Mensaje"
 
-#: src/prefs.c:632
+#: src/prefs.c:628
 msgid "Remove Message"
 msgstr "Quitar Mensaje"
 
-#: src/prefs.c:671
+#: src/prefs.c:667
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/prefs.c:674
+#: src/prefs.c:670
 msgid "Sound when buddy logs in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:675
+#: src/prefs.c:671
 msgid "Sound when buddy logs out"
 msgstr "Sonido cuando un amigo se desconecte"
 
-#: src/prefs.c:676
+#: src/prefs.c:672
 msgid "Sound when message is received"
 msgstr "Sonido cuando un mensaje es recibido"
 
-#: src/prefs.c:677
+#: src/prefs.c:673
 msgid "Sound when message is sent"
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/prefs.c:678
+#: src/prefs.c:674
 msgid "Sound when first message is received"
 msgstr "Sonido cuando el primer mensaje es recibido"
 
-#: src/prefs.c:679
+#: src/prefs.c:675
 msgid "Sound when message is received if away"
 msgstr "Sonido cuando los mensajes son recibidos mientras esta ausente"
 
-#: src/prefs.c:680
+#: src/prefs.c:676
 msgid "No sound for buddies signed on when you log in"
 msgstr "No hay sonidos para amigos ya conectados cuando se conecta"
 
-#: src/prefs.c:681
+#: src/prefs.c:677
 msgid "Sounds in chat rooms when people enter/leave"
 msgstr "Sonidos en conversaciones cuando gente entra o sale"
 
-#: src/prefs.c:682
+#: src/prefs.c:678
 msgid "Sounds in chat rooms when people talk"
 msgstr "Sonidos en conversaciones cuando getne habla"
 
-#: src/prefs.c:689
+#: src/prefs.c:685
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/prefs.c:694
+#: src/prefs.c:690
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:701
+#: src/prefs.c:697
 msgid "KFM (The KDE browser)"
 msgstr "KFM (El Navegador de KDE)"
 
-#: src/prefs.c:709
+#: src/prefs.c:705
 msgid "Internal HTML widget (Quite likely a bad idea!)"
 msgstr "Programa de HTML Interno (Probablemente una idea mala!)"
 
-#: src/prefs.c:717
+#: src/prefs.c:713
 msgid "Manual"
 msgstr "Manual"
 
-#: src/prefs.c:731
+#: src/prefs.c:727
 msgid "Pop up new window by default"
 msgstr "Crear una nueva ventana por omisión"
 
-#: src/prefs.c:755
+#: src/prefs.c:751
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: src/prefs.c:759
+#: src/prefs.c:755
 msgid "Font Properties"
 msgstr "Propiedades del texto"
 
-#: src/prefs.c:766
+#: src/prefs.c:762
 msgid "Show time on messages"
 msgstr "Demostrar la hora de los mensajes"
 
-#: src/prefs.c:767
+#: src/prefs.c:763
 msgid "Show numbers in groups"
 msgstr "Demostrar los numeros en grupos"
 
-#: src/prefs.c:768
+#: src/prefs.c:764
 msgid "Show buddy-type pixmaps"
 msgstr "Demostrar dibujos de los tipos de amigos"
 
-#: src/prefs.c:769
+#: src/prefs.c:765
 msgid "Show idle times"
 msgstr "Demostrar el tiempo de inactividad de los amigos"
 
-#: src/prefs.c:770
+#: src/prefs.c:766
 msgid "Show button pixmaps"
 msgstr "Demostrar los dibujos en los botonoes"
 
-#: src/prefs.c:771
+#: src/prefs.c:767
 msgid "Ignore incoming colours"
 msgstr "Ignorar los colores de los amigos"
 
-#: src/prefs.c:775
+#: src/prefs.c:771
 msgid "Show logon/logoffs in conversation windows"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:776
+#: src/prefs.c:772
 msgid "Use devil icons"
 msgstr "Usar iconos de diablo"
 
-#: src/prefs.c:777
+#: src/prefs.c:773
 msgid "Show graphical smileys (experimental)"
 msgstr "Demostrar caritas gráficas (experimental)"
 
-#: src/prefs.c:782
+#: src/prefs.c:778
 msgid "Underlined Text"
 msgstr "Texto Subrayado"
 
-#: src/prefs.c:783
+#: src/prefs.c:779
 msgid "Strike Text"
 msgstr "Texto cruzado por una linea"
 
-#: src/prefs.c:784
+#: src/prefs.c:780
 msgid "Font Face for Text"
 msgstr "Tipo de texto"
 
-#: src/prefs.c:802
+#: src/prefs.c:798
 msgid "Buddy Chats"
 msgstr "Conversaciones con amigos"
 
-#: src/prefs.c:925 src/prefs.c:927 src/prefs.c:1057 src/prefs.c:1059
+#: src/prefs.c:921 src/prefs.c:923 src/prefs.c:1053 src/prefs.c:1055
 msgid "Gaim Chat"
 msgstr "Gaim Conversaciones"
 
-#: src/prefs.c:1000
+#: src/prefs.c:996
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/prefs.c:1031
+#: src/prefs.c:1027
 msgid "List of available chats"
 msgstr "Lista de conversaciones disponibles"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1041
 msgid "List of subscribed chats"
 msgstr "Lista de conversaciones subscritas"
 
-#: src/prefs.c:1102
+#: src/prefs.c:1098
 msgid "GAIM debug output window"
 msgstr "GAIM ventana de respuestas del programa"
 
--- a/po/fr.po	Fri Jun 23 19:05:11 2000 +0000
+++ b/po/fr.po	Fri Jun 23 19:13:04 2000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2000-06-13 22:26-0700\n"
+"POT-Creation-Date: 2000-06-23 10:39-0700\n"
 "PO-Revision-Date: 2000-06-13 22:26-0700\n"
 "Last-Translator: Seb Carpe\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +20,8 @@
 msgstr "A propos de GAIM v%s"
 
 #. color = gtk_button_new_with_label("Color");
-#: src/about.c:93 src/buddy.c:1766 src/buddy_chat.c:692
-#: src/conversation.c:1107 src/dialogs.c:436 src/plugins.c:294 src/prefs.c:808
+#: src/about.c:93 src/buddy.c:1764 src/buddy_chat.c:711
+#: src/conversation.c:1107 src/dialogs.c:434 src/plugins.c:307 src/prefs.c:807
 msgid "Close"
 msgstr "Fermer"
 
@@ -33,51 +33,51 @@
 msgid "You must give your password"
 msgstr "Vous devez indiquer votre mot de passe"
 
-#: src/aim.c:229 src/buddy.c:1761
+#: src/aim.c:230 src/buddy.c:1759
 msgid "Signoff"
 msgstr "Deconnection"
 
-#: src/aim.c:339 src/aim.c:546 src/buddy.c:369 src/gnome_applet_mgr.c:373
+#: src/aim.c:340 src/aim.c:546 src/buddy.c:369 src/gnome_applet_mgr.c:373
 msgid "Signon"
 msgstr "Connection"
 
-#: src/aim.c:340 src/buddy_chat.c:101 src/buddy_chat.c:176 src/dialogs.c:372
-#: src/dialogs.c:646 src/dialogs.c:762 src/dialogs.c:872 src/dialogs.c:1001
-#: src/dialogs.c:1132 src/dialogs.c:1203 src/dialogs.c:1291 src/dialogs.c:1483
-#: src/dialogs.c:1668 src/dialogs.c:1766 src/dialogs.c:1855 src/rvous.c:280
-#: src/rvous.c:415 src/rvous.c:636
+#: src/aim.c:341 src/buddy_chat.c:103 src/buddy_chat.c:178 src/dialogs.c:370
+#: src/dialogs.c:645 src/dialogs.c:761 src/dialogs.c:871 src/dialogs.c:1000
+#: src/dialogs.c:1130 src/dialogs.c:1201 src/dialogs.c:1289 src/dialogs.c:1478
+#: src/dialogs.c:1663 src/dialogs.c:1761 src/dialogs.c:1850 src/rvous.c:279
+#: src/rvous.c:414 src/rvous.c:633
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/aim.c:341 src/buddy.c:1758
+#: src/aim.c:342 src/buddy.c:1756
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: src/aim.c:342
+#: src/aim.c:343
 msgid "Options"
 msgstr "Options"
 
-#: src/aim.c:344 src/aim.c:552 src/buddy.c:1823
+#: src/aim.c:345 src/aim.c:552 src/buddy.c:1821
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:407
+#: src/aim.c:408
 msgid "Screen Name: "
 msgstr "Pseudonyme: "
 
-#: src/aim.c:410
+#: src/aim.c:411
 msgid "Password: "
 msgstr "Mot de Passe: "
 
-#: src/aim.c:413
+#: src/aim.c:414
 msgid "Remember Password"
 msgstr "Mémoriser le mot de passe"
 
-#: src/aim.c:460
+#: src/aim.c:461
 msgid "Gaim - Login"
 msgstr "Gaim - Connection"
 
-#: src/aim.c:541 src/buddy.c:1820
+#: src/aim.c:541 src/buddy.c:1818
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -107,29 +107,29 @@
 msgstr "%d/%d potes en ligne"
 
 #: src/buddy.c:273 src/buddy.c:278 src/buddy.c:281 src/buddy.c:286
-#: src/buddy.c:1920 src/buddy.c:1989 src/conversation.c:368
-#: src/conversation.c:1112 src/dialogs.c:763 src/dialogs.c:1484
-#: src/dialogs.c:1508 src/prefs.c:998
+#: src/buddy.c:1918 src/buddy.c:1987 src/conversation.c:368
+#: src/conversation.c:1112 src/dialogs.c:762 src/dialogs.c:1479
+#: src/dialogs.c:1503 src/prefs.c:997
 msgid "Add"
 msgstr "Ajouter"
 
 #: src/buddy.c:274 src/buddy.c:279 src/buddy.c:282 src/buddy.c:287
-#: src/buddy.c:1921 src/buddy.c:1990 src/conversation.c:1109 src/dialogs.c:710
-#: src/prefs.c:999
+#: src/buddy.c:1919 src/buddy.c:1988 src/conversation.c:1109 src/dialogs.c:709
+#: src/prefs.c:998
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/buddy.c:275 src/buddy.c:283 src/buddy.c:1869
+#: src/buddy.c:275 src/buddy.c:283 src/buddy.c:1867
 msgid "Chat"
 msgstr "Forum"
 
-#: src/buddy.c:276 src/buddy.c:284 src/buddy.c:437 src/buddy.c:1867
-#: src/buddy_chat.c:697
+#: src/buddy.c:276 src/buddy.c:284 src/buddy.c:437 src/buddy.c:1865
+#: src/buddy_chat.c:716
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:277 src/buddy.c:285 src/buddy.c:443 src/buddy.c:1868
-#: src/buddy_chat.c:699 src/conversation.c:1104 src/rvous.c:634
+#: src/buddy.c:277 src/buddy.c:285 src/buddy.c:443 src/buddy.c:1866
+#: src/buddy_chat.c:718 src/conversation.c:1104 src/rvous.c:631
 msgid "Info"
 msgstr "Info"
 
@@ -149,11 +149,11 @@
 msgid "Add Buddy Pounce"
 msgstr "Ajouter une Alerte"
 
-#: src/buddy.c:572 src/buddy.c:1020 src/buddy.c:2025 src/dialogs.c:1499
+#: src/buddy.c:572 src/buddy.c:1020 src/buddy.c:2023 src/dialogs.c:1494
 msgid "Permit"
 msgstr "Autoriser"
 
-#: src/buddy.c:588 src/dialogs.c:1494
+#: src/buddy.c:588 src/dialogs.c:1489
 msgid "Deny"
 msgstr "Interdire"
 
@@ -194,277 +194,277 @@
 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:1747
+#: src/buddy.c:1745
 msgid "File"
 msgstr "Fichier"
 
-#: src/buddy.c:1751
+#: src/buddy.c:1749
 msgid "Add A Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/buddy.c:1753
+#: src/buddy.c:1751
 msgid "Import Buddy List"
 msgstr "Importer une Liste de Potes"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1752
 msgid "Export Buddy List"
 msgstr "Exporter une Liste de Potes"
 
-#: src/buddy.c:1764
+#: src/buddy.c:1762
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1769
 msgid "Tools"
 msgstr "Outils"
 
-#: src/buddy.c:1776 src/gnome_applet_mgr.c:199 src/gnome_applet_mgr.c:284
-#: src/prefs.c:598
+#: src/buddy.c:1774 src/gnome_applet_mgr.c:199 src/gnome_applet_mgr.c:284
+#: src/prefs.c:597
 msgid "Away"
 msgstr "Absent"
 
-#: src/buddy.c:1781
+#: src/buddy.c:1779
 msgid "Buddy Pounce"
 msgstr "Alerte"
 
-#: src/buddy.c:1789
+#: src/buddy.c:1787
 msgid "Search for Buddy"
 msgstr "Rechercher un Pote"
 
-#: src/buddy.c:1792
+#: src/buddy.c:1790
 msgid "by Email"
 msgstr "Par son Email"
 
-#: src/buddy.c:1796
+#: src/buddy.c:1794
 msgid "by Dir Info"
 msgstr "Par ses Informations Personnelles"
 
-#: src/buddy.c:1803
+#: src/buddy.c:1801
 msgid "Settings"
 msgstr "Préférences"
 
-#: src/buddy.c:1806
+#: src/buddy.c:1804
 msgid "User Info"
 msgstr "Message d'Information"
 
-#: src/buddy.c:1810
+#: src/buddy.c:1808
 msgid "Directory Info"
 msgstr "Information Personnelle"
 
-#: src/buddy.c:1814
+#: src/buddy.c:1812
 msgid "Change Password"
 msgstr "Changer de Mot de Passe"
 
-#: src/buddy.c:1828
+#: src/buddy.c:1826
 msgid "Help"
 msgstr "Aide"
 
-#: src/buddy.c:1833
+#: src/buddy.c:1831
 msgid "About"
 msgstr "A propos..."
 
-#: src/buddy.c:1881
+#: src/buddy.c:1879
 msgid "Buddy List"
 msgstr "Liste de Potes"
 
-#: src/buddy.c:1904
+#: src/buddy.c:1902
 msgid "Information on selected Buddy"
 msgstr "Information sur le pote sélectionné"
 
-#: src/buddy.c:1905
+#: src/buddy.c:1903
 msgid "Send Instant Message"
 msgstr "Envoyer un message"
 
-#: src/buddy.c:1906
+#: src/buddy.c:1904
 msgid "Start/join a Buddy Chat"
 msgstr "Ouvrir/Rallier un Forum"
 
-#: src/buddy.c:1941
+#: src/buddy.c:1939
 msgid "Add a new Buddy"
 msgstr "Ajouter un Nouveau Pote"
 
-#: src/buddy.c:1942
+#: src/buddy.c:1940
 msgid "Remove selected Buddy"
 msgstr "Supprimer le Pote sélectionné"
 
-#: src/buddy.c:1965
+#: src/buddy.c:1963
 msgid "Allow anyone"
 msgstr "Autoriser tout le monde"
 
-#: src/buddy.c:1972
+#: src/buddy.c:1970
 msgid "Permit some"
 msgstr "Autoriser certains"
 
-#: src/buddy.c:1980
+#: src/buddy.c:1978
 msgid "Deny some"
 msgstr "Interdire certains"
 
-#: src/buddy.c:2001
+#: src/buddy.c:1999
 msgid "Add buddy to permit/deny"
 msgstr "Autoriser/Interdire des potes"
 
-#: src/buddy.c:2002
+#: src/buddy.c:2000
 msgid "Remove buddy from permit/deny"
 msgstr "Enlever des potes des Autorisations/Interdictions"
 
-#: src/buddy.c:2021
+#: src/buddy.c:2019
 msgid "Online"
 msgstr "En Ligne"
 
-#: src/buddy.c:2023
+#: src/buddy.c:2021
 msgid "Edit Buddies"
 msgstr "Editer ses amis"
 
-#: src/buddy.c:2072
+#: src/buddy.c:2070
 msgid "Gaim - Buddy List"
 msgstr "GAIM - Liste des Potes"
 
-#: src/buddy_chat.c:102
+#: src/buddy_chat.c:104
 msgid "Join"
 msgstr "Joindre"
 
-#: src/buddy_chat.c:112
+#: src/buddy_chat.c:114
 msgid "Join what group:"
 msgstr "Joindre le groupe: "
 
-#: src/buddy_chat.c:138
+#: src/buddy_chat.c:140
 msgid "Join Chat"
 msgstr "Rallier le forum"
 
-#: src/buddy_chat.c:177 src/buddy_chat.c:693
+#: src/buddy_chat.c:179 src/buddy_chat.c:712
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/buddy_chat.c:188
+#: src/buddy_chat.c:190
 msgid "Invite who?"
 msgstr "Inviter qui ?"
 
-#: src/buddy_chat.c:192
+#: src/buddy_chat.c:194
 msgid "With message:"
 msgstr "En utilisant le message:"
 
-#: src/buddy_chat.c:219
+#: src/buddy_chat.c:221
 msgid "Invite to Buddy Chat"
 msgstr "Inviter à un Forum"
 
-#: src/buddy_chat.c:694
+#: src/buddy_chat.c:713
 msgid "Whisper"
 msgstr "Murmurer"
 
-#: src/buddy_chat.c:695 src/conversation.c:1103 src/dialogs.c:1292
+#: src/buddy_chat.c:714 src/conversation.c:1103 src/dialogs.c:1290
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/buddy_chat.c:698
+#: src/buddy_chat.c:717
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: src/buddy_chat.c:784 src/conversation.c:1188
+#: src/buddy_chat.c:803 src/conversation.c:1188
 msgid "Bold"
 msgstr "Gras"
 
-#: src/buddy_chat.c:784 src/conversation.c:1188 src/prefs.c:777
+#: src/buddy_chat.c:803 src/conversation.c:1188 src/prefs.c:776
 msgid "Bold Text"
 msgstr "Texte en Gras"
 
-#: src/buddy_chat.c:788 src/buddy_chat.c:789 src/conversation.c:1192
+#: src/buddy_chat.c:807 src/buddy_chat.c:808 src/conversation.c:1192
 #: src/conversation.c:1193
 msgid "Italics"
 msgstr "Italique"
 
-#: src/buddy_chat.c:788 src/conversation.c:1192 src/prefs.c:778
+#: src/buddy_chat.c:807 src/conversation.c:1192 src/prefs.c:777
 msgid "Italics Text"
 msgstr "Texte en Italique"
 
-#: src/buddy_chat.c:792 src/buddy_chat.c:793 src/conversation.c:1196
+#: src/buddy_chat.c:811 src/buddy_chat.c:812 src/conversation.c:1196
 #: src/conversation.c:1197
 msgid "Underline"
 msgstr "Souligné"
 
-#: src/buddy_chat.c:792 src/conversation.c:1196
+#: src/buddy_chat.c:811 src/conversation.c:1196
 msgid "Underline Text"
 msgstr "Texte Souligné"
 
-#: src/buddy_chat.c:796 src/buddy_chat.c:797 src/conversation.c:1200
+#: src/buddy_chat.c:815 src/buddy_chat.c:816 src/conversation.c:1200
 #: src/conversation.c:1201
 msgid "Strike"
 msgstr "Barré"
 
-#: src/buddy_chat.c:796 src/conversation.c:1200
+#: src/buddy_chat.c:815 src/conversation.c:1200
 msgid "Strike through Text"
 msgstr "Texte Barré"
 
-#: src/buddy_chat.c:799 src/conversation.c:1203
+#: src/buddy_chat.c:818 src/conversation.c:1203
 msgid "Small"
 msgstr "Petit"
 
-#: src/buddy_chat.c:799 src/conversation.c:1203
+#: src/buddy_chat.c:818 src/conversation.c:1203
 msgid "Decrease font size"
 msgstr "Fonte plus Petite"
 
-#: src/buddy_chat.c:800 src/conversation.c:1204
+#: src/buddy_chat.c:819 src/conversation.c:1204
 msgid "Normal"
 msgstr "Normal"
 
-#: src/buddy_chat.c:800 src/conversation.c:1204
+#: src/buddy_chat.c:819 src/conversation.c:1204
 msgid "Normal font size"
 msgstr "Fonte Normale"
 
-#: src/buddy_chat.c:801 src/conversation.c:1205
+#: src/buddy_chat.c:820 src/conversation.c:1205
 msgid "Big"
 msgstr "Grand"
 
-#: src/buddy_chat.c:801 src/conversation.c:1205
+#: src/buddy_chat.c:820 src/conversation.c:1205
 msgid "Increase font size"
 msgstr "Fonte plus Grande"
 
-#: src/buddy_chat.c:804 src/buddy_chat.c:805 src/conversation.c:1208
+#: src/buddy_chat.c:823 src/buddy_chat.c:824 src/conversation.c:1208
 #: src/conversation.c:1209
 msgid "Font"
 msgstr "Fonte"
 
-#: src/buddy_chat.c:804 src/conversation.c:1208 src/dialogs.c:2080
-#: src/dialogs.c:2099 src/prefs.c:783
+#: src/buddy_chat.c:823 src/conversation.c:1208 src/dialogs.c:2075
+#: src/dialogs.c:2094 src/prefs.c:782
 msgid "Select Font"
 msgstr "Sectionner une fonte"
 
-#: src/buddy_chat.c:810 src/buddy_chat.c:811 src/conversation.c:1216
+#: src/buddy_chat.c:829 src/buddy_chat.c:830 src/conversation.c:1216
 #: src/conversation.c:1217
 msgid "Link"
 msgstr "Lien"
 
-#: src/buddy_chat.c:810 src/conversation.c:1216
+#: src/buddy_chat.c:829 src/conversation.c:1216
 msgid "Insert Link"
 msgstr "Insérer un Lien"
 
-#: src/buddy_chat.c:814 src/buddy_chat.c:815 src/conversation.c:1220
+#: src/buddy_chat.c:833 src/buddy_chat.c:834 src/conversation.c:1220
 #: src/conversation.c:1221
 msgid "Color"
 msgstr "Couleur"
 
-#: src/buddy_chat.c:814 src/conversation.c:1220
+#: src/buddy_chat.c:833 src/conversation.c:1220
 msgid "Text Color"
 msgstr "Couleur de texte"
 
-#: src/buddy_chat.c:819 src/buddy_chat.c:820 src/conversation.c:1224
+#: src/buddy_chat.c:838 src/buddy_chat.c:839 src/conversation.c:1224
 #: src/conversation.c:1225
 msgid "Logging"
 msgstr "Connection"
 
-#: src/buddy_chat.c:819 src/conversation.c:1224
+#: src/buddy_chat.c:838 src/conversation.c:1224
 msgid "Enable logging"
 msgstr "Activer la Connection"
 
-#: src/buddy_chat.c:825 src/buddy_chat.c:826 src/conversation.c:1228
+#: src/buddy_chat.c:844 src/buddy_chat.c:845 src/conversation.c:1228
 #: src/conversation.c:1229
 msgid "Sound"
 msgstr "Son"
 
-#: src/buddy_chat.c:825 src/conversation.c:1228
+#: src/buddy_chat.c:844 src/conversation.c:1228
 msgid "Enable sounds"
 msgstr "Activer le son"
 
-#: src/buddy_chat.c:977 src/buddy_chat.c:989
+#: src/buddy_chat.c:996 src/buddy_chat.c:1008
 msgid "Buddy Chat"
 msgstr "Forum"
 
@@ -477,8 +477,8 @@
 msgid "Message too long, some data truncated."
 msgstr "Message trop long, données tronquées"
 
-#: src/conversation.c:500 src/dialogs.c:2187 src/dialogs.c:2258
-#: src/rvous.c:222 src/rvous.c:491
+#: src/conversation.c:500 src/dialogs.c:2182 src/dialogs.c:2253
+#: src/rvous.c:221 src/rvous.c:488
 msgid "Error"
 msgstr "Erreur"
 
@@ -492,7 +492,7 @@
 msgid "Setting position to %d\n"
 msgstr "Positionné à %d\n"
 
-#: src/conversation.c:1105 src/dialogs.c:373 src/rvous.c:635
+#: src/conversation.c:1105 src/dialogs.c:371 src/rvous.c:632
 msgid "Warn"
 msgstr "Donner un Avertissement"
 
@@ -500,360 +500,363 @@
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/dialogs.c:197
+#: src/dialogs.c:195
 msgid "Error Resolving Mail Server.\n"
 msgstr "Erreur à la résolution du serveur de mail\n"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:201
 msgid "Error Connecting to Socket.\n"
 msgstr "Erreur à la connection socket\n"
 
-#: src/dialogs.c:381
+#: src/dialogs.c:379
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Voulez-vous réellement donner un avertissement à %s?"
 
-#: src/dialogs.c:385
+#: src/dialogs.c:383
 msgid "Warn anonymously?"
 msgstr "Donner un avertissement anonyme?"
 
-#: src/dialogs.c:388
+#: src/dialogs.c:386
 msgid "Anonymous warnings are less harsh."
 msgstr "Les avertissements anonymes sont moins durs."
 
-#: src/dialogs.c:409
+#: src/dialogs.c:407
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Donner un Avertissement?"
 
-#: src/dialogs.c:483
+#: src/dialogs.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossible d'ecrire dans le fichier %s."
 
-#: src/dialogs.c:486
+#: src/dialogs.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossible de lire le fichier %s."
 
-#: src/dialogs.c:489
+#: src/dialogs.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message trop long, perte des %d derniers octets."
 
-#: src/dialogs.c:492
+#: src/dialogs.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s n'est pas en ligne."
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Les Avertissements à %s ne sont pas permis."
 
-#: src/dialogs.c:498
+#: src/dialogs.c:497
 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:501
+#: src/dialogs.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Le forum %s est inaccessible."
 
-#: src/dialogs.c:504
+#: src/dialogs.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Vous envoyez vos messages trop vite à %s."
 
-#: src/dialogs.c:507
+#: src/dialogs.c:506
 #, 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 :))."
+msgstr ""
+"Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
 
-#: src/dialogs.c:510
+#: src/dialogs.c:509
 #, 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:513
+#: src/dialogs.c:512
 msgid "Failure."
 msgstr "Echec"
 
-#: src/dialogs.c:516
+#: src/dialogs.c:515
 msgid "Too many matches."
 msgstr "Trop de réponses"
 
-#: src/dialogs.c:519
+#: src/dialogs.c:518
 msgid "Need more qualifiers."
 msgstr "Besoin de plus de critères."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Le repertoire est temporairement indisponible."
 
-#: src/dialogs.c:525
+#: src/dialogs.c:524
 msgid "Email lookup restricted."
 msgstr "La recherche par Email est restreinte."
 
-#: src/dialogs.c:528
+#: src/dialogs.c:527
 msgid "Keyword ignored."
 msgstr "Mot clé ignoré."
 
-#: src/dialogs.c:531
+#: src/dialogs.c:530
 msgid "No keywords."
 msgstr "Pas de mot-clé."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:533
 msgid "User has no directory information."
 msgstr "L'utilisateur n'a pas d'information personnelle."
 
-#: src/dialogs.c:538
+#: src/dialogs.c:537
 msgid "Country not supported."
 msgstr "Pays non supporté."
 
-#: src/dialogs.c:541
+#: src/dialogs.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Echec inconnu: %s."
 
-#: src/dialogs.c:544
+#: src/dialogs.c:543
 msgid "Incorrect nickname or password."
 msgstr "Pseudonye ou Mot de Passe incorrect."
 
-#: src/dialogs.c:547
+#: src/dialogs.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Le service est termporairement indisponible."
 
-#: src/dialogs.c:550
+#: src/dialogs.c:549
 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"
+msgstr ""
+"Votre niveau d'avertissement est actuellement trop élevé pour que vous "
+"puissiez vous connecter"
 
-#: src/dialogs.c:553
+#: src/dialogs.c:552
 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 ""
-"Vous vous êtes connecté/déconnecté trop freéquemment. Attendez 10 minutes et"
-"Réessayez. Si vous continuez d'essayer, il vous faudra attendre encore plus "
-"longtemps."
+"Vous vous êtes connecté/déconnecté trop freéquemment. Attendez 10 minutes "
+"etRéessayez. Si vous continuez d'essayer, il vous faudra attendre encore "
+"plus longtemps."
 
-#: src/dialogs.c:556
+#: src/dialogs.c:555
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Une erreur inconnue est survenue à la connection: %s."
 
-#: src/dialogs.c:559
+#: src/dialogs.c:558
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Une erreur inconnue, %d, s'est produite. Info:%s"
 
-#: src/dialogs.c:562
+#: src/dialogs.c:561
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - Erreur %d"
 
-#: src/dialogs.c:602 src/dialogs.c:647 src/dialogs.c:873 src/dialogs.c:1384
-#: src/dialogs.c:1669 src/dialogs.c:1767
+#: src/dialogs.c:601 src/dialogs.c:646 src/dialogs.c:872 src/dialogs.c:1379
+#: src/dialogs.c:1664 src/dialogs.c:1762
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:656
+#: src/dialogs.c:655
 msgid "IM who: "
 msgstr "Envoyer un message à qui: "
 
-#: src/dialogs.c:682
+#: src/dialogs.c:681
 msgid "Gaim - IM user"
 msgstr "Gaim - IM Utilisateur"
 
-#: src/dialogs.c:734
+#: src/dialogs.c:733
 msgid "Buddies"
 msgstr "Potes"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:777
 msgid "Add Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/dialogs.c:780
+#: src/dialogs.c:779
 msgid "Buddy"
 msgstr "Pote"
 
-#: src/dialogs.c:787
+#: src/dialogs.c:786
 msgid "Group"
 msgstr "Groupe"
 
-#: src/dialogs.c:817
+#: src/dialogs.c:816
 msgid "Gaim - Add Buddy"
 msgstr "GAIM - Ajouter un Pote"
 
-#: src/dialogs.c:883
+#: src/dialogs.c:882
 msgid "Buddy To Pounce:"
 msgstr "Pote à attendre:"
 
-#: src/dialogs.c:888
+#: src/dialogs.c:887
 msgid "Open IM Window on Buddy Logon"
 msgstr "Ouvrir la fenetre des messages à la connection"
 
-#: src/dialogs.c:891
+#: src/dialogs.c:890
 msgid "Send IM on Buddy Logon"
 msgstr "Envoyer un message à la connection"
 
-#: src/dialogs.c:899
+#: src/dialogs.c:898
 msgid "Message to send:"
 msgstr "Message à envoyer"
 
-#: src/dialogs.c:926
+#: src/dialogs.c:925
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nouvelle Alerte"
 
-#: src/dialogs.c:1002 src/dialogs.c:1204
+#: src/dialogs.c:1001 src/dialogs.c:1202
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/dialogs.c:1024
+#: src/dialogs.c:1023
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Autoriser les recherches sur le web à trouver vos informations"
 
-#: src/dialogs.c:1026 src/dialogs.c:1686
+#: src/dialogs.c:1025 src/dialogs.c:1681
 msgid "First Name"
 msgstr "Prénom"
 
-#: src/dialogs.c:1031 src/dialogs.c:1691
+#: src/dialogs.c:1030 src/dialogs.c:1686
 msgid "Middle Name"
 msgstr "Surnom"
 
-#: src/dialogs.c:1036 src/dialogs.c:1696
+#: src/dialogs.c:1035 src/dialogs.c:1691
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/dialogs.c:1041 src/dialogs.c:1701
+#: src/dialogs.c:1040 src/dialogs.c:1696
 msgid "Maiden Name"
 msgstr "Nom de jeune-fille"
 
-#: src/dialogs.c:1046 src/dialogs.c:1706
+#: src/dialogs.c:1045 src/dialogs.c:1701
 msgid "City"
 msgstr "Ville"
 
-#: src/dialogs.c:1051 src/dialogs.c:1711
+#: src/dialogs.c:1050 src/dialogs.c:1706
 msgid "State"
 msgstr "Etat"
 
-#: src/dialogs.c:1056 src/dialogs.c:1716
+#: src/dialogs.c:1055 src/dialogs.c:1711
 msgid "Country"
 msgstr "Pays"
 
-#: src/dialogs.c:1087
+#: src/dialogs.c:1086
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Donner vos informations personnelles"
 
-#: src/dialogs.c:1105
+#: src/dialogs.c:1103
 msgid "New Passwords Do Not Match"
 msgstr "Les nouveaux password diffèrent"
 
-#: src/dialogs.c:1105 src/dialogs.c:1110
+#: src/dialogs.c:1103 src/dialogs.c:1108
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Erreur au changement de Mot de Passe"
 
-#: src/dialogs.c:1110
+#: src/dialogs.c:1108
 msgid "Fill out all fields completely"
 msgstr "Remplissez tous les champs"
 
-#: src/dialogs.c:1131 src/dialogs.c:1856
+#: src/dialogs.c:1129 src/dialogs.c:1851
 msgid "Ok"
 msgstr "Ok"
 
-#: src/dialogs.c:1141
+#: src/dialogs.c:1139
 msgid "Original Password"
 msgstr "Mot de Passe courrant"
 
-#: src/dialogs.c:1149
+#: src/dialogs.c:1147
 msgid "New Password"
 msgstr "Nouveau Mot de Passe"
 
-#: src/dialogs.c:1157
+#: src/dialogs.c:1155
 msgid "New Password (again)"
 msgstr "Nouveau Mot de passe (confirmation)"
 
-#: src/dialogs.c:1180
+#: src/dialogs.c:1178
 msgid "Gaim - Password Change"
 msgstr "Gaim - Changement de mot de passe"
 
-#: src/dialogs.c:1243
+#: src/dialogs.c:1241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Message d'information"
 
-#: src/dialogs.c:1390
+#: src/dialogs.c:1385
 msgid "Below are the results of your search: "
 msgstr "Résultats de votre recherche: "
 
-#: src/dialogs.c:1537
+#: src/dialogs.c:1532
 msgid "Gaim - Add Permit/Deny"
 msgstr "Gaim - Ajouter des autorisation/Permission"
 
-#: src/dialogs.c:1598
+#: src/dialogs.c:1593
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/dialogs.c:1743
+#: src/dialogs.c:1738
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - trouver un pote d'après ses Infos."
 
-#: src/dialogs.c:1778
+#: src/dialogs.c:1773
 msgid "Email"
 msgstr "Email"
 
-#: src/dialogs.c:1801
+#: src/dialogs.c:1796
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Trouver un ami d'après son Email"
 
-#: src/dialogs.c:1872
+#: src/dialogs.c:1867
 msgid "URL"
 msgstr "Site Web"
 
-#: src/dialogs.c:1877
+#: src/dialogs.c:1872
 msgid "Description"
 msgstr "Description"
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:1894
 msgid "GAIM - Add URL"
 msgstr "Gaim - Ajouter un site Web"
 
-#: src/dialogs.c:1964
+#: src/dialogs.c:1959
 msgid "Select Text Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2186 src/rvous.c:221
+#: src/dialogs.c:2181 src/rvous.c:220
 #, c-format
 msgid "Error writing file %s"
 msgstr "Erreur à l'écriture du fichier %s"
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2198
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Exporter la liste de Potes"
 
-#: src/dialogs.c:2257 src/rvous.c:490
+#: src/dialogs.c:2252 src/rvous.c:487
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erreur à la lecture du fichier %s"
 
-#: src/dialogs.c:2323
+#: src/dialogs.c:2318
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importer la liste de Potes"
 
-#: src/dialogs.c:2398
+#: src/dialogs.c:2393
 msgid "Gaim - New away message"
 msgstr "Gaim - Nouveau message d'absence"
 
 #. Make a label for away entry
-#: src/dialogs.c:2408
+#: src/dialogs.c:2403
 msgid "Away title: "
 msgstr "Intitulé: "
 
 #. make create button
-#: src/dialogs.c:2430
+#: src/dialogs.c:2425
 msgid "Create new message"
 msgstr "Créer un nouveau message"
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:2435
+#: src/dialogs.c:2430
 msgid "Make away now"
 msgstr "Etre absent maintenant"
 
@@ -991,7 +994,7 @@
 msgid "Connection established, cookie sent"
 msgstr "Connection établie, cookie envoyé"
 
-#: src/oscar.c:641
+#: src/oscar.c:636
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1003,303 +1006,316 @@
 "<BR>En Ligne depuis : <B>%s</B><BR>Minutes d'inactivité : <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/plugins.c:103
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Liste des Plugins"
 
-#: src/plugins.c:166 src/plugins.c:173 src/plugins.c:204
+#: src/plugins.c:156
+#, c-format
+msgid "Already loaded %s, not reloading.\n"
+msgstr ""
+
+#: src/plugins.c:179 src/plugins.c:186 src/plugins.c:217
 msgid "Plugin Error"
 msgstr "Erreur de Plugin"
 
-#: src/plugins.c:251
+#: src/plugins.c:264
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
-#: src/plugins.c:280
+#: src/plugins.c:293
 msgid "Load Plugin"
 msgstr "Charger le Plugin"
 
-#: src/plugins.c:285
+#: src/plugins.c:298
 msgid "Configure Plugin"
 msgstr "Configurer le Plugin"
 
-#: src/plugins.c:289
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr "Décharger le Plugin"
 
-#: src/prefs.c:360
+#: src/prefs.c:358
 msgid "Gaim - Preferences"
 msgstr "Gaim - Préférences"
 
-#: src/prefs.c:372
+#: src/prefs.c:370
 msgid "General"
 msgstr "Génerale"
 
-#: src/prefs.c:377
+#: src/prefs.c:375
 msgid "Idle"
 msgstr "Inactivité"
 
-#: src/prefs.c:385
+#: src/prefs.c:383
 msgid "Enter sends message"
 msgstr "Entrer les messages envoyés"
 
-#: src/prefs.c:386
+#: src/prefs.c:384
 msgid "Auto-login"
 msgstr "Connection automatique"
 
-#: src/prefs.c:387
+#: src/prefs.c:385
 msgid "Log All Conversations"
 msgstr "Tracer toutes les conversations"
 
-#: src/prefs.c:388
+#: src/prefs.c:386
 msgid "Strip HTML from log files"
 msgstr "Enlever l'HTML des traces"
 
-#: src/prefs.c:389
+#: src/prefs.c:387
 msgid "Raise windows when message recieved"
 msgstr "Avancer les fenêtres recevant un message"
 
-#: src/prefs.c:390
+#: src/prefs.c:388
 msgid "Raise chat windows when people speak"
 msgstr "Avancer les fenêtres de forum quand les personnes parlent"
 
-#: src/prefs.c:391
+#: src/prefs.c:389
 msgid "Send URLs as links"
 msgstr "Envoyer les URL comme des liens cliquables"
 
-#: src/prefs.c:392
+#: src/prefs.c:390
 msgid "Show Lag-O-Meter"
 msgstr "Afficher le Lag-O-Metre"
 
-#: src/prefs.c:393
+#: src/prefs.c:391
 msgid "Save some window size/positions"
 msgstr "Mémoriser la taille et la position de certaines fenetres"
 
-#: src/prefs.c:394
+#: src/prefs.c:392
 msgid "Ignore new conversations when away"
 msgstr "Ignorer les nouveaux forums lors des absences"
 
-#: src/prefs.c:395
+#: src/prefs.c:393
 msgid "Automagically highlight misspelled words"
 msgstr "Surligner automagiquement les mots mal orthographiés"
 
-#: src/prefs.c:396
+#: src/prefs.c:394
 msgid "Sending messages removes away status"
 msgstr "L'envoi de message supprime le statut d'absence"
 
-#: src/prefs.c:399
+#: src/prefs.c:397
 msgid "Enable debug mode"
 msgstr "Activer le mode de debug"
 
-#: src/prefs.c:402
+#: src/prefs.c:400
 msgid "No Idle"
 msgstr "Actif"
 
-#: src/prefs.c:409
+#: src/prefs.c:407
 msgid "GAIM Use"
 msgstr "Utilisation de GAIM"
 
-#: src/prefs.c:437
+#: src/prefs.c:435
 msgid "Applet"
 msgstr "Applet"
 
-#: src/prefs.c:444
+#: src/prefs.c:442
 msgid "Automatically Show Buddy List"
 msgstr "Afficher la liste des potes automagiquement"
 
-#: src/prefs.c:445
+#: src/prefs.c:443
 msgid "Sounds go through GNOME"
 msgstr "Les sons sont envoyés à GNOME"
 
-#: src/prefs.c:446
+#: src/prefs.c:444
 msgid "Buddy list displays near the applet"
 msgstr "La liste des potes disparait près de l'applet"
 
-#: src/prefs.c:458
+#: src/prefs.c:455
 msgid "Connection"
 msgstr "Connection"
 
-#: src/prefs.c:463
+#: src/prefs.c:459
+msgid "Use Oscar Protocol (experimental; only takes effect before signon)"
+msgstr ""
+
+#: src/prefs.c:460
+msgid "The following options do not apply if you use Oscar."
+msgstr ""
+
+#: src/prefs.c:464
 msgid "TOC Host:"
 msgstr "Serveur TOC:"
 
-#: src/prefs.c:470 src/prefs.c:492 src/prefs.c:545
+#: src/prefs.c:471 src/prefs.c:493 src/prefs.c:546
 msgid "Port:"
 msgstr "Port:"
 
-#: src/prefs.c:485
+#: src/prefs.c:486
 msgid "Login Host:"
 msgstr "Connection au serveur:"
 
-#: src/prefs.c:506
+#: src/prefs.c:507
 msgid "No Proxy"
 msgstr "Pas de proxy"
 
-#: src/prefs.c:513
+#: src/prefs.c:514
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: src/prefs.c:521
+#: src/prefs.c:522
 msgid "SOCKS v4 Proxy"
 msgstr "Proxy SOCKS v4"
 
-#: src/prefs.c:529
+#: src/prefs.c:530
 msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 msgstr "Proxy SOCKS v5 (NE MARCHE PAS!)"
 
-#: src/prefs.c:538
+#: src/prefs.c:539
 msgid "Proxy Host:"
 msgstr "Proxy"
 
-#: src/prefs.c:625
+#: src/prefs.c:624
 msgid "Create Message"
 msgstr "Créer un Message"
 
-#: src/prefs.c:629
+#: src/prefs.c:628
 msgid "Remove Message"
 msgstr "Enlever un message"
 
-#: src/prefs.c:668
+#: src/prefs.c:667
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/prefs.c:671
+#: src/prefs.c:670
 msgid "Sound when buddy logs in"
 msgstr "Son quand vos potes se connectent"
 
-#: src/prefs.c:672
+#: src/prefs.c:671
 msgid "Sound when buddy logs out"
 msgstr "Son quand vos potes se déconnectent"
 
-#: src/prefs.c:673
+#: src/prefs.c:672
 msgid "Sound when message is received"
 msgstr "Son à la reception d'un message"
 
-#: src/prefs.c:674
+#: src/prefs.c:673
 msgid "Sound when message is sent"
 msgstr "Son à l'envoi d'un message"
 
-#: src/prefs.c:675
+#: src/prefs.c:674
 msgid "Sound when first message is received"
 msgstr "Son à la reception du premier message"
 
-#: src/prefs.c:676
+#: src/prefs.c:675
 msgid "Sound when message is received if away"
 msgstr "Son lors de la reception d'un message pendant une absence"
 
-#: src/prefs.c:677
+#: src/prefs.c:676
 msgid "No sound for buddies signed on when you log in"
 msgstr "Pas de son pour les potes déjà connecté lorsque vous vous connectez"
 
-#: src/prefs.c:678
+#: src/prefs.c:677
 msgid "Sounds in chat rooms when people enter/leave"
 msgstr "Son lorsque les personnes entrent/sortent d'un forum"
 
-#: src/prefs.c:679
+#: src/prefs.c:678
 msgid "Sounds in chat rooms when people talk"
 msgstr "Son lorsque els personnes parlent dnas un forum"
 
-#: src/prefs.c:686
+#: src/prefs.c:685
 msgid "Browser"
 msgstr "Navigateur"
 
-#: src/prefs.c:691
+#: src/prefs.c:690
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:698
+#: src/prefs.c:697
 msgid "KFM (The KDE browser)"
 msgstr "KFM (Le Navigateur KDE1)"
 
-#: src/prefs.c:706
+#: src/prefs.c:705
 msgid "Internal HTML widget (Quite likely a bad idea!)"
 msgstr "Support HTML Interne (plutot une mauvaise idée!)"
 
-#: src/prefs.c:714
+#: src/prefs.c:713
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/prefs.c:728
+#: src/prefs.c:727
 msgid "Pop up new window by default"
 msgstr "Afficher une nouvelle fenêtre par défaut"
 
-#: src/prefs.c:752
+#: src/prefs.c:751
 msgid "Appearance"
 msgstr "Apparance"
 
-#: src/prefs.c:756
+#: src/prefs.c:755
 msgid "Font Properties"
 msgstr "Propriété de la fonte"
 
-#: src/prefs.c:763
+#: src/prefs.c:762
 msgid "Show time on messages"
 msgstr "Afficher l'heure su les messages"
 
-#: src/prefs.c:764
+#: src/prefs.c:763
 msgid "Show numbers in groups"
 msgstr "Afficher le nombre dans les groupes"
 
-#: src/prefs.c:765
+#: src/prefs.c:764
 msgid "Show buddy-type pixmaps"
 msgstr "afficher les images des potes"
 
-#: src/prefs.c:766
+#: src/prefs.c:765
 msgid "Show idle times"
 msgstr "Afficher les temps d'inactivité"
 
-#: src/prefs.c:767
+#: src/prefs.c:766
 msgid "Show button pixmaps"
 msgstr "Afficher les images sur les boutons"
 
-#: src/prefs.c:768
+#: src/prefs.c:767
 msgid "Ignore incoming colours"
 msgstr "Ignorer les couleurs envoyées"
 
-#: src/prefs.c:772
+#: src/prefs.c:771
 msgid "Show logon/logoffs in conversation windows"
 msgstr "Afficher les (dé)connection dans la fenetre de forum"
 
-#: src/prefs.c:773
+#: src/prefs.c:772
 msgid "Use devil icons"
 msgstr "utiliser des icones diaboliques"
 
-#: src/prefs.c:774
+#: src/prefs.c:773
 msgid "Show graphical smileys (experimental)"
 msgstr "Afficher graphiquement les smileys (expérimental)"
 
-#: src/prefs.c:779
+#: src/prefs.c:778
 msgid "Underlined Text"
 msgstr "Texte Souligné"
 
-#: src/prefs.c:780
+#: src/prefs.c:779
 msgid "Strike Text"
 msgstr "Texte barré"
 
-#: src/prefs.c:781
+#: src/prefs.c:780
 msgid "Font Face for Text"
 msgstr "Fonte pour le Texte"
 
-#: src/prefs.c:799
+#: src/prefs.c:798
 msgid "Buddy Chats"
 msgstr "Forums"
 
-#: src/prefs.c:922 src/prefs.c:924 src/prefs.c:1054 src/prefs.c:1056
+#: src/prefs.c:921 src/prefs.c:923 src/prefs.c:1053 src/prefs.c:1055
 msgid "Gaim Chat"
 msgstr "Forum Gaim"
 
-#: src/prefs.c:997
+#: src/prefs.c:996
 msgid "Refresh"
 msgstr "Rafraichir"
 
-#: src/prefs.c:1028
+#: src/prefs.c:1027
 msgid "List of available chats"
 msgstr "Liste des forums disponibles"
 
-#: src/prefs.c:1042
+#: src/prefs.c:1041
 msgid "List of subscribed chats"
 msgstr "Liste des forums souscrits"
 
-#: src/prefs.c:1099
+#: src/prefs.c:1098
 msgid "GAIM debug output window"
 msgstr "fenetre de debug GAIM"
 
@@ -1307,34 +1323,34 @@
 msgid "Gaim - Save As..."
 msgstr "Gaim - Enregistrer sous..."
 
-#: src/rvous.c:270
+#: src/rvous.c:269
 #, c-format
 msgid "Receiving %s from %s"
 msgstr "Reception de %s en provenance de %s"
 
-#: src/rvous.c:284 src/rvous.c:419
+#: src/rvous.c:283 src/rvous.c:418
 msgid "Gaim - File Transfer"
 msgstr "Gaim - Transfert de fichier"
 
-#: src/rvous.c:405
+#: src/rvous.c:404
 #, c-format
 msgid "Sending %s to %s"
 msgstr "Envoi de %s à %s"
 
-#: src/rvous.c:633
+#: src/rvous.c:630
 msgid "Accept"
 msgstr "Accepter"
 
-#: src/rvous.c:652
+#: src/rvous.c:649
 #, 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:655
+#: src/rvous.c:652
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s vous demande de leur envoyer un fichier"
 
-#: src/rvous.c:665
+#: src/rvous.c:662
 msgid "Gaim - File Transfer?"
 msgstr "Gaim - Transfert de fichier?"
--- a/po/ko.po	Fri Jun 23 19:05:11 2000 +0000
+++ b/po/ko.po	Fri Jun 23 19:13:04 2000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-16 19:04-0700\n"
+"POT-Creation-Date: 2000-06-23 10:39-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"
@@ -21,8 +21,8 @@
 msgstr "GAIM v%s ¿¡ ´ëÇÏ¿©"
 
 #. color = gtk_button_new_with_label("Color");
-#: src/about.c:93 src/buddy.c:1766 src/buddy_chat.c:711
-#: src/conversation.c:1107 src/dialogs.c:434 src/plugins.c:294 src/prefs.c:811
+#: src/about.c:93 src/buddy.c:1764 src/buddy_chat.c:711
+#: src/conversation.c:1107 src/dialogs.c:434 src/plugins.c:307 src/prefs.c:807
 msgid "Close"
 msgstr "´Ý±â"
 
@@ -34,51 +34,51 @@
 msgid "You must give your password"
 msgstr "Æнº¿öµå¸¦ ÀÔ·ÂÇϼž߸¸ ÇÕ´Ï´Ù"
 
-#: src/aim.c:229 src/buddy.c:1761
+#: src/aim.c:230 src/buddy.c:1759
 msgid "Signoff"
 msgstr "²÷±â"
 
-#: src/aim.c:339 src/aim.c:545 src/buddy.c:369 src/gnome_applet_mgr.c:373
+#: src/aim.c:340 src/aim.c:546 src/buddy.c:369 src/gnome_applet_mgr.c:373
 msgid "Signon"
 msgstr "¿¬°á"
 
-#: src/aim.c:340 src/buddy_chat.c:103 src/buddy_chat.c:178 src/dialogs.c:370
-#: src/dialogs.c:644 src/dialogs.c:760 src/dialogs.c:870 src/dialogs.c:999
-#: src/dialogs.c:1129 src/dialogs.c:1200 src/dialogs.c:1288 src/dialogs.c:1477
-#: src/dialogs.c:1662 src/dialogs.c:1760 src/dialogs.c:1849 src/rvous.c:279
+#: src/aim.c:341 src/buddy_chat.c:103 src/buddy_chat.c:178 src/dialogs.c:370
+#: src/dialogs.c:645 src/dialogs.c:761 src/dialogs.c:871 src/dialogs.c:1000
+#: src/dialogs.c:1130 src/dialogs.c:1201 src/dialogs.c:1289 src/dialogs.c:1478
+#: src/dialogs.c:1663 src/dialogs.c:1761 src/dialogs.c:1850 src/rvous.c:279
 #: src/rvous.c:414 src/rvous.c:633
 msgid "Cancel"
 msgstr "Ãë¼Ò"
 
-#: src/aim.c:341 src/buddy.c:1758
+#: src/aim.c:342 src/buddy.c:1756
 msgid "Register"
 msgstr "µî·Ï"
 
-#: src/aim.c:342
+#: src/aim.c:343
 msgid "Options"
 msgstr "¿É¼Ç"
 
-#: src/aim.c:344 src/aim.c:551 src/buddy.c:1823
+#: src/aim.c:345 src/aim.c:552 src/buddy.c:1821
 msgid "Plugins"
 msgstr "Ç÷¯±×ÀÎ"
 
-#: src/aim.c:407
+#: src/aim.c:408
 msgid "Screen Name: "
 msgstr "È­¸éÀ̸§: "
 
-#: src/aim.c:410
+#: src/aim.c:411
 msgid "Password: "
 msgstr "¾ÏÈ£: "
 
-#: src/aim.c:413
+#: src/aim.c:414
 msgid "Remember Password"
 msgstr "¾ÏÈ£ ÀúÀå"
 
-#: src/aim.c:460
+#: src/aim.c:461
 msgid "Gaim - Login"
 msgstr "Gaim - ·Î±×ÀÎ"
 
-#: src/aim.c:540 src/buddy.c:1820
+#: src/aim.c:541 src/buddy.c:1818
 msgid "Preferences"
 msgstr "¼³Á¤"
 
@@ -108,28 +108,28 @@
 msgstr "ÇöÀç Á¢¼ÓµÈ Ä£±¸´Â %d/%d"
 
 #: src/buddy.c:273 src/buddy.c:278 src/buddy.c:281 src/buddy.c:286
-#: src/buddy.c:1920 src/buddy.c:1989 src/conversation.c:368
-#: src/conversation.c:1112 src/dialogs.c:761 src/dialogs.c:1478
-#: src/dialogs.c:1502 src/prefs.c:1001
+#: src/buddy.c:1918 src/buddy.c:1987 src/conversation.c:368
+#: src/conversation.c:1112 src/dialogs.c:762 src/dialogs.c:1479
+#: src/dialogs.c:1503 src/prefs.c:997
 msgid "Add"
 msgstr "´õÇϱâ"
 
 #: src/buddy.c:274 src/buddy.c:279 src/buddy.c:282 src/buddy.c:287
-#: src/buddy.c:1921 src/buddy.c:1990 src/conversation.c:1109 src/dialogs.c:708
-#: src/prefs.c:1002
+#: src/buddy.c:1919 src/buddy.c:1988 src/conversation.c:1109 src/dialogs.c:709
+#: src/prefs.c:998
 msgid "Remove"
 msgstr "Á¦°Å"
 
-#: src/buddy.c:275 src/buddy.c:283 src/buddy.c:1869
+#: src/buddy.c:275 src/buddy.c:283 src/buddy.c:1867
 msgid "Chat"
 msgstr "äÆÃ"
 
-#: src/buddy.c:276 src/buddy.c:284 src/buddy.c:437 src/buddy.c:1867
+#: src/buddy.c:276 src/buddy.c:284 src/buddy.c:437 src/buddy.c:1865
 #: src/buddy_chat.c:716
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:277 src/buddy.c:285 src/buddy.c:443 src/buddy.c:1868
+#: src/buddy.c:277 src/buddy.c:285 src/buddy.c:443 src/buddy.c:1866
 #: src/buddy_chat.c:718 src/conversation.c:1104 src/rvous.c:631
 msgid "Info"
 msgstr "Á¤º¸"
@@ -150,11 +150,11 @@
 msgid "Add Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â ¸¸µé±â"
 
-#: src/buddy.c:572 src/buddy.c:1020 src/buddy.c:2025 src/dialogs.c:1493
+#: src/buddy.c:572 src/buddy.c:1020 src/buddy.c:2023 src/dialogs.c:1494
 msgid "Permit"
 msgstr "Çã¿ë"
 
-#: src/buddy.c:588 src/dialogs.c:1488
+#: src/buddy.c:588 src/dialogs.c:1489
 msgid "Deny"
 msgstr "°ÅºÎ"
 
@@ -195,128 +195,128 @@
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s °¡ ·Î±×¾Æ¿ô ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
-#: src/buddy.c:1747
+#: src/buddy.c:1745
 msgid "File"
 msgstr "ÆÄÀÏ"
 
-#: src/buddy.c:1751
+#: src/buddy.c:1749
 msgid "Add A Buddy"
 msgstr "Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:1753
+#: src/buddy.c:1751
 msgid "Import Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï °¡Á®¿À±â"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1752
 msgid "Export Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï ³»º¸³»±â"
 
-#: src/buddy.c:1764
+#: src/buddy.c:1762
 msgid "Quit"
 msgstr "³¡³»±â"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1769
 msgid "Tools"
 msgstr "µµ±¸"
 
-#: src/buddy.c:1776 src/gnome_applet_mgr.c:199 src/gnome_applet_mgr.c:284
-#: src/prefs.c:601
+#: src/buddy.c:1774 src/gnome_applet_mgr.c:199 src/gnome_applet_mgr.c:284
+#: src/prefs.c:597
 msgid "Away"
 msgstr "Àá¼ö"
 
-#: src/buddy.c:1781
+#: src/buddy.c:1779
 msgid "Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â"
 
-#: src/buddy.c:1789
+#: src/buddy.c:1787
 msgid "Search for Buddy"
 msgstr "Ä£±¸ ã±â"
 
-#: src/buddy.c:1792
+#: src/buddy.c:1790
 msgid "by Email"
 msgstr "¸ÞÀÏ·Î"
 
-#: src/buddy.c:1796
+#: src/buddy.c:1794
 msgid "by Dir Info"
 msgstr "µð·ºÅ丮 Á¤º¸·Î"
 
-#: src/buddy.c:1803
+#: src/buddy.c:1801
 msgid "Settings"
 msgstr "¼³Á¤"
 
-#: src/buddy.c:1806
+#: src/buddy.c:1804
 msgid "User Info"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: src/buddy.c:1810
+#: src/buddy.c:1808
 msgid "Directory Info"
 msgstr "µð·ºÅ丮 Á¤º¸"
 
-#: src/buddy.c:1814
+#: src/buddy.c:1812
 msgid "Change Password"
 msgstr "Æнº¿öµå ¹Ù²Ù±â"
 
-#: src/buddy.c:1828
+#: src/buddy.c:1826
 msgid "Help"
 msgstr "µµ¿ò¸»"
 
-#: src/buddy.c:1833
+#: src/buddy.c:1831
 msgid "About"
 msgstr "GAIM ˼"
 
-#: src/buddy.c:1881
+#: src/buddy.c:1879
 msgid "Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï"
 
-#: src/buddy.c:1904
+#: src/buddy.c:1902
 msgid "Information on selected Buddy"
 msgstr "¼±ÅÃÇÑ Ä£±¸¿¡ ´ëÇÑ Á¤º¸"
 
-#: src/buddy.c:1905
+#: src/buddy.c:1903
 msgid "Send Instant Message"
 msgstr "¸Þ½ÃÁö º¸³»±â"
 
-#: src/buddy.c:1906
+#: src/buddy.c:1904
 msgid "Start/join a Buddy Chat"
 msgstr "äÆà ½ÃÀÛ/Âü°¡"
 
-#: src/buddy.c:1941
+#: src/buddy.c:1939
 msgid "Add a new Buddy"
 msgstr "»õ Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:1942
+#: src/buddy.c:1940
 msgid "Remove selected Buddy"
 msgstr "¼±ÅÃÇÑ Ä£±¸ »©±â"
 
-#: src/buddy.c:1965
+#: src/buddy.c:1963
 msgid "Allow anyone"
 msgstr "´©±¸µçÁö Çã¿ë"
 
-#: src/buddy.c:1972
+#: src/buddy.c:1970
 msgid "Permit some"
 msgstr "¸î¸í¸¸ Çã¿ë"
 
-#: src/buddy.c:1980
+#: src/buddy.c:1978
 msgid "Deny some"
 msgstr "¸î¸í¸¸ °ÅºÎ"
 
-#: src/buddy.c:2001
+#: src/buddy.c:1999
 msgid "Add buddy to permit/deny"
 msgstr "¸ñ·Ï¿¡ Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:2002
+#: src/buddy.c:2000
 msgid "Remove buddy from permit/deny"
 msgstr "¸ñ·Ï¿¡¼­ Ä£±¸ »©±â"
 
-#: src/buddy.c:2021
+#: src/buddy.c:2019
 msgid "Online"
 msgstr "¿¬°áÁß"
 
-#: src/buddy.c:2023
+#: src/buddy.c:2021
 msgid "Edit Buddies"
 msgstr "Ä£±¸ ÆíÁý"
 
-#: src/buddy.c:2072
+#: src/buddy.c:2070
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï"
 
@@ -352,7 +352,7 @@
 msgid "Whisper"
 msgstr "±Ó¼Ó¸»"
 
-#: src/buddy_chat.c:714 src/conversation.c:1103 src/dialogs.c:1289
+#: src/buddy_chat.c:714 src/conversation.c:1103 src/dialogs.c:1290
 msgid "Send"
 msgstr "º¸³»±â"
 
@@ -364,7 +364,7 @@
 msgid "Bold"
 msgstr "±½°Ô"
 
-#: src/buddy_chat.c:803 src/conversation.c:1188 src/prefs.c:780
+#: src/buddy_chat.c:803 src/conversation.c:1188 src/prefs.c:776
 msgid "Bold Text"
 msgstr "±½Àº ±Û¾¾"
 
@@ -373,7 +373,7 @@
 msgid "Italics"
 msgstr "±â¿ïÀÓ"
 
-#: src/buddy_chat.c:807 src/conversation.c:1192 src/prefs.c:781
+#: src/buddy_chat.c:807 src/conversation.c:1192 src/prefs.c:777
 msgid "Italics Text"
 msgstr "±â¿ïÀÎ ±Û¾¾"
 
@@ -424,8 +424,8 @@
 msgid "Font"
 msgstr "±Û²Ã"
 
-#: src/buddy_chat.c:823 src/conversation.c:1208 src/dialogs.c:2074
-#: src/dialogs.c:2093 src/prefs.c:786
+#: src/buddy_chat.c:823 src/conversation.c:1208 src/dialogs.c:2075
+#: src/dialogs.c:2094 src/prefs.c:782
 msgid "Select Font"
 msgstr "±Û²Ã ¼±ÅÃ"
 
@@ -478,7 +478,7 @@
 msgid "Message too long, some data truncated."
 msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±æ¾î¼­ ¾à°£ ©·È½À´Ï´Ù."
 
-#: src/conversation.c:500 src/dialogs.c:2181 src/dialogs.c:2252
+#: src/conversation.c:500 src/dialogs.c:2182 src/dialogs.c:2253
 #: src/rvous.c:221 src/rvous.c:488
 msgid "Error"
 msgstr "¿À·ù"
@@ -526,334 +526,334 @@
 msgid "Gaim - Warn user?"
 msgstr "Gaim - »ç¿ëÀÚ¿¡°Ô ÁÖÀÇ º¸³»±â"
 
-#: src/dialogs.c:481
+#: src/dialogs.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%s ÆÄÀÏ¿¡ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:484
+#: src/dialogs.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:487
+#: src/dialogs.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±æ¾î¼­ ¸¶Áö¸· %s ¹ÙÀÌÆ®°¡ ©·È½À´Ï´Ù."
 
-#: src/dialogs.c:490
+#: src/dialogs.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ´Â ÇöÀç ·Î±×ÀÎÇÏÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/dialogs.c:493
+#: src/dialogs.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s ¿¡°Ô ÁÖÀǸ¦ º¸³»´Â °ÍÀº Çã¿ëµÇÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:496
+#: src/dialogs.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "¼­¹öÀÇ ¼ÓµµÇѰ踦 ³Ñ¾ú±â ¶§¹®¿¡ ¸Þ½ÃÁö¸¦ ¹ö·È½À´Ï´Ù."
 
-#: src/dialogs.c:499
+#: src/dialogs.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s ¿¡ äÆà Âü°¡¸¦ ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:502
+#: src/dialogs.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "%s ¿¡°Ô ³Ê¹« »¡¸® ¸Þ½ÃÁö¸¦ º¸³»°í ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:505
+#: src/dialogs.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« Ä¿¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/dialogs.c:508
+#: src/dialogs.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« »¡¶ó¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/dialogs.c:511
+#: src/dialogs.c:512
 msgid "Failure."
 msgstr "½ÇÆÐ."
 
-#: src/dialogs.c:514
+#: src/dialogs.c:515
 msgid "Too many matches."
 msgstr "ÇØ´ç Ç׸ñÀÌ ³Ê¹« ¸¹½À´Ï´Ù."
 
-#: src/dialogs.c:517
+#: src/dialogs.c:518
 msgid "Need more qualifiers."
 msgstr "´õ »ó¼¼È÷ ÁöÁ¤ÇϽʽÿä."
 
-#: src/dialogs.c:520
+#: src/dialogs.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "µð·ºÅ丮 ¼­ºñ½º¸¦ ÀϽÃÀûÀ¸·Î »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:523
+#: src/dialogs.c:524
 msgid "Email lookup restricted."
 msgstr "¸ÞÀÏ Ã£¾Æº¸±â¿¡ Á¦¾àÀÌ ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:526
+#: src/dialogs.c:527
 msgid "Keyword ignored."
 msgstr "Å°¿öµå°¡ ¹«½ÃµÇ¾ú½À´Ï´Ù."
 
-#: src/dialogs.c:529
+#: src/dialogs.c:530
 msgid "No keywords."
 msgstr "Å°¿öµå°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:532
+#: src/dialogs.c:533
 msgid "User has no directory information."
 msgstr "»ç¿ëÀÚ°¡ µð·ºÅ丮 Á¤º¸¸¦ °®°í ÀÖÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:536
+#: src/dialogs.c:537
 msgid "Country not supported."
 msgstr "±¹°¡´Â Áö¿øµÇÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:539
+#: src/dialogs.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "¾Ë ¼ö ¾ø´Â ½ÇÆÐ: %s."
 
-#: src/dialogs.c:542
+#: src/dialogs.c:543
 msgid "Incorrect nickname or password."
 msgstr "À̸§À̳ª Æнº¿öµå°¡ Ʋ·È½À´Ï´Ù."
 
-#: src/dialogs.c:545
+#: src/dialogs.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Àá½Ã ¼­ºñ½º°¡ »ç¿ëºÒ°¡´ÉÇÕ´Ï´Ù."
 
-#: src/dialogs.c:548
+#: src/dialogs.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "´ç½ÅÀº ÁÖÀÇ ¼öÁØÀÌ ³ô¾î¼­ ·Î±×ÀÎ ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:551
+#: src/dialogs.c:552
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
-"´ç½ÅÀº ³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°íÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ "
-"´Ù½Ã ½ÃµµÇϽʽÿä. °è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
+"´ç½ÅÀº ³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°íÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã "
+"½ÃµµÇϽʽÿä. °è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
-#: src/dialogs.c:554
+#: src/dialogs.c:555
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Á¢¼Ó Áß¿¡ ¾Ë ¼ö ¾ø´Â ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù: %s."
 
-#: src/dialogs.c:557
+#: src/dialogs.c:558
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù, %d °¡ ¹ß»ýÇÏ¿´½À´Ï´Ù.  Á¤º¸´Â: %s"
 
-#: src/dialogs.c:560
+#: src/dialogs.c:561
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - ¿À·ù %d"
 
-#: src/dialogs.c:600 src/dialogs.c:645 src/dialogs.c:871 src/dialogs.c:1378
-#: src/dialogs.c:1663 src/dialogs.c:1761
+#: src/dialogs.c:601 src/dialogs.c:646 src/dialogs.c:872 src/dialogs.c:1379
+#: src/dialogs.c:1664 src/dialogs.c:1762
 msgid "OK"
 msgstr "È®ÀÎ"
 
-#: src/dialogs.c:654
+#: src/dialogs.c:655
 msgid "IM who: "
 msgstr "ÀνºÅÏÆ® ¸Þ½ÅÀú »ç¿ëÀÚ: "
 
-#: src/dialogs.c:680
+#: src/dialogs.c:681
 msgid "Gaim - IM user"
 msgstr "Gaim - ÀνºÅÏÆ® ¸Þ½ÅÀú »ç¿ëÀÚ"
 
-#: src/dialogs.c:732
+#: src/dialogs.c:733
 msgid "Buddies"
 msgstr "Ä£±¸"
 
-#: src/dialogs.c:776
+#: src/dialogs.c:777
 msgid "Add Buddy"
 msgstr "Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:779
 msgid "Buddy"
 msgstr "Ä£±¸"
 
-#: src/dialogs.c:785
+#: src/dialogs.c:786
 msgid "Group"
 msgstr "±×·ì"
 
-#: src/dialogs.c:815
+#: src/dialogs.c:816
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:881
+#: src/dialogs.c:882
 msgid "Buddy To Pounce:"
 msgstr "ºÙÀâÀ» Ä£±¸:"
 
-#: src/dialogs.c:886
+#: src/dialogs.c:887
 msgid "Open IM Window on Buddy Logon"
 msgstr "Ä£±¸°¡ Á¢¼ÓÇÒ ¶§ ¸Þ½ÃÁö â ¿­±â"
 
-#: src/dialogs.c:889
+#: src/dialogs.c:890
 msgid "Send IM on Buddy Logon"
 msgstr "Ä£±¸°¡ Á¢¼ÓÇÒ ¶§ ¸Þ½ÃÁö º¸³»±â"
 
-#: src/dialogs.c:897
+#: src/dialogs.c:898
 msgid "Message to send:"
 msgstr "º¸³¾ ¸Þ½ÃÁö:"
 
-#: src/dialogs.c:924
+#: src/dialogs.c:925
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ºÙÀâÀ» Ä£±¸ »õ·Î ¸¸µé±â"
 
-#: src/dialogs.c:1000 src/dialogs.c:1201
+#: src/dialogs.c:1001 src/dialogs.c:1202
 msgid "Save"
 msgstr "ÀúÀå"
 
-#: src/dialogs.c:1022
+#: src/dialogs.c:1023
 msgid "Allow Web Searches To Find Your Info"
 msgstr "À¥À» ÅëÇÏ¿© ³ªÀÇ Á¤º¸¸¦ °Ë»öÇÒ ¼ö ÀÖµµ·Ï Çã¿ë"
 
-#: src/dialogs.c:1024 src/dialogs.c:1680
+#: src/dialogs.c:1025 src/dialogs.c:1681
 msgid "First Name"
 msgstr "À̸§"
 
-#: src/dialogs.c:1029 src/dialogs.c:1685
+#: src/dialogs.c:1030 src/dialogs.c:1686
 msgid "Middle Name"
 msgstr "Áß°£ À̸§"
 
-#: src/dialogs.c:1034 src/dialogs.c:1690
+#: src/dialogs.c:1035 src/dialogs.c:1691
 msgid "Last Name"
 msgstr "¼º"
 
-#: src/dialogs.c:1039 src/dialogs.c:1695
+#: src/dialogs.c:1040 src/dialogs.c:1696
 msgid "Maiden Name"
 msgstr "ó³à½ÃÀý À̸§"
 
-#: src/dialogs.c:1044 src/dialogs.c:1700
+#: src/dialogs.c:1045 src/dialogs.c:1701
 msgid "City"
 msgstr "±º/±¸"
 
-#: src/dialogs.c:1049 src/dialogs.c:1705
+#: src/dialogs.c:1050 src/dialogs.c:1706
 msgid "State"
 msgstr "½Ã/µµ"
 
-#: src/dialogs.c:1054 src/dialogs.c:1710
+#: src/dialogs.c:1055 src/dialogs.c:1711
 msgid "Country"
 msgstr "±¹°¡"
 
-#: src/dialogs.c:1085
+#: src/dialogs.c:1086
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - µð·ºÅ丮 Á¤º¸ ¼³Á¤"
 
-#: src/dialogs.c:1102
+#: src/dialogs.c:1103
 msgid "New Passwords Do Not Match"
 msgstr "»õ ¾ÏÈ£°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/dialogs.c:1102 src/dialogs.c:1107
+#: src/dialogs.c:1103 src/dialogs.c:1108
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ¾ÏÈ£ º¯°æ ½ÇÆÐ"
 
-#: src/dialogs.c:1107
+#: src/dialogs.c:1108
 msgid "Fill out all fields completely"
 msgstr "¸ðµç Ç׸ñÀ» ¿ÏÀüÈ÷ ä¿ì½Ê½Ã¿ä"
 
-#: src/dialogs.c:1128 src/dialogs.c:1850
+#: src/dialogs.c:1129 src/dialogs.c:1851
 msgid "Ok"
 msgstr "È®ÀÎ"
 
-#: src/dialogs.c:1138
+#: src/dialogs.c:1139
 msgid "Original Password"
 msgstr "¿ø·¡ ¾ÏÈ£"
 
-#: src/dialogs.c:1146
+#: src/dialogs.c:1147
 msgid "New Password"
 msgstr "»õ ¾ÏÈ£"
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1155
 msgid "New Password (again)"
 msgstr "»õ ¾ÏÈ£ (Çѹø´õ)"
 
-#: src/dialogs.c:1177
+#: src/dialogs.c:1178
 msgid "Gaim - Password Change"
 msgstr "Gaim - ¾ÏÈ£ º¯°æ"
 
-#: src/dialogs.c:1240
+#: src/dialogs.c:1241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - »ç¿ëÀÚ Á¤º¸ ¼³Á¤"
 
-#: src/dialogs.c:1384
+#: src/dialogs.c:1385
 msgid "Below are the results of your search: "
 msgstr "°Ë»öÀÇ °á°ú´Â ´ÙÀ½°ú °°½À´Ï´Ù: "
 
-#: src/dialogs.c:1531
+#: src/dialogs.c:1532
 msgid "Gaim - Add Permit/Deny"
 msgstr "Gaim - Çã¿ë/°ÅºÎ ¸ñ·Ï¿¡ ´õÇϱâ"
 
-#: src/dialogs.c:1592
+#: src/dialogs.c:1593
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ´ëÈ­ ·Î±ë"
 
-#: src/dialogs.c:1737
+#: src/dialogs.c:1738
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Á¤º¸·Î Ä£±¸ ã±â"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1773
 msgid "Email"
 msgstr "¸ÞÀÏ"
 
-#: src/dialogs.c:1795
+#: src/dialogs.c:1796
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ¸ÞÀϷΠģ±¸ ã±â"
 
-#: src/dialogs.c:1866
+#: src/dialogs.c:1867
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:1871
+#: src/dialogs.c:1872
 msgid "Description"
 msgstr "¼³¸í"
 
-#: src/dialogs.c:1893
+#: src/dialogs.c:1894
 msgid "GAIM - Add URL"
 msgstr "GAIM - URL ´õÇϱâ"
 
-#: src/dialogs.c:1958
+#: src/dialogs.c:1959
 msgid "Select Text Color"
 msgstr "±Û¾¾ »ö±ò ¼±ÅÃ"
 
-#: src/dialogs.c:2180 src/rvous.c:220
+#: src/dialogs.c:2181 src/rvous.c:220
 #, c-format
 msgid "Error writing file %s"
 msgstr "%s ÆÄÀÏ¿¡ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: src/dialogs.c:2197
+#: src/dialogs.c:2198
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï ³»º¸³»±â"
 
-#: src/dialogs.c:2251 src/rvous.c:487
+#: src/dialogs.c:2252 src/rvous.c:487
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: src/dialogs.c:2317
+#: src/dialogs.c:2318
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï °¡Á®¿À±â"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2393
 msgid "Gaim - New away message"
 msgstr "Gaim - Àá¼ö ¸Þ½ÃÁö »õ·Î ¸¸µé±â"
 
 #. Make a label for away entry
-#: src/dialogs.c:2402
+#: src/dialogs.c:2403
 msgid "Away title: "
 msgstr "Á¦¸ñ: "
 
 #. make create button
-#: src/dialogs.c:2424
+#: src/dialogs.c:2425
 msgid "Create new message"
 msgstr "»õ·Î¿î ¸Þ½ÃÁö ¸¸µé±â"
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:2429
+#: src/dialogs.c:2430
 msgid "Make away now"
 msgstr "Áö±Ý ¹Ù·Î Àá¼ö"
 
@@ -991,7 +991,7 @@
 msgid "Connection established, cookie sent"
 msgstr "¿¬°áÇÏ°í ÄíÅ°¸¦ º¸³Â½À´Ï´Ù"
 
-#: src/oscar.c:640
+#: src/oscar.c:636
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1003,303 +1003,316 @@
 "<BR>Á¢¼ÓÇÑ ¶§ : <B>%s</B><BR>¸îºÐ° ³î°íÀÖ³ª : <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/plugins.c:103
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Ç÷¯±×ÀÎ ¸ñ·Ï"
 
-#: src/plugins.c:166 src/plugins.c:173 src/plugins.c:204
+#: src/plugins.c:156
+#, c-format
+msgid "Already loaded %s, not reloading.\n"
+msgstr ""
+
+#: src/plugins.c:179 src/plugins.c:186 src/plugins.c:217
 msgid "Plugin Error"
 msgstr "Ç÷¯±×ÀÎ ¿À·ù"
 
-#: src/plugins.c:251
+#: src/plugins.c:264
 msgid "Gaim - Plugins"
 msgstr "Gaim - Ç÷¯±×ÀÎ"
 
-#: src/plugins.c:280
+#: src/plugins.c:293
 msgid "Load Plugin"
 msgstr "Ç÷¯±×ÀÎ ¿Ã¸®±â"
 
-#: src/plugins.c:285
+#: src/plugins.c:298
 msgid "Configure Plugin"
 msgstr "Ç÷¯±×ÀÎ ¼³Á¤"
 
-#: src/plugins.c:289
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr "Ç÷¯±×ÀÎ ³»¸®±â"
 
-#: src/prefs.c:363
+#: src/prefs.c:358
 msgid "Gaim - Preferences"
 msgstr "Gaim - ¼³Á¤"
 
-#: src/prefs.c:375
+#: src/prefs.c:370
 msgid "General"
 msgstr "ÀϹÝ"
 
-#: src/prefs.c:380
+#: src/prefs.c:375
 msgid "Idle"
 msgstr "³î±â"
 
-#: src/prefs.c:388
+#: src/prefs.c:383
 msgid "Enter sends message"
 msgstr "¿£ÅÍÅ°¸¦ ´©¸£¸é ¸Þ½ÃÁö º¸³»±â"
 
-#: src/prefs.c:389
+#: src/prefs.c:384
 msgid "Auto-login"
 msgstr "ÀÚµ¿ ·Î±×ÀÎ"
 
-#: src/prefs.c:390
+#: src/prefs.c:385
 msgid "Log All Conversations"
 msgstr "¸ðµç ´ëÈ­¸¦ ·Î±ë"
 
-#: src/prefs.c:391
+#: src/prefs.c:386
 msgid "Strip HTML from log files"
 msgstr "·Î±× ÆÄÀÏ¿¡ HTML Àº »©°í ´ã±â"
 
-#: src/prefs.c:392
+#: src/prefs.c:387
 msgid "Raise windows when message recieved"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é âÀ» ¾ÕÀ¸·Î"
 
-#: src/prefs.c:393
+#: src/prefs.c:388
 msgid "Raise chat windows when people speak"
 msgstr "´Ù¸¥ »ç¶÷ÀÌ ¾ê±âÇϸé äÆà âÀ» ¾ÕÀ¸·Î"
 
-#: src/prefs.c:394
+#: src/prefs.c:389
 msgid "Send URLs as links"
 msgstr "URL À» ¸µÅ©·Î º¸³»±â"
 
-#: src/prefs.c:395
+#: src/prefs.c:390
 msgid "Show Lag-O-Meter"
 msgstr "¼Óµµ°è º¸¿©ÁÖ±â"
 
-#: src/prefs.c:396
+#: src/prefs.c:391
 msgid "Save some window size/positions"
 msgstr "ÀϺΠâÀÇ Å©±â/À§Ä¡ ÀúÀå"
 
-#: src/prefs.c:397
+#: src/prefs.c:392
 msgid "Ignore new conversations when away"
 msgstr "Àá¼öÁß¿¡´Â »õ·Î¿î ´ëÈ­ ¹«½Ã"
 
-#: src/prefs.c:398
+#: src/prefs.c:393
 msgid "Automagically highlight misspelled words"
 msgstr "Ʋ¸° öÀÚ ÀÚµ¿À¸·Î Ç¥½Ã"
 
-#: src/prefs.c:399
+#: src/prefs.c:394
 msgid "Sending messages removes away status"
 msgstr "¸Þ½ÃÁö¸¦ º¸³»¸é Àá¼ö¿¡¼­ ³ª¿À±â"
 
-#: src/prefs.c:402
+#: src/prefs.c:397
 msgid "Enable debug mode"
 msgstr "µð¹ö±ë ¸ðµå »ç¿ë"
 
-#: src/prefs.c:405
+#: src/prefs.c:400
 msgid "No Idle"
 msgstr "³îÁö ¾Ê±â"
 
-#: src/prefs.c:412
+#: src/prefs.c:407
 msgid "GAIM Use"
 msgstr "GAIM À» »ç¿ë"
 
-#: src/prefs.c:440
+#: src/prefs.c:435
 msgid "Applet"
 msgstr "¾ÖÇø´"
 
-#: src/prefs.c:447
+#: src/prefs.c:442
 msgid "Automatically Show Buddy List"
 msgstr "Ä£±¸ ¸ñ·ÏÀ» ÀÚµ¿À¸·Î º¸¿©ÁÜ"
 
-#: src/prefs.c:448
+#: src/prefs.c:443
 msgid "Sounds go through GNOME"
 msgstr "±×³ðÀ» ÀÌ¿ëÇÏ¿© ¼Ò¸®³»±â"
 
-#: src/prefs.c:449
+#: src/prefs.c:444
 msgid "Buddy list displays near the applet"
 msgstr "Ä£±¸ ¸ñ·ÏÀº ¾ÖÇø´ ºÎ±Ù¿¡ Ç¥½Ã"
 
-#: src/prefs.c:461
+#: src/prefs.c:455
 msgid "Connection"
 msgstr "¿¬°á"
 
-#: src/prefs.c:466
+#: src/prefs.c:459
+msgid "Use Oscar Protocol (experimental; only takes effect before signon)"
+msgstr ""
+
+#: src/prefs.c:460
+msgid "The following options do not apply if you use Oscar."
+msgstr ""
+
+#: src/prefs.c:464
 msgid "TOC Host:"
 msgstr "TOC È£½ºÆ®:"
 
-#: src/prefs.c:473 src/prefs.c:495 src/prefs.c:548
+#: src/prefs.c:471 src/prefs.c:493 src/prefs.c:546
 msgid "Port:"
 msgstr "Æ÷Æ®:"
 
-#: src/prefs.c:488
+#: src/prefs.c:486
 msgid "Login Host:"
 msgstr "·Î±×ÀΠȣ½ºÆ®:"
 
-#: src/prefs.c:509
+#: src/prefs.c:507
 msgid "No Proxy"
 msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
 
-#: src/prefs.c:516
+#: src/prefs.c:514
 msgid "HTTP Proxy"
 msgstr "HTTP ÇÁ·Ï½Ã"
 
-#: src/prefs.c:524
+#: src/prefs.c:522
 msgid "SOCKS v4 Proxy"
 msgstr "SOCKS v4 ÇÁ·Ï½Ã"
 
-#: src/prefs.c:532
+#: src/prefs.c:530
 msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 msgstr "SOCKS v5 ÇÁ·Ï½Ã (ÀÛµ¿¾ÈÇÔ!)"
 
-#: src/prefs.c:541
+#: src/prefs.c:539
 msgid "Proxy Host:"
 msgstr "ÇÁ·Ï½Ã È£½ºÆ®:"
 
-#: src/prefs.c:628
+#: src/prefs.c:624
 msgid "Create Message"
 msgstr "¸Þ½ÃÁö ¸¸µé±â"
 
-#: src/prefs.c:632
+#: src/prefs.c:628
 msgid "Remove Message"
 msgstr "¸Þ½ÃÁö Áö¿ì±â"
 
-#: src/prefs.c:671
+#: src/prefs.c:667
 msgid "Sounds"
 msgstr "¼Ò¸®"
 
-#: src/prefs.c:674
+#: src/prefs.c:670
 msgid "Sound when buddy logs in"
 msgstr "Ä£±¸°¡ µé¾î¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:675
+#: src/prefs.c:671
 msgid "Sound when buddy logs out"
 msgstr "Ä£±¸°¡ ³ª°¡¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:676
+#: src/prefs.c:672
 msgid "Sound when message is received"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:677
+#: src/prefs.c:673
 msgid "Sound when message is sent"
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:678
+#: src/prefs.c:674
 msgid "Sound when first message is received"
 msgstr "ù¹ø° ¸Þ½ÃÁö°¡ ¿Ã ¶§¸¸ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:679
+#: src/prefs.c:675
 msgid "Sound when message is received if away"
 msgstr "Àá¼ö Áß¿¡ ¸Þ½ÃÁö°¡ ¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:680
+#: src/prefs.c:676
 msgid "No sound for buddies signed on when you log in"
 msgstr "³»°¡ ·Î±×ÀÎÇϱâ Àü¿¡ Á¢¼ÓµÈ Ä£±¸¿¡ ´ëÇؼ­´Â ¼Ò¸® ¾È³»±â"
 
-#: src/prefs.c:681
+#: src/prefs.c:677
 msgid "Sounds in chat rooms when people enter/leave"
 msgstr "äÆù濡 »ç¶÷µéÀÌ µå³ªµé ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:682
+#: src/prefs.c:678
 msgid "Sounds in chat rooms when people talk"
 msgstr "»ç¶÷µéÀÌ Ã¤Æù濡¼­ ¾ê±âÇÒ ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:689
+#: src/prefs.c:685
 msgid "Browser"
 msgstr "ºê¶ó¿ìÀú"
 
-#: src/prefs.c:694
+#: src/prefs.c:690
 msgid "Netscape"
 msgstr "³Ý½ºÄÉÀÌÇÁ"
 
-#: src/prefs.c:701
+#: src/prefs.c:697
 msgid "KFM (The KDE browser)"
 msgstr "KFM (KDE ºê¶ó¿ìÀú)"
 
-#: src/prefs.c:709
+#: src/prefs.c:705
 msgid "Internal HTML widget (Quite likely a bad idea!)"
 msgstr "³»Àå HTML À§Á¬ (ÁÁÀº »ý°¢ÀÌ ¾Æ³Ä!)"
 
-#: src/prefs.c:717
+#: src/prefs.c:713
 msgid "Manual"
 msgstr "¼öµ¿"
 
-#: src/prefs.c:731
+#: src/prefs.c:727
 msgid "Pop up new window by default"
 msgstr "±âº»À¸·Î »õ â ¿­±â"
 
-#: src/prefs.c:755
+#: src/prefs.c:751
 msgid "Appearance"
 msgstr "¸ð¾ç"
 
-#: src/prefs.c:759
+#: src/prefs.c:755
 msgid "Font Properties"
 msgstr "±Û²Ã ¼Ó¼º"
 
-#: src/prefs.c:766
+#: src/prefs.c:762
 msgid "Show time on messages"
 msgstr "¸Þ½ÃÁö¿¡ ½Ã°£ Ç¥½Ã"
 
-#: src/prefs.c:767
+#: src/prefs.c:763
 msgid "Show numbers in groups"
 msgstr "±×·ì¿¡ Àοø Ç¥½Ã"
 
-#: src/prefs.c:768
+#: src/prefs.c:764
 msgid "Show buddy-type pixmaps"
 msgstr "Ä£±¸ Á¾·ù ±×¸² º¸¿©ÁÖ±â"
 
-#: src/prefs.c:769
+#: src/prefs.c:765
 msgid "Show idle times"
 msgstr "³î°í ÀÖ´Â ½Ã°£ º¸¿©ÁÖ±â"
 
-#: src/prefs.c:770
+#: src/prefs.c:766
 msgid "Show button pixmaps"
 msgstr "¹öÆ° ±×¸² º¸¿©ÁÖ±â"
 
-#: src/prefs.c:771
+#: src/prefs.c:767
 msgid "Ignore incoming colours"
 msgstr "º¸³»¿À´Â »ö±òÀº ¹«½Ã"
 
-#: src/prefs.c:775
+#: src/prefs.c:771
 msgid "Show logon/logoffs in conversation windows"
 msgstr "´ëȭâ¿¡¼­ ·Î±×¿Â/¿ÀÇÁ º¸¿©ÁÖ±â"
 
-#: src/prefs.c:776
+#: src/prefs.c:772
 msgid "Use devil icons"
 msgstr "¾Ç¸¶ ¾ÆÀÌÄÜ »ç¿ë"
 
-#: src/prefs.c:777
+#: src/prefs.c:773
 msgid "Show graphical smileys (experimental)"
 msgstr "±Û¾¾±×¸²À» ±×¸²À¸·Î º¸¿©ÁÖ±â (½ÇÇè¼öÁØ)"
 
-#: src/prefs.c:782
+#: src/prefs.c:778
 msgid "Underlined Text"
 msgstr "¹ØÁÙÄ£ ±Û¾¾"
 
-#: src/prefs.c:783
+#: src/prefs.c:779
 msgid "Strike Text"
 msgstr "°¡¿îµ¥ ÁÙÄ£ ±Û¾¾"
 
-#: src/prefs.c:784
+#: src/prefs.c:780
 msgid "Font Face for Text"
 msgstr "±Û¾¾¿¡ »ç¿ëÇÒ ±Û²Ã"
 
-#: src/prefs.c:802
+#: src/prefs.c:798
 msgid "Buddy Chats"
 msgstr "äÆÃ"
 
-#: src/prefs.c:925 src/prefs.c:927 src/prefs.c:1057 src/prefs.c:1059
+#: src/prefs.c:921 src/prefs.c:923 src/prefs.c:1053 src/prefs.c:1055
 msgid "Gaim Chat"
 msgstr "Gaim äÆÃ"
 
-#: src/prefs.c:1000
+#: src/prefs.c:996
 msgid "Refresh"
 msgstr "°»½Å"
 
-#: src/prefs.c:1031
+#: src/prefs.c:1027
 msgid "List of available chats"
 msgstr "°¡´ÉÇÑ Ã¤ÆÃÀÇ ¸ñ·Ï"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1041
 msgid "List of subscribed chats"
 msgstr "°¡ÀÔÇÑ Ã¤ÆÃÀÇ ¸ñ·Ï"
 
-#: src/prefs.c:1102
+#: src/prefs.c:1098
 msgid "GAIM debug output window"
 msgstr "GAIM µð¹ö±ë Ãâ·Ââ"
 
--- a/po/zh_CN.po	Fri Jun 23 19:05:11 2000 +0000
+++ b/po/zh_CN.po	Fri Jun 23 19:13:04 2000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2000-06-16 19:04-0700\n"
+"POT-Creation-Date: 2000-06-23 10:39-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"
@@ -21,8 +21,8 @@
 msgstr "¹ØÓÚ GAIM µÚ %s °æ"
 
 #. color = gtk_button_new_with_label("Color");
-#: src/about.c:93 src/buddy.c:1766 src/buddy_chat.c:711
-#: src/conversation.c:1107 src/dialogs.c:434 src/plugins.c:294 src/prefs.c:811
+#: src/about.c:93 src/buddy.c:1764 src/buddy_chat.c:711
+#: src/conversation.c:1107 src/dialogs.c:434 src/plugins.c:307 src/prefs.c:807
 msgid "Close"
 msgstr "¹Ø±Õ"
 
@@ -34,51 +34,51 @@
 msgid "You must give your password"
 msgstr "ÄãÐèÒªÊäÈëÃÜÂë"
 
-#: src/aim.c:229 src/buddy.c:1761
+#: src/aim.c:230 src/buddy.c:1759
 msgid "Signoff"
 msgstr "À뿪"
 
-#: src/aim.c:339 src/aim.c:545 src/buddy.c:369 src/gnome_applet_mgr.c:373
+#: src/aim.c:340 src/aim.c:546 src/buddy.c:369 src/gnome_applet_mgr.c:373
 msgid "Signon"
 msgstr "怬"
 
-#: src/aim.c:340 src/buddy_chat.c:103 src/buddy_chat.c:178 src/dialogs.c:370
-#: src/dialogs.c:644 src/dialogs.c:760 src/dialogs.c:870 src/dialogs.c:999
-#: src/dialogs.c:1129 src/dialogs.c:1200 src/dialogs.c:1288 src/dialogs.c:1477
-#: src/dialogs.c:1662 src/dialogs.c:1760 src/dialogs.c:1849 src/rvous.c:279
+#: src/aim.c:341 src/buddy_chat.c:103 src/buddy_chat.c:178 src/dialogs.c:370
+#: src/dialogs.c:645 src/dialogs.c:761 src/dialogs.c:871 src/dialogs.c:1000
+#: src/dialogs.c:1130 src/dialogs.c:1201 src/dialogs.c:1289 src/dialogs.c:1478
+#: src/dialogs.c:1663 src/dialogs.c:1761 src/dialogs.c:1850 src/rvous.c:279
 #: src/rvous.c:414 src/rvous.c:633
 msgid "Cancel"
 msgstr "È¡Ïû"
 
-#: src/aim.c:341 src/buddy.c:1758
+#: src/aim.c:342 src/buddy.c:1756
 msgid "Register"
 msgstr "×¢²á"
 
-#: src/aim.c:342
+#: src/aim.c:343
 msgid "Options"
 msgstr "Ñ¡Ïî"
 
-#: src/aim.c:344 src/aim.c:551 src/buddy.c:1823
+#: src/aim.c:345 src/aim.c:552 src/buddy.c:1821
 msgid "Plugins"
 msgstr "²å¼þ"
 
-#: src/aim.c:407
+#: src/aim.c:408
 msgid "Screen Name: "
 msgstr "ÏÔʾµÄÐÕÃû£º"
 
-#: src/aim.c:410
+#: src/aim.c:411
 msgid "Password: "
 msgstr "ÃÜÂ룺"
 
-#: src/aim.c:413
+#: src/aim.c:414
 msgid "Remember Password"
 msgstr "¼ÇסÃÜÂë"
 
-#: src/aim.c:460
+#: src/aim.c:461
 msgid "Gaim - Login"
 msgstr "Gaim - µÇÈë"
 
-#: src/aim.c:540 src/buddy.c:1820
+#: src/aim.c:541 src/buddy.c:1818
 msgid "Preferences"
 msgstr "ÓÅÏÈÑ¡Ïî"
 
@@ -108,28 +108,28 @@
 msgstr "%d/%d ÅóÓÑÀ´ÁË"
 
 #: src/buddy.c:273 src/buddy.c:278 src/buddy.c:281 src/buddy.c:286
-#: src/buddy.c:1920 src/buddy.c:1989 src/conversation.c:368
-#: src/conversation.c:1112 src/dialogs.c:761 src/dialogs.c:1478
-#: src/dialogs.c:1502 src/prefs.c:1001
+#: src/buddy.c:1918 src/buddy.c:1987 src/conversation.c:368
+#: src/conversation.c:1112 src/dialogs.c:762 src/dialogs.c:1479
+#: src/dialogs.c:1503 src/prefs.c:997
 msgid "Add"
 msgstr "Ôö¼Ó"
 
 #: src/buddy.c:274 src/buddy.c:279 src/buddy.c:282 src/buddy.c:287
-#: src/buddy.c:1921 src/buddy.c:1990 src/conversation.c:1109 src/dialogs.c:708
-#: src/prefs.c:1002
+#: src/buddy.c:1919 src/buddy.c:1988 src/conversation.c:1109 src/dialogs.c:709
+#: src/prefs.c:998
 msgid "Remove"
 msgstr "ɾ³ý"
 
-#: src/buddy.c:275 src/buddy.c:283 src/buddy.c:1869
+#: src/buddy.c:275 src/buddy.c:283 src/buddy.c:1867
 msgid "Chat"
 msgstr "ÁÄÌì"
 
-#: src/buddy.c:276 src/buddy.c:284 src/buddy.c:437 src/buddy.c:1867
+#: src/buddy.c:276 src/buddy.c:284 src/buddy.c:437 src/buddy.c:1865
 #: src/buddy_chat.c:716
 msgid "IM"
 msgstr "¼´Ê±ÐÅÏ¢"
 
-#: src/buddy.c:277 src/buddy.c:285 src/buddy.c:443 src/buddy.c:1868
+#: src/buddy.c:277 src/buddy.c:285 src/buddy.c:443 src/buddy.c:1866
 #: src/buddy_chat.c:718 src/conversation.c:1104 src/rvous.c:631
 msgid "Info"
 msgstr "Ïêϸ×ÊÁÏ"
@@ -150,11 +150,11 @@
 msgid "Add Buddy Pounce"
 msgstr "Ôö¼Ó¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:572 src/buddy.c:1020 src/buddy.c:2025 src/dialogs.c:1493
+#: src/buddy.c:572 src/buddy.c:1020 src/buddy.c:2023 src/dialogs.c:1494
 msgid "Permit"
 msgstr "ÔÊÐí"
 
-#: src/buddy.c:588 src/dialogs.c:1488
+#: src/buddy.c:588 src/dialogs.c:1489
 msgid "Deny"
 msgstr "¾Ü¾ø"
 
@@ -181,7 +181,6 @@
 "µÇÈëµ½£º%s\n"
 "%s%s%s"
 
-
 #: src/buddy.c:1468
 msgid "Idle: "
 msgstr "¿Õתʱ¼ä£º"
@@ -196,128 +195,128 @@
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s À뿪ÁË %s%s ¡£</B><BR><HR>"
 
-#: src/buddy.c:1747
+#: src/buddy.c:1745
 msgid "File"
 msgstr "Îļþ"
 
-#: src/buddy.c:1751
+#: src/buddy.c:1749
 msgid "Add A Buddy"
 msgstr "¼ÓÈëÒ»¸ö¸çÃǶù"
 
-#: src/buddy.c:1753
+#: src/buddy.c:1751
 msgid "Import Buddy List"
 msgstr "µ¼ÈëÅóÓÑÁбí"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1752
 msgid "Export Buddy List"
 msgstr "µ¼³öÅóÓÑÁбí"
 
-#: src/buddy.c:1764
+#: src/buddy.c:1762
 msgid "Quit"
 msgstr "Í˳ö"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1769
 msgid "Tools"
 msgstr "¹¤¾ß"
 
-#: src/buddy.c:1776 src/gnome_applet_mgr.c:199 src/gnome_applet_mgr.c:284
-#: src/prefs.c:601
+#: src/buddy.c:1774 src/gnome_applet_mgr.c:199 src/gnome_applet_mgr.c:284
+#: src/prefs.c:597
 msgid "Away"
 msgstr "ÔÝʱÀ뿪"
 
-#: src/buddy.c:1781
+#: src/buddy.c:1779
 msgid "Buddy Pounce"
 msgstr "¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1789
+#: src/buddy.c:1787
 msgid "Search for Buddy"
 msgstr "ËÑÑ°ÅóÓÑ"
 
-#: src/buddy.c:1792
+#: src/buddy.c:1790
 msgid "by Email"
 msgstr "ʹÓõçÓÊ"
 
-#: src/buddy.c:1796
+#: src/buddy.c:1794
 msgid "by Dir Info"
 msgstr "ʹÓÃÐÕÃûµØַ¼"
 
-#: src/buddy.c:1803
+#: src/buddy.c:1801
 msgid "Settings"
 msgstr "É趨"
 
-#: src/buddy.c:1806
+#: src/buddy.c:1804
 msgid "User Info"
 msgstr "Óû§Ïêϸ×ÊÁÏ"
 
-#: src/buddy.c:1810
+#: src/buddy.c:1808
 msgid "Directory Info"
 msgstr "ÐÕÃûµØַ¼"
 
-#: src/buddy.c:1814
+#: src/buddy.c:1812
 msgid "Change Password"
 msgstr "¸ü¸ÄÃÜÂë"
 
-#: src/buddy.c:1828
+#: src/buddy.c:1826
 msgid "Help"
 msgstr "°ïÖú"
 
-#: src/buddy.c:1833
+#: src/buddy.c:1831
 msgid "About"
 msgstr "¹ØÓÚ"
 
-#: src/buddy.c:1881
+#: src/buddy.c:1879
 msgid "Buddy List"
 msgstr "ÅóÓÑÁбí"
 
-#: src/buddy.c:1904
+#: src/buddy.c:1902
 msgid "Information on selected Buddy"
 msgstr "Ñ¡ÖеÄÅóÓѵÄ×ÊÁÏ"
 
-#: src/buddy.c:1905
+#: src/buddy.c:1903
 msgid "Send Instant Message"
 msgstr "·¢³ö¼´Ê±ÐÅÏ¢"
 
-#: src/buddy.c:1906
+#: src/buddy.c:1904
 msgid "Start/join a Buddy Chat"
 msgstr "·¢Æ𣯼ÓÈëÒ»¸öÁÄÌìÊÒ"
 
-#: src/buddy.c:1941
+#: src/buddy.c:1939
 msgid "Add a new Buddy"
 msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
 
-#: src/buddy.c:1942
+#: src/buddy.c:1940
 msgid "Remove selected Buddy"
 msgstr "ɾ³ýÑ¡ÖеÄÅóÓÑ"
 
-#: src/buddy.c:1965
+#: src/buddy.c:1963
 msgid "Allow anyone"
 msgstr "ÈκÎÈ˶¼¿ÉÒÔ"
 
-#: src/buddy.c:1972
+#: src/buddy.c:1970
 msgid "Permit some"
 msgstr "Ö»ÔÊÐíijЩÈË"
 
-#: src/buddy.c:1980
+#: src/buddy.c:1978
 msgid "Deny some"
 msgstr "¾Ü¾øijЩÈË"
 
-#: src/buddy.c:2001
+#: src/buddy.c:1999
 msgid "Add buddy to permit/deny"
 msgstr "°ÑijÈ˼ÓÈëÔÊÐí£¯¾Ü¾ø±í"
 
-#: src/buddy.c:2002
+#: src/buddy.c:2000
 msgid "Remove buddy from permit/deny"
 msgstr "°ÑijÈË´ÓÔÊÐí£¯¾Ü¾ø±íɾ³ý"
 
-#: src/buddy.c:2021
+#: src/buddy.c:2019
 msgid "Online"
 msgstr "ÔÚÏß"
 
-#: src/buddy.c:2023
+#: src/buddy.c:2021
 msgid "Edit Buddies"
 msgstr "ÐÞ¸ÄÅóÓѱí"
 
-#: src/buddy.c:2072
+#: src/buddy.c:2070
 msgid "Gaim - Buddy List"
 msgstr "Gaim - ÅóÓÑÁбí"
 
@@ -353,7 +352,7 @@
 msgid "Whisper"
 msgstr "ÇÄÇÄ»°"
 
-#: src/buddy_chat.c:714 src/conversation.c:1103 src/dialogs.c:1289
+#: src/buddy_chat.c:714 src/conversation.c:1103 src/dialogs.c:1290
 msgid "Send"
 msgstr "Ëͳö"
 
@@ -365,7 +364,7 @@
 msgid "Bold"
 msgstr "´ÖÌå"
 
-#: src/buddy_chat.c:803 src/conversation.c:1188 src/prefs.c:780
+#: src/buddy_chat.c:803 src/conversation.c:1188 src/prefs.c:776
 msgid "Bold Text"
 msgstr "´ÖÌåÎÄ×Ö"
 
@@ -374,7 +373,7 @@
 msgid "Italics"
 msgstr "бÌå"
 
-#: src/buddy_chat.c:807 src/conversation.c:1192 src/prefs.c:781
+#: src/buddy_chat.c:807 src/conversation.c:1192 src/prefs.c:777
 msgid "Italics Text"
 msgstr "бÌåÎÄ×Ö"
 
@@ -425,8 +424,8 @@
 msgid "Font"
 msgstr "×ÖÐÍ"
 
-#: src/buddy_chat.c:823 src/conversation.c:1208 src/dialogs.c:2074
-#: src/dialogs.c:2093 src/prefs.c:786
+#: src/buddy_chat.c:823 src/conversation.c:1208 src/dialogs.c:2075
+#: src/dialogs.c:2094 src/prefs.c:782
 msgid "Select Font"
 msgstr "Ñ¡Ôñ×ÖÐÍ"
 
@@ -479,7 +478,7 @@
 msgid "Message too long, some data truncated."
 msgstr "ÐÅϢ̫³¤ÁË£¬ºóÃæµÄ±»¿³µôÁË¡£"
 
-#: src/conversation.c:500 src/dialogs.c:2181 src/dialogs.c:2252
+#: src/conversation.c:500 src/dialogs.c:2182 src/dialogs.c:2253
 #: src/rvous.c:221 src/rvous.c:488
 msgid "Error"
 msgstr "´íÎó"
@@ -527,334 +526,333 @@
 msgid "Gaim - Warn user?"
 msgstr "Gaim - ¾¯¸æÓû§£¿"
 
-#: src/dialogs.c:481
+#: src/dialogs.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "²»ÄÜдÈëÎļþ %s¡£"
 
-#: src/dialogs.c:484
+#: src/dialogs.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "²»ÄܶÁÈëÎļþ %s¡£"
 
-#: src/dialogs.c:487
+#: src/dialogs.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "ÐÅϢ̫³¤£¬ºóÃæ %s ×ÖÔª±»¿³µôÁË¡£"
 
-#: src/dialogs.c:490
+#: src/dialogs.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ÏÖÔÚûÓеÇÈë¡£"
 
-#: src/dialogs.c:493
+#: src/dialogs.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "²»ÔÊÐí¾¯¸æ %s ¡£"
 
-#: src/dialogs.c:496
+#: src/dialogs.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "È¡ÏûÁËÒ»¸öÐÅÏ¢£¬Ä㳬³öÁË·þÊÌÆ÷µÄËÙ¶ÈÏÞÖÆ¡£"
 
-#: src/dialogs.c:499
+#: src/dialogs.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "ÔÚ %s ÖÐûÓÐÁÄÌì¡£"
 
-#: src/dialogs.c:502
+#: src/dialogs.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Äã·¢Ë͸ø %s µÄËÙ¶ÈÌ«¿ìÁË¡£"
 
-#: src/dialogs.c:505
+#: src/dialogs.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅÏ¢·¢Ë͵ÄËÙ¶ÈÌ«¿ì¡£"
 
-#: src/dialogs.c:511
+#: src/dialogs.c:512
 msgid "Failure."
 msgstr "ʧ°ÜÁË¡£"
 
-#: src/dialogs.c:514
+#: src/dialogs.c:515
 msgid "Too many matches."
 msgstr "Æ¥ÅäÌ«¶à¡£"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:518
 msgid "Need more qualifiers."
 msgstr "ÐèÒª¸ü¶àµÄ²ÎÊý¡£"
 
-#: src/dialogs.c:520
+#: src/dialogs.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "ÐÕÃûµØַ¼·þÎñÆ÷ÔÝʱÁ¬²»ÉÏ¡£"
 
-#: src/dialogs.c:523
+#: src/dialogs.c:524
 msgid "Email lookup restricted."
 msgstr "µçÓʲéÕÒÏÞÖÆ¡£"
 
-#: src/dialogs.c:526
+#: src/dialogs.c:527
 msgid "Keyword ignored."
 msgstr "¹Ø¼ü×Ö±»ºöÂÔ¡£"
 
-#: src/dialogs.c:529
+#: src/dialogs.c:530
 msgid "No keywords."
 msgstr "ûÓйؼü×Ö¡£"
 
-#: src/dialogs.c:532
+#: src/dialogs.c:533
 msgid "User has no directory information."
 msgstr "¸ÃÓû§Ã»ÓÐÐÕÃûµØַ¼"
 
-#: src/dialogs.c:536
+#: src/dialogs.c:537
 msgid "Country not supported."
 msgstr "²»Ö§³ÖÕâ¸ö¹ú¼Ò¡£"
 
-#: src/dialogs.c:539
+#: src/dialogs.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "²»Ã÷´íÎó£º %s ¡£"
 
-#: src/dialogs.c:542
+#: src/dialogs.c:543
 msgid "Incorrect nickname or password."
 msgstr "êÇÃû»òÕßÃÜÂë´íÎó¡£"
 
-#: src/dialogs.c:545
+#: src/dialogs.c:546
 msgid "The service is temporarily unavailable."
 msgstr "ÔÝʱûÓи÷þÎñ¡£"
 
-#: src/dialogs.c:548
+#: src/dialogs.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "ÄãÄ¿Ç°µÄ¾¯¸æ¼¶±ðÌ«¸ß£¬ÎÞ·¨µÇÈë¡£"
 
-#: src/dialogs.c:551
+#: src/dialogs.c:552
 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:554
+#: src/dialogs.c:555
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "·¢Éú²»Ã÷µÄµÇ¼´íÎó£º %s¡£"
 
-#: src/dialogs.c:557
+#: src/dialogs.c:558
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "²»Ã÷´íÎó %d ·¢ÉúÁË¡£¾ßÌåѶϢ£º %s"
 
-#: src/dialogs.c:560
+#: src/dialogs.c:561
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - ´íÎó %d"
 
-#: src/dialogs.c:600 src/dialogs.c:645 src/dialogs.c:871 src/dialogs.c:1378
-#: src/dialogs.c:1663 src/dialogs.c:1761
+#: src/dialogs.c:601 src/dialogs.c:646 src/dialogs.c:872 src/dialogs.c:1379
+#: src/dialogs.c:1664 src/dialogs.c:1762
 msgid "OK"
 msgstr "È·ÈÏ"
 
-#: src/dialogs.c:654
+#: src/dialogs.c:655
 msgid "IM who: "
 msgstr "¸øË­¼´Ê±ÐÅÏ¢£º"
 
-#: src/dialogs.c:680
+#: src/dialogs.c:681
 msgid "Gaim - IM user"
 msgstr "Gaim - ¼´Ê±ÐÅÏ¢Óû§"
 
-#: src/dialogs.c:732
+#: src/dialogs.c:733
 msgid "Buddies"
 msgstr "¸çÃǶùÃÇ"
 
-#: src/dialogs.c:776
+#: src/dialogs.c:777
 msgid "Add Buddy"
 msgstr "Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:779
 msgid "Buddy"
 msgstr "ÅóÓÑ"
 
-#: src/dialogs.c:785
+#: src/dialogs.c:786
 msgid "Group"
 msgstr "×éȺ"
 
-#: src/dialogs.c:815
+#: src/dialogs.c:816
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:881
+#: src/dialogs.c:882
 msgid "Buddy To Pounce:"
 msgstr "±»¼àÊÓµÄÅóÓÑ£º"
 
-#: src/dialogs.c:886
+#: src/dialogs.c:887
 msgid "Open IM Window on Buddy Logon"
 msgstr "ÅóÓѵǼʱ´ò¿ª¼´Ê±ÐÅÏ¢´°¿Ú"
 
-#: src/dialogs.c:889
+#: src/dialogs.c:890
 msgid "Send IM on Buddy Logon"
 msgstr "ÅóÓѵǼʱ·¢Ëͼ´Ê±ÐÅÏ¢"
 
-#: src/dialogs.c:897
+#: src/dialogs.c:898
 msgid "Message to send:"
 msgstr "·¢ËÍÐÅÏ¢£º"
 
-#: src/dialogs.c:924
+#: src/dialogs.c:925
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ÐÂÔö¼àÊÓÅóÓÑ"
 
-#: src/dialogs.c:1000 src/dialogs.c:1201
+#: src/dialogs.c:1001 src/dialogs.c:1202
 msgid "Save"
 msgstr "´æÅÌ"
 
-#: src/dialogs.c:1022
+#: src/dialogs.c:1023
 msgid "Allow Web Searches To Find Your Info"
 msgstr "ÔÊÐí´ÓÍøÒ³ËÑÑ°ÕÒµ½ÄãµÄ×ÊÁÏ"
 
-#: src/dialogs.c:1024 src/dialogs.c:1680
+#: src/dialogs.c:1025 src/dialogs.c:1681
 msgid "First Name"
 msgstr "Ãû"
 
-#: src/dialogs.c:1029 src/dialogs.c:1685
+#: src/dialogs.c:1030 src/dialogs.c:1686
 msgid "Middle Name"
 msgstr "×Ö"
 
-#: src/dialogs.c:1034 src/dialogs.c:1690
+#: src/dialogs.c:1035 src/dialogs.c:1691
 msgid "Last Name"
 msgstr "ÐÕ"
 
-#: src/dialogs.c:1039 src/dialogs.c:1695
+#: src/dialogs.c:1040 src/dialogs.c:1696
 msgid "Maiden Name"
 msgstr "Äï¼ÒÐÕ"
 
-#: src/dialogs.c:1044 src/dialogs.c:1700
+#: src/dialogs.c:1045 src/dialogs.c:1701
 msgid "City"
 msgstr "ÊÐ"
 
-#: src/dialogs.c:1049 src/dialogs.c:1705
+#: src/dialogs.c:1050 src/dialogs.c:1706
 msgid "State"
 msgstr "Ê¡"
 
-#: src/dialogs.c:1054 src/dialogs.c:1710
+#: src/dialogs.c:1055 src/dialogs.c:1711
 msgid "Country"
 msgstr "¹ú"
 
-#: src/dialogs.c:1085
+#: src/dialogs.c:1086
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - É趨ÐÕÃûµØַ¼"
 
-#: src/dialogs.c:1102
+#: src/dialogs.c:1103
 msgid "New Passwords Do Not Match"
 msgstr "ÐÂÃÜÂë²»Ò»ÖÂ"
 
-#: src/dialogs.c:1102 src/dialogs.c:1107
+#: src/dialogs.c:1103 src/dialogs.c:1108
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ¸ü¸ÄÃÜÂë´íÎó"
 
-#: src/dialogs.c:1107
+#: src/dialogs.c:1108
 msgid "Fill out all fields completely"
 msgstr "°ÑËùÓеıí¸ñ¶¼ÌíÁË"
 
-#: src/dialogs.c:1128 src/dialogs.c:1850
+#: src/dialogs.c:1129 src/dialogs.c:1851
 msgid "Ok"
 msgstr "È·¶¨"
 
-#: src/dialogs.c:1138
+#: src/dialogs.c:1139
 msgid "Original Password"
 msgstr "¾ÉÃÜÂë"
 
-#: src/dialogs.c:1146
+#: src/dialogs.c:1147
 msgid "New Password"
 msgstr "ÐÂÃÜÂë"
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1155
 msgid "New Password (again)"
 msgstr "ÐÂÃÜÂ루ȷ¶¨£©"
 
-#: src/dialogs.c:1177
+#: src/dialogs.c:1178
 msgid "Gaim - Password Change"
 msgstr "Gaim - ¸ü¸ÄÃÜÂë"
 
-#: src/dialogs.c:1240
+#: src/dialogs.c:1241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - É趨Óû§×ÊÁÏ"
 
-#: src/dialogs.c:1384
+#: src/dialogs.c:1385
 msgid "Below are the results of your search: "
 msgstr "ÒÔÏÂÊÇÄãËÑË÷µÄ½á¹û£º"
 
-#: src/dialogs.c:1531
+#: src/dialogs.c:1532
 msgid "Gaim - Add Permit/Deny"
 msgstr "Gaim - Ôö¼Ó ÔÊÐí£¯½ûÖ¹"
 
-#: src/dialogs.c:1592
+#: src/dialogs.c:1593
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
 
-#: src/dialogs.c:1737
+#: src/dialogs.c:1738
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - ¸ù¾ÝÓû§×ÊÁϲéÑ°ÅóÓÑ"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1773
 msgid "Email"
 msgstr "µçÓÊ"
 
-#: src/dialogs.c:1795
+#: src/dialogs.c:1796
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ¸ù¾ÝµçÓʲéÑ°ÅóÓÑ"
 
-#: src/dialogs.c:1866
+#: src/dialogs.c:1867
 msgid "URL"
 msgstr ""
 
-#: src/dialogs.c:1871
+#: src/dialogs.c:1872
 msgid "Description"
 msgstr "ÃèÊö"
 
-#: src/dialogs.c:1893
+#: src/dialogs.c:1894
 msgid "GAIM - Add URL"
 msgstr "GAIM - Ôö¼Ó URL"
 
-#: src/dialogs.c:1958
+#: src/dialogs.c:1959
 msgid "Select Text Color"
 msgstr "É趨ÎÄ×ÖÑÕÉ«"
 
-#: src/dialogs.c:2180 src/rvous.c:220
+#: src/dialogs.c:2181 src/rvous.c:220
 #, c-format
 msgid "Error writing file %s"
 msgstr "дÈëÎļþ %s ·¢Éú´íÎó"
 
-#: src/dialogs.c:2197
+#: src/dialogs.c:2198
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - µ¼³öÅóÓÑÁбí"
 
-#: src/dialogs.c:2251 src/rvous.c:487
+#: src/dialogs.c:2252 src/rvous.c:487
 #, c-format
 msgid "Error reading file %s"
 msgstr "¶ÁÈ¡Îļþ %s ·¢Éú´íÎó"
 
-#: src/dialogs.c:2317
+#: src/dialogs.c:2318
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - µ¼ÈëÅóÓÑÁбí"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2393
 msgid "Gaim - New away message"
 msgstr "Gaim - ¸üÐÂÔÝʱÀ뿪ÐÅÏ¢"
 
 #. Make a label for away entry
-#: src/dialogs.c:2402
+#: src/dialogs.c:2403
 msgid "Away title: "
 msgstr "ÔÝʱÀ뿪±êÌ⣺"
 
 #. make create button
-#: src/dialogs.c:2424
+#: src/dialogs.c:2425
 msgid "Create new message"
 msgstr "½¨Á¢ÐµÄÐÅÏ¢"
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:2429
+#: src/dialogs.c:2430
 msgid "Make away now"
 msgstr "Á¢¼´É趨ΪÔÝʱÀ뿪"
 
@@ -992,7 +990,7 @@
 msgid "Connection established, cookie sent"
 msgstr "Á¬½Ó³É¹¦£¬Ëͳö±ý¸É¡£¡£°¡£¡±ý¸É£¿£¡"
 
-#: src/oscar.c:640
+#: src/oscar.c:636
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1004,304 +1002,316 @@
 "<BR>Á¬Ïßʱ¿Ì£º <B>%s</B><BR>¿Õתʱ¼ä£¨·ÖÖÓ£©£º <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-
-#: src/plugins.c:103
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr "Gaim - ²å¼þÁбí"
 
-#: src/plugins.c:166 src/plugins.c:173 src/plugins.c:204
+#: src/plugins.c:156
+#, c-format
+msgid "Already loaded %s, not reloading.\n"
+msgstr ""
+
+#: src/plugins.c:179 src/plugins.c:186 src/plugins.c:217
 msgid "Plugin Error"
 msgstr "²å¼þ´íÎó"
 
-#: src/plugins.c:251
+#: src/plugins.c:264
 msgid "Gaim - Plugins"
 msgstr "Gaim - ²å¼þ"
 
-#: src/plugins.c:280
+#: src/plugins.c:293
 msgid "Load Plugin"
 msgstr "ÔØÈë²å¼þ"
 
-#: src/plugins.c:285
+#: src/plugins.c:298
 msgid "Configure Plugin"
 msgstr "É趨²å¼þ"
 
-#: src/plugins.c:289
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr "жÔزå¼þ"
 
-#: src/prefs.c:363
+#: src/prefs.c:358
 msgid "Gaim - Preferences"
 msgstr "Gaim - ÓÅÏÈÉ趨"
 
-#: src/prefs.c:375
+#: src/prefs.c:370
 msgid "General"
 msgstr "Ò»°ãÉ趨"
 
-#: src/prefs.c:380
+#: src/prefs.c:375
 msgid "Idle"
 msgstr "¿Õת"
 
-#: src/prefs.c:388
+#: src/prefs.c:383
 msgid "Enter sends message"
 msgstr "ÊäÈë·¢ËÍÐÅÏ¢"
 
-#: src/prefs.c:389
+#: src/prefs.c:384
 msgid "Auto-login"
 msgstr "×Ô¶¯µÇ¼"
 
-#: src/prefs.c:390
+#: src/prefs.c:385
 msgid "Log All Conversations"
 msgstr "¼Ç¼ËùÓжԻ°ÄÚÈÝ"
 
-#: src/prefs.c:391
+#: src/prefs.c:386
 msgid "Strip HTML from log files"
 msgstr "Çå³ý¼Ç¼ÎļþÄÚµÄ HTML ±ê¼Ç"
 
-#: src/prefs.c:392
+#: src/prefs.c:387
 msgid "Raise windows when message recieved"
 msgstr "ÊÕµ½ÐÅϢʱÉýÆð´°¿Ú"
 
-#: src/prefs.c:393
+#: src/prefs.c:388
 msgid "Raise chat windows when people speak"
 msgstr "ÓÐÈË˵»°Ê±ÉýÆðÁÄÌì´°¿Ú"
 
-#: src/prefs.c:394
+#: src/prefs.c:389
 msgid "Send URLs as links"
 msgstr "°Ñ URL ÒÔÁ¬½Ó·½Ê½Ëͳö"
 
-#: src/prefs.c:395
+#: src/prefs.c:390
 msgid "Show Lag-O-Meter"
 msgstr "ÏÔʾÖͺóÒDZí"
 
-#: src/prefs.c:396
+#: src/prefs.c:391
 msgid "Save some window size/positions"
 msgstr "±£´æijЩ´°¿Ú´óСºÍλÖÃ"
 
-#: src/prefs.c:397
+#: src/prefs.c:392
 msgid "Ignore new conversations when away"
 msgstr "ÔÝʱÀ뿪ʱ£¬ºöÂÔеĶԻ°"
 
-#: src/prefs.c:398
+#: src/prefs.c:393
 msgid "Automagically highlight misspelled words"
 msgstr "×Ô¶¯Í»³öÆ´´íµÄµ¥´Ê"
 
-#: src/prefs.c:399
+#: src/prefs.c:394
 msgid "Sending messages removes away status"
 msgstr "·¢³öÐÅϢʱ×Ô¶¯È¡ÏûÔÝʱÀ뿪״̬"
 
-#: src/prefs.c:402
+#: src/prefs.c:397
 msgid "Enable debug mode"
 msgstr "´ò¿ª³ý³æģʽ"
 
-#: src/prefs.c:405
+#: src/prefs.c:400
 msgid "No Idle"
 msgstr "ûÓпÕת"
 
-#: src/prefs.c:412
+#: src/prefs.c:407
 msgid "GAIM Use"
 msgstr "GAIM ʹÓÃ"
 
-#: src/prefs.c:440
+#: src/prefs.c:435
 msgid "Applet"
 msgstr ""
 
-#: src/prefs.c:447
+#: src/prefs.c:442
 msgid "Automatically Show Buddy List"
 msgstr "×Ô¶¯ÏÔʾÅóÓÑÁбí"
 
-#: src/prefs.c:448
+#: src/prefs.c:443
 msgid "Sounds go through GNOME"
 msgstr "ÉùÒôͨ¹ý GNOME"
 
-#: src/prefs.c:449
+#: src/prefs.c:444
 msgid "Buddy list displays near the applet"
 msgstr "ÔÚ applet ¸½½üÏÔʾÅóÓÑÁбí"
 
-#: src/prefs.c:461
+#: src/prefs.c:455
 msgid "Connection"
 msgstr "Á¬½Ó"
 
-#: src/prefs.c:466
+#: src/prefs.c:459
+msgid "Use Oscar Protocol (experimental; only takes effect before signon)"
+msgstr ""
+
+#: src/prefs.c:460
+msgid "The following options do not apply if you use Oscar."
+msgstr ""
+
+#: src/prefs.c:464
 msgid "TOC Host:"
 msgstr "TOC Ö÷»ú£º"
 
-#: src/prefs.c:473 src/prefs.c:495 src/prefs.c:548
+#: src/prefs.c:471 src/prefs.c:493 src/prefs.c:546
 msgid "Port:"
 msgstr "¶Ë¿Ú£º"
 
-#: src/prefs.c:488
+#: src/prefs.c:486
 msgid "Login Host:"
 msgstr "µÇÈëÖ÷»ú£º"
 
-#: src/prefs.c:509
+#: src/prefs.c:507
 msgid "No Proxy"
 msgstr "ûÓдúÀí"
 
-#: src/prefs.c:516
+#: src/prefs.c:514
 msgid "HTTP Proxy"
 msgstr "HTTP ´úÀí"
 
-#: src/prefs.c:524
+#: src/prefs.c:522
 msgid "SOCKS v4 Proxy"
 msgstr "SOCKS v4 ´úÀí"
 
-#: src/prefs.c:532
+#: src/prefs.c:530
 msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 msgstr "SOCKS v5 ´úÀí £¨»¹²»ÄÜÓã¡£©"
 
-#: src/prefs.c:541
+#: src/prefs.c:539
 msgid "Proxy Host:"
 msgstr "´úÀíÖ÷»ú£º"
 
-#: src/prefs.c:628
+#: src/prefs.c:624
 msgid "Create Message"
 msgstr "´´×÷ÐÅÏ¢"
 
-#: src/prefs.c:632
+#: src/prefs.c:628
 msgid "Remove Message"
 msgstr "ɾ³ýÐÅÏ¢"
 
-#: src/prefs.c:671
+#: src/prefs.c:667
 msgid "Sounds"
 msgstr "ÉùÒô"
 
-#: src/prefs.c:674
+#: src/prefs.c:670
 msgid "Sound when buddy logs in"
 msgstr "ÅóÓѵǼÉù"
 
-#: src/prefs.c:675
+#: src/prefs.c:671
 msgid "Sound when buddy logs out"
 msgstr "ÅóÓѵdzöÉù"
 
-#: src/prefs.c:676
+#: src/prefs.c:672
 msgid "Sound when message is received"
 msgstr "ÊÕµ½ÐÅÏ¢Éù"
 
-#: src/prefs.c:677
+#: src/prefs.c:673
 msgid "Sound when message is sent"
 msgstr "·¢³öÐÅÏ¢Éù"
 
-#: src/prefs.c:678
+#: src/prefs.c:674
 msgid "Sound when first message is received"
 msgstr "ÊÕµ½µÚÒ»¸öÐÅÏ¢Éù"
 
-#: src/prefs.c:679
+#: src/prefs.c:675
 msgid "Sound when message is received if away"
 msgstr "ÔÝʱÀ뿪ʱÊÕµ½ÐÅÏ¢Éù"
 
-#: src/prefs.c:680
+#: src/prefs.c:676
 msgid "No sound for buddies signed on when you log in"
 msgstr "ÄãµÇ¼ºóÓÐÅóÓѵǼ²»·¢Éù"
 
-#: src/prefs.c:681
+#: src/prefs.c:677
 msgid "Sounds in chat rooms when people enter/leave"
 msgstr "ÁÄÌìÊÒÀÅóÓѽøÈ룯À뿪Éù"
 
-#: src/prefs.c:682
+#: src/prefs.c:678
 msgid "Sounds in chat rooms when people talk"
 msgstr "ÁÄÌìÊÒÓÐÈË˵»°Éù"
 
-#: src/prefs.c:689
+#: src/prefs.c:685
 msgid "Browser"
 msgstr "ä¯ÀÀÆ÷"
 
-#: src/prefs.c:694
+#: src/prefs.c:690
 msgid "Netscape"
 msgstr ""
 
-#: src/prefs.c:701
+#: src/prefs.c:697
 msgid "KFM (The KDE browser)"
 msgstr "KFM £¨ KDE ×ÀÃæµÄä¯ÀÀÆ÷£©"
 
-#: src/prefs.c:709
+#: src/prefs.c:705
 msgid "Internal HTML widget (Quite likely a bad idea!)"
 msgstr "ÄÚ²¿³¬Îı¾Îļþ¿Ø¼þ £¨×îºÃ±ðÓã¡£©"
 
-#: src/prefs.c:717
+#: src/prefs.c:713
 msgid "Manual"
 msgstr "Óû§ÊÖ²á"
 
-#: src/prefs.c:731
+#: src/prefs.c:727
 msgid "Pop up new window by default"
 msgstr "ȱʡµ¯³öд°¿Ú"
 
-#: src/prefs.c:755
+#: src/prefs.c:751
 msgid "Appearance"
 msgstr "Íâ¹Û"
 
-#: src/prefs.c:759
+#: src/prefs.c:755
 msgid "Font Properties"
 msgstr "×ÖÐÍÉ趨"
 
-#: src/prefs.c:766
+#: src/prefs.c:762
 msgid "Show time on messages"
 msgstr "ÔÚÐÅÏ¢ÀïÏÔʾʱ¼ä"
 
-#: src/prefs.c:767
+#: src/prefs.c:763
 msgid "Show numbers in groups"
 msgstr "ÔÚ×éÀïÏÔʾºÅÂë"
 
-#: src/prefs.c:768
+#: src/prefs.c:764
 msgid "Show buddy-type pixmaps"
 msgstr "ÏÔʾÅóÓÑÀà±ðͼÐÎ"
 
-#: src/prefs.c:769
+#: src/prefs.c:765
 msgid "Show idle times"
 msgstr "ÏÔʾ¿Õתʱ¼ä"
 
-#: src/prefs.c:770
+#: src/prefs.c:766
 msgid "Show button pixmaps"
 msgstr "ÏÔʾͼÐΰ´Å¥"
 
-#: src/prefs.c:771
+#: src/prefs.c:767
 msgid "Ignore incoming colours"
 msgstr "²»Àí½øÀ´µÄÑÕÉ«"
 
-#: src/prefs.c:775
+#: src/prefs.c:771
 msgid "Show logon/logoffs in conversation windows"
 msgstr "ÔÚ½»Ì¸´°¿ÚÏÔʾµÇ¼£¯µÇ³öÐÅÏ¢"
 
-#: src/prefs.c:776
+#: src/prefs.c:772
 msgid "Use devil icons"
 msgstr "ʹÓÃħ¹íͼ±ê"
 
-#: src/prefs.c:777
+#: src/prefs.c:773
 msgid "Show graphical smileys (experimental)"
 msgstr "ÏÔʾͼÐÎЦÁ³ £¨ÊÔÑé½×¶Î£©"
 
-#: src/prefs.c:782
+#: src/prefs.c:778
 msgid "Underlined Text"
 msgstr "ϼÓÏßÎÄ×Ö"
 
-#: src/prefs.c:783
+#: src/prefs.c:779
 msgid "Strike Text"
 msgstr "»®µôµÄÎÄ×Ö"
 
-#: src/prefs.c:784
+#: src/prefs.c:780
 msgid "Font Face for Text"
 msgstr "ÎÄ×ÖµÄ×ÖÐÍ"
 
-#: src/prefs.c:802
+#: src/prefs.c:798
 msgid "Buddy Chats"
 msgstr "ÅóÓÑÁÄÌì"
 
-#: src/prefs.c:925 src/prefs.c:927 src/prefs.c:1057 src/prefs.c:1059
+#: src/prefs.c:921 src/prefs.c:923 src/prefs.c:1053 src/prefs.c:1055
 msgid "Gaim Chat"
 msgstr "Gaim ÁÄÌì"
 
-#: src/prefs.c:1000
+#: src/prefs.c:996
 msgid "Refresh"
 msgstr "Ë¢ÐÂ"
 
-#: src/prefs.c:1031
+#: src/prefs.c:1027
 msgid "List of available chats"
 msgstr "ÏÖÓÐÁÄÌìÁбí"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1041
 msgid "List of subscribed chats"
 msgstr "¶©ÔĵÄÁÄÌìÁбí"
 
-#: src/prefs.c:1102
+#: src/prefs.c:1098
 msgid "GAIM debug output window"
 msgstr "GAIM ³ý³æÊä³ö´°¿Ú"