changeset 1638:f2645224b30a

[gaim-migrate @ 1648] I guess we should update configure.in and doc/gaim.1 :-) committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Fri, 23 Mar 2001 18:01:53 +0000
parents ce8efad14c77
children 285dd96928cd
files configure.in doc/gaim.1 po/de.po po/es.po po/fr.po po/ko.po po/zh_CN.po
diffstat 7 files changed, 4898 insertions(+), 3586 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Fri Mar 23 17:34:03 2001 +0000
+++ b/configure.in	Fri Mar 23 18:01:53 2001 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.11.0pre7])
+AM_INIT_AUTOMAKE([gaim], [0.11.0pre8])
 
 dnl Checks for programs.
 AC_ENABLE_STATIC(no)
--- a/doc/gaim.1	Fri Mar 23 17:34:03 2001 +0000
+++ b/doc/gaim.1	Fri Mar 23 18:01:53 2001 +0000
@@ -21,7 +21,7 @@
 .\" USA.
 .TH GAIM 1
 .SH NAME
-gaim v0.11.0pre5 \- Instant Messaging client
+gaim v0.11.0pre8 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
 \fBgaim\fR
--- a/po/de.po	Fri Mar 23 17:34:03 2001 +0000
+++ b/po/de.po	Fri Mar 23 18:01:53 2001 +0000
@@ -2,12 +2,11 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/gnome_applet_mgr.c:256
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2000-12-03 23:24-0800\n"
+"POT-Creation-Date: 2001-03-23 09:31-0800\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"
@@ -15,12 +14,59 @@
 "Content-Type: text/plain; charset=iso-8859\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:72
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#, fuzzy
+msgid "Get Info"
+msgstr "Benutzer-Info"
+
+#: plugins/yay/yay.c:169
+msgid "Your message did not get sent."
+msgstr ""
+
+#: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
+#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
+#: src/oscar.c:1390
+msgid "Gaim - Error"
+msgstr "gAIM - Fehler"
+
+#: plugins/yay/yay.c:187
+#, c-format
+msgid "%s has made %s their buddy%s%s"
+msgstr ""
+
+#: plugins/yay/yay.c:189
+#, fuzzy
+msgid "Gaim - Buddy"
+msgstr "gAIM - Buddy hinzufügen"
+
+#: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
+#: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
+#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
+msgid "Close"
+msgstr "Schließen"
+
+#: plugins/napster.c:1060
+msgid "Napster registration is currently under development"
+msgstr ""
+
+#: src/about.c:77
 #, c-format
 msgid "About GAIM v%s"
 msgstr "Über GAIM v%s"
 
-#: src/aim.c:133 src/buddy.c:2100
+#: src/about.c:114
+msgid ""
+"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"written using Gtk+ and is licensed under the GPL.\n"
+"URL: http://www.marko.net/gaim/"
+msgstr ""
+
+#: src/about.c:189
+msgid "Web Site"
+msgstr ""
+
+#: src/aim.c:135 src/buddy.c:2295
 msgid "Signoff"
 msgstr "Abmelden"
 
@@ -28,7 +74,7 @@
 msgid "Please enter your logon"
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#: src/aim.c:147 src/aim.c:152 src/multi.c:838
 #, fuzzy
 msgid "Signon Error"
 msgstr "Los"
@@ -38,654 +84,743 @@
 msgid "Please enter your password"
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:254 src/multi.c:608
-msgid "Signon"
-msgstr "Los"
-
-#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+#: src/aim.c:246
+msgid "Gaim - Login"
+msgstr "Gaim - Anmeldung"
+
+#: src/aim.c:264
+msgid "Screen Name: "
+msgstr "Benutzername: "
+
+#: src/aim.c:278
+msgid "Password: "
+msgstr "Passwort: "
+
+#: src/aim.c:299 src/buddy.c:2299
+msgid "Quit"
+msgstr "Beenden"
+
+#: src/aim.c:304 src/aim.c:641 src/buddy.c:2358
 msgid "Accounts"
 msgstr ""
 
-#. Build OK Button
-#: src/aim.c:258 src/buddy_chat.c:202 src/buddy_chat.c:243 src/dialogs.c:347
-#: src/dialogs.c:666 src/dialogs.c:741 src/dialogs.c:892 src/dialogs.c:1029
-#: src/dialogs.c:1167 src/dialogs.c:1360 src/dialogs.c:1654 src/dialogs.c:1739
-#: src/dialogs.c:1953 src/dialogs.c:2141 src/dialogs.c:2305 src/dialogs.c:2397
-#: src/dialogs.c:3176 src/dialogs.c:3435 src/multi.c:494 src/multi.c:604
-#: src/multi.c:835 src/oscar.c:879 src/rvous.c:327 src/rvous.c:464
-#: src/rvous.c:696
-msgid "Cancel"
-msgstr "Ende"
-
-#: src/aim.c:259
+#: src/aim.c:306 src/multi.c:578
+msgid "Signon"
+msgstr "Los"
+
+#: src/aim.c:338 src/prpl.c:359
 msgid "Register"
 msgstr "Neu"
 
-#: src/aim.c:260
+#: src/aim.c:339
 msgid "Options"
 msgstr "Einstellungen"
 
-#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
+#: src/aim.c:341 src/aim.c:644 src/buddy.c:2375
 msgid "Plugins"
 msgstr ""
 
-#. Labels for selectors and text boxes
-#: src/aim.c:338
-msgid "Screen Name: "
-msgstr "Benutzername: "
-
-#: src/aim.c:341
-msgid "Password: "
-msgstr "Passwort: "
-
-#: src/aim.c:380
-msgid "Gaim - Login"
-msgstr "Gaim - Anmeldung"
-
-#: src/aim.c:599 src/buddy.c:2163
+#: src/aim.c:638 src/buddy.c:2367
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/away.c:110 src/away.c:227
-msgid "Back"
-msgstr "Zurück"
-
-#: src/away.c:121
+#: src/applet.c:89
+#, c-format
+msgid "file not found: %s\n"
+msgstr "Datei nicht gefunden: %s\n"
+
+#: src/applet.c:113
+msgid "Attempting to sign on...."
+msgstr "Anmeldung..."
+
+#: src/applet.c:119
+msgid "Offilne. Click to bring up login box."
+msgstr "Offline. Hier klicken, um das Anmeldefenster zu öffnen."
+
+#: src/applet.c:136 src/applet.c:174 src/buddy.c:2313
+msgid "Away"
+msgstr "Abwesenheit"
+
+#: src/applet.c:177 src/away.c:266
+msgid "New Away Message"
+msgstr "Neue Abwesenheits-Mitteilung"
+
+#: src/applet.c:317
+msgid "Can't create GAIM applet!"
+msgstr "Kann gAIM-Applet nicht erstellen"
+
+#: src/applet.c:348
+msgid "Offline"
+msgstr "Offline"
+
+#: src/applet.c:362
+msgid "Font does not exist"
+msgstr "Schriftart existiert nicht"
+
+#: src/applet.c:377
+msgid "About..."
+msgstr "Über..."
+
+#: src/away.c:96
 msgid "I'm Back!"
 msgstr "Ich bin zurück"
 
-#: src/away.c:160
+#: src/away.c:133
 msgid "Gaim - Away!"
 msgstr "Gaim - Abwesenheit!"
 
-#: src/away.c:266 src/gnome_applet_mgr.c:200
-msgid "New Away Message"
-msgstr "Neue Abwesenheits-Mitteilung"
-
-#: src/away.c:284
+#: src/away.c:147 src/away.c:228 src/away.c:393
+msgid "Back"
+msgstr "Zurück"
+
+#: src/away.c:286
 msgid "Remove Away Message"
 msgstr "Abwesenheits-Mitteilung löschen"
 
+#: src/away.c:462
+msgid "Set All Away"
+msgstr ""
+
 #. Put the buttons in the box
-#: src/buddy.c:239 src/buddy.c:2234 src/buddy_chat.c:845
-#: src/conversation.c:1641 src/conversation.c:1740 src/dialogs.c:890
-#: src/dialogs.c:1023 src/dialogs.c:1964 src/multi.c:693 src/prefs.c:639
-#: src/prefs.c:1249 src/prefs.c:1700 src/prefs.c:1735
+#: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
+#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
+#: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
+#: src/buddy.c:246 src/buddy.c:2444 src/dialogs.c:878 src/dialogs.c:974
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:241 src/buddy.c:2236 src/buddy_chat.c:847
-#: src/conversation.c:1639 src/conversation.c:1738 src/prefs.c:640
-#: src/prefs.c:1261 src/prefs.c:1704 src/prefs.c:1739
+#: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
+#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
+#: src/buddy.c:250 src/buddy.c:1830 src/buddy.c:2186
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
+#: src/buddy.c:251 src/buddy.c:443 src/buddy.c:2184 src/buddy_chat.c:474
+#: src/buddy_chat.c:804
 msgid "IM"
 msgstr "Telegramm"
 
-#: src/buddy.c:246 src/buddy.c:2002 src/buddy_chat.c:564 src/buddy_chat.c:853
-#: src/conversation.c:1734 src/rvous.c:694
+#: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
+#: src/buddy_chat.c:1025 src/conversation.c:2073
 msgid "Info"
 msgstr "Info"
 
 #. Put the buttons in the box
-#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
+#: src/buddy.c:449 src/buddy.c:554 src/dialogs.c:968 src/dialogs.c:3395
+#: src/dialogs.c:3410 src/dialogs.c:3487 src/dialogs.c:3502
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:425
+#: src/buddy.c:455 src/buddy.c:568
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alert Hinzufügen"
 
-#: src/buddy.c:1368
+#: src/buddy.c:461 src/buddy.c:574
+msgid "View Log"
+msgstr ""
+
+#: src/buddy.c:561
+msgid "Un-Alias"
+msgstr ""
+
+#: src/buddy.c:1512
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alert"
 
-#: src/buddy.c:1386
+#: src/buddy.c:1530
 msgid "Remove Buddy Pounce"
 msgstr "Lösche Buddy-Alert"
 
-#: src/buddy.c:1675
+#: src/buddy.c:1821
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "Buddy-Alert"
 
-#: src/buddy.c:1678
+#: src/buddy.c:1824
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1681
+#: src/buddy.c:1827
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1687
+#: src/buddy.c:1833
 #, fuzzy
 msgid "Get File"
 msgstr "Datei"
 
-#: src/buddy.c:1690
+#: src/buddy.c:1836
 #, fuzzy
 msgid "Send File"
 msgstr "Datei"
 
-#: src/buddy.c:1749
+#: src/buddy.c:1839
+msgid "Games"
+msgstr ""
+
+#: src/buddy.c:1842
+msgid "Stocks"
+msgstr ""
+
+#: src/buddy.c:1894
+#, fuzzy, c-format
+msgid "Logged in: %s\n"
+msgstr "Melde an %s\n"
+
+#: src/buddy.c:1905
 msgid "Warnings: %d%%\n"
 msgstr "Warnungen: %d%%\n"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1917
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1758
+#: src/buddy.c:1921
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
 "Screen Name: %s\n"
-"Logged in: %s\n"
-"%s%s%s%s%s"
+"%s%s%s%s%s%s"
 msgstr ""
 "Name: %s                \n"
 "Angemeldet seit: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1761
+#: src/buddy.c:1925
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-#: src/buddy.c:1828
+#: src/buddy.c:1995
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr ""
 
-#: src/buddy.c:1878
+#: src/buddy.c:2047
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr ""
 
-#: src/buddy.c:2028
+#: src/buddy.c:2211
 msgid "Information on selected Buddy"
 msgstr "Info über gewählten Buddy"
 
-#: src/buddy.c:2029 src/dialogs.c:657
+#: src/buddy.c:2212 src/dialogs.c:663
 msgid "Send Instant Message"
 msgstr "Telegramm"
 
-#: src/buddy.c:2030
+#: src/buddy.c:2213
 msgid "Start/join a Buddy Chat"
 msgstr "Chat starten"
 
-#: src/buddy.c:2088
+#: src/buddy.c:2277
 msgid "File"
 msgstr "Datei"
 
-#: src/buddy.c:2092 src/buddy.c:2093
+#: src/buddy.c:2281
 msgid "Add A Buddy"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:2094
+#: src/buddy.c:2283
 msgid "Join A Chat"
 msgstr ""
 
-#: src/buddy.c:2095
+#: src/buddy.c:2285
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Telegramm"
 
-#: src/buddy.c:2097
+#: src/buddy.c:2290
 msgid "Import Buddy List"
 msgstr "Buddy-Liste importieren"
 
-#: src/buddy.c:2098
+#: src/buddy.c:2292
 msgid "Export Buddy List"
 msgstr "Buddy-Liste exportieren"
 
-#: src/buddy.c:2103
-msgid "Quit"
-msgstr "Beenden"
-
-#: src/buddy.c:2105 src/buddy_chat.c:556 src/buddy_chat.c:818
-#: src/buddy_chat.c:841 src/conversation.c:1736 src/dialogs.c:425
-#: src/multi.c:709 src/plugins.c:314 src/prefs.c:1844
-msgid "Close"
-msgstr "Schließen"
-
-#: src/buddy.c:2110
+#: src/buddy.c:2308
 msgid "Tools"
 msgstr "Tools"
 
-#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
-msgid "Away"
-msgstr "Abwesenheit"
-
-#: src/buddy.c:2120
+#: src/buddy.c:2318
 msgid "Buddy Pounce"
 msgstr "Buddy-Alert"
 
-#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
+#: src/buddy.c:2327 src/dialogs.c:2039 src/dialogs.c:2206
 msgid "Search for Buddy"
 msgstr "Buddies suchen"
 
-#: src/buddy.c:2131
+#: src/buddy.c:2330
 msgid "by Email"
 msgstr "nach Email"
 
-#: src/buddy.c:2135
+#: src/buddy.c:2334
 msgid "by Dir Info"
 msgstr "nach Profil"
 
-#: src/buddy.c:2142 src/buddy.c:2143
+#: src/buddy.c:2341 src/buddy.c:2342
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/buddy.c:2146
+#: src/buddy.c:2345
 msgid "User Info"
 msgstr "Benutzer-Info"
 
-#: src/buddy.c:2150 src/dialogs.c:1353
+#: src/buddy.c:2349 src/dialogs.c:1326
 msgid "Directory Info"
 msgstr "Profil"
 
-#: src/buddy.c:2154 src/dialogs.c:1592
+#: src/buddy.c:2353 src/dialogs.c:1517
 msgid "Change Password"
 msgstr ""
 
-#: src/buddy.c:2171
+#: src/buddy.c:2362
+#, fuzzy
+msgid "Protocol Actions"
+msgstr "Einstellungen"
+
+#: src/buddy.c:2369
+msgid "View System Log"
+msgstr ""
+
+#: src/buddy.c:2380
 #, fuzzy
 msgid "Perl"
 msgstr "Zulassen"
 
-#: src/buddy.c:2174
+#: src/buddy.c:2383
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2178
+#: src/buddy.c:2387
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2182
+#: src/buddy.c:2391
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2190
+#: src/buddy.c:2399
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2404
 #, fuzzy
 msgid "About Gaim"
 msgstr "Info Über"
 
-#: src/buddy.c:2214 src/prefs.c:2053
+#: src/buddy.c:2423 src/prefs.c:2208
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2477
 msgid "Add a new Buddy"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:2267
+#: src/buddy.c:2478
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:2268
+#: src/buddy.c:2479
 msgid "Remove selected Buddy"
 msgstr "Gewählten Buddy entfernen"
 
-#: src/buddy.c:2293
+#: src/buddy.c:2504
 msgid "Online"
 msgstr "Online"
 
-#: src/buddy.c:2295
+#: src/buddy.c:2506
 msgid "Edit Buddies"
 msgstr "Budies bearbeiten"
 
-#: src/buddy.c:2332
+#: src/buddy.c:2543
 msgid "Gaim - Buddy List"
 msgstr "gAIM - Buddy-Liste"
 
-#: src/buddy_chat.c:135
+#: src/buddy_chat.c:156
 msgid "Join Chat"
 msgstr ""
 
-#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
+#: src/buddy_chat.c:163 src/buddy_chat.c:917 src/buddy_chat.c:929
 msgid "Buddy Chat"
 msgstr "Buddy-Chat"
 
-#: src/buddy_chat.c:151
+#: src/buddy_chat.c:173
 msgid "Join what group:"
 msgstr "An wlecher Gruppe teinlnehmen:"
 
-#: src/buddy_chat.c:167
+#: src/buddy_chat.c:186
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "An wlecher Gruppe teinlnehmen:"
 
-#: src/buddy_chat.c:181
+#: src/buddy_chat.c:198
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:189
+#: src/buddy_chat.c:205
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:197
+#: src/buddy_chat.c:213 src/buddy_chat.c:258 src/dialogs.c:402
+#: src/dialogs.c:682 src/dialogs.c:742 src/dialogs.c:870 src/dialogs.c:987
+#: src/dialogs.c:1240 src/dialogs.c:1450 src/dialogs.c:1578 src/dialogs.c:1643
+#: src/dialogs.c:1856 src/dialogs.c:2045 src/dialogs.c:2225 src/dialogs.c:2299
+#: src/dialogs.c:3163 src/dialogs.c:3397 src/dialogs.c:3489 src/dialogs.c:3676
+#: src/multi.c:463 src/multi.c:574 src/multi.c:821 src/prpl.c:156
+#: src/prpl.c:227
+msgid "Cancel"
+msgstr "Ende"
+
+#: src/buddy_chat.c:218
 msgid "Join"
 msgstr "Teilnehmen"
 
-#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
+#: src/buddy_chat.c:259 src/buddy_chat.c:855 src/buddy_chat.c:984
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/buddy_chat.c:261
+#: src/buddy_chat.c:275
 msgid "Invite who?"
 msgstr "Wen einladen"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:279
 msgid "With message:"
 msgstr "Mit Nachricht:"
 
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:303
 msgid "Invite to Buddy Chat"
 msgstr "Zum Buddy-Chat einladen"
 
-#: src/buddy_chat.c:420
+#: src/buddy_chat.c:480 src/buddy_chat.c:808
+msgid "Ignore"
+msgstr "Ignorieren"
+
+#: src/buddy_chat.c:532 src/buddy_chat.c:638
+#, c-format
+msgid "%d %s in room"
+msgstr ""
+
+#: src/buddy_chat.c:539
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:459
+#: src/buddy_chat.c:602
+#, c-format
+msgid "<B>%s is now known as %s</B>"
+msgstr ""
+
+#: src/buddy_chat.c:645
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:559 src/buddy_chat.c:816
+#: src/buddy_chat.c:785
+msgid "0 people in room"
+msgstr ""
+
+#: src/buddy_chat.c:860 src/buddy_chat.c:983
 msgid "Whisper"
 msgstr "Flüstern"
 
-#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
-#: src/conversation.c:1733
+#: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
+#: src/conversation.c:2084
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:563
-msgid "Ignore"
-msgstr "Ignorieren"
-
-#: src/buddy_chat.c:849 src/conversation.c:1741
+#: src/buddy_chat.c:1021 src/conversation.c:2061
 msgid "Block"
 msgstr "Sperren"
 
-#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
-#: src/dialogs.c:345 src/rvous.c:695
+#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/dialogs.c:397
 msgid "Warn"
 msgstr "Warnen"
 
-#: src/conversation.c:426
+#: src/conversation.c:352
+#, fuzzy
+msgid "Gaim - Save Conversation"
+msgstr "gAIM - Telegramm-Mitschnitt"
+
+#: src/conversation.c:484
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr ""
 
-#: src/conversation.c:902
+#: src/conversation.c:1044
 #, c-format
 msgid "Currently at %d, "
 msgstr ""
 
-#: src/conversation.c:911
+#: src/conversation.c:1052
 #, c-format
 msgid "Setting position to %d\n"
 msgstr ""
 
-#: src/conversation.c:1497
+#: src/conversation.c:1574
 msgid "Bold"
 msgstr "Fetter"
 
-#: src/conversation.c:1497 src/prefs.c:818
+#: src/conversation.c:1574 src/prefs.c:974
 msgid "Bold Text"
 msgstr "Fetter Text"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1578 src/conversation.c:1579
 msgid "Italics"
 msgstr "Kursiver"
 
-#: src/conversation.c:1501 src/prefs.c:819
+#: src/conversation.c:1578 src/prefs.c:975
 msgid "Italics Text"
 msgstr "Kursiver Text"
 
-#: src/conversation.c:1505 src/conversation.c:1506
+#: src/conversation.c:1582 src/conversation.c:1583
 msgid "Underline"
 msgstr "Unterstrichener"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1582
 msgid "Underline Text"
 msgstr "Unterstrichener Text"
 
-#: src/conversation.c:1509 src/conversation.c:1510
+#: src/conversation.c:1587
 msgid "Strike"
 msgstr "Durchgestrichener through"
 
-#: src/conversation.c:1509
+#: src/conversation.c:1587
 msgid "Strike through Text"
 msgstr "Durchgestrichener through Text"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Decrease font size"
 msgstr "Schrift kleiner"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal font size"
 msgstr "Schrift normal"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Big"
 msgstr "Groß"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Increase font size"
 msgstr "Schrift größer"
 
-#: src/conversation.c:1526 src/conversation.c:1527
+#: src/conversation.c:1606 src/conversation.c:1607
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
+#: src/conversation.c:1606 src/dialogs.c:2648 src/dialogs.c:2664
 msgid "Select Font"
 msgstr "Schriftart wählen "
 
-#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
-#: src/conversation.c:1535
+#: src/conversation.c:1610 src/conversation.c:1611 src/conversation.c:1615
 msgid "Color"
 msgstr "Farbe"
 
-#: src/conversation.c:1530 src/prefs.c:832
+#: src/conversation.c:1610 src/prefs.c:988
 msgid "Text Color"
 msgstr "Text-Farbe"
 
-#: src/conversation.c:1534 src/prefs.c:849
+#: src/conversation.c:1615 src/prefs.c:1006
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1541 src/conversation.c:1542
+#: src/conversation.c:1622 src/conversation.c:1623
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:1541 src/dialogs.c:2391
+#: src/conversation.c:1622 src/dialogs.c:2293
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 #, fuzzy
 msgid "Smiley"
 msgstr "Datei"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1552 src/conversation.c:1553
+#: src/conversation.c:1633 src/conversation.c:1634 src/prefs.c:2195
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: src/conversation.c:1552
+#: src/conversation.c:1633
 msgid "Enable logging"
 msgstr "Mitschnitt ein"
 
-#: src/conversation.c:1556 src/conversation.c:1557
+#: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+msgid "Save"
+msgstr "Speichern"
+
+#: src/conversation.c:1643
+#, fuzzy
+msgid "Save Conversation"
+msgstr "Alles Mitschneiten"
+
+#: src/conversation.c:1648 src/conversation.c:1649
 msgid "Sound"
 msgstr "Klänge"
 
-#: src/conversation.c:1556
+#: src/conversation.c:1648
 msgid "Enable sounds"
 msgstr "Klänge aktivieren"
 
-#: src/conversation.c:1768
+#: src/conversation.c:1928
+#, fuzzy
+msgid "Gaim - Conversations"
+msgstr "gAIM - Telegramm-Mitschnitt"
+
+#: src/conversation.c:2003
 #, fuzzy
 msgid "Send message as: "
 msgstr "Enter verschickt Nachricht"
 
-#: src/dialogs.c:360
+#: src/dialogs.c:359
+msgid "Gaim - Warn user?"
+msgstr "gAIM - Benutzer warnen?"
+
+#: src/dialogs.c:380
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Wollen Sie %s wirklich verwarnen?"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:385
 msgid "Warn anonymously?"
 msgstr "Anonym warnen?"
 
-#: src/dialogs.c:367
+#: src/dialogs.c:389
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyme Warnungen sind weniger wirkungsvoll"
 
-#: src/dialogs.c:393
-msgid "Gaim - Warn user?"
-msgstr "gAIM - Benutzer warnen?"
-
-#: src/dialogs.c:458
+#: src/dialogs.c:465
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Konnte Datei %s nicht schrieben."
 
-#: src/dialogs.c:461
+#: src/dialogs.c:468
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Konnte Datei %s nicht lesen."
 
-#: src/dialogs.c:464
+#: src/dialogs.c:471
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Nachricht zu lange, letzten %s Bytes abgeschnitten."
 
-#: src/dialogs.c:467
+#: src/dialogs.c:474
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ist zur Zeit nicht online."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:477
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Verwarnung von %s nicht erlaubt."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:480
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Eine Nachricht ging verloren. Sie überschreiten die Geschwindigkeit des "
 "Servers."
 
-#: src/dialogs.c:476
+#: src/dialogs.c:483
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s ist nicht verfügbar."
 
-#: src/dialogs.c:479
+#: src/dialogs.c:486
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: src/dialogs.c:482
+#: src/dialogs.c:489
 #, 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:485
+#: src/dialogs.c:492
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu schnell gesendet "
 "wurde."
 
-#: src/dialogs.c:488
+#: src/dialogs.c:495
 msgid "Failure."
 msgstr "Fehler."
 
-#: src/dialogs.c:491
+#: src/dialogs.c:498
 msgid "Too many matches."
 msgstr "Zu viele Übereinstimmungen."
 
-#: src/dialogs.c:494
+#: src/dialogs.c:501
 msgid "Need more qualifiers."
 msgstr "Benötige mehr Angaben."
 
-#: src/dialogs.c:497
+#: src/dialogs.c:504
 msgid "Dir service temporarily unavailable."
 msgstr "Profil-Service ist zur Zeit nicht verfügbar."
 
-#: src/dialogs.c:500
+#: src/dialogs.c:507
 msgid "Email lookup restricted."
 msgstr "eMail-Suche eingeschränkt."
 
-#: src/dialogs.c:503
+#: src/dialogs.c:510
 msgid "Keyword ignored."
 msgstr "Stichwort ignoriert."
 
-#: src/dialogs.c:506
+#: src/dialogs.c:513
 msgid "No keywords."
 msgstr "Keine Stichwörter."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:516
 msgid "User has no directory information."
 msgstr "Der Benutzer hat kein Profil."
 
-#: src/dialogs.c:513
+#: src/dialogs.c:520
 msgid "Country not supported."
 msgstr "Land nicht unterstützt."
 
-#: src/dialogs.c:516
+#: src/dialogs.c:523
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Unbekannter Fehler: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:519 src/oscar.c:471
+#: src/dialogs.c:526 src/oscar.c:523
 msgid "Incorrect nickname or password."
 msgstr "Ungülter Benutzername oder Passwort."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:529
 msgid "The service is temporarily unavailable."
 msgstr "Der Service ist zur Zeit nicht erreichbar."
 
-#: src/dialogs.c:525
+#: src/dialogs.c:532
 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:528
+#: src/dialogs.c:535
 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."
@@ -693,533 +828,535 @@
 "Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
 "versuchen Sie es noch einmal."
 
-#: src/dialogs.c:531
+#: src/dialogs.c:538
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Unbekannter Anmeldungsfehler: %s."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:541
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Unbekannter Fehler: %d. Info: %s"
 
-#: src/dialogs.c:537
+#: src/dialogs.c:544
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "gAIM - Fehler %d"
 
 #. Build OK Button
-#: src/dialogs.c:596 src/dialogs.c:661 src/dialogs.c:736 src/dialogs.c:1172
-#: src/dialogs.c:1659 src/dialogs.c:1806 src/dialogs.c:2140 src/dialogs.c:2310
-#: src/dialogs.c:2396 src/multi.c:499
+#: src/dialogs.c:603 src/dialogs.c:687 src/dialogs.c:747 src/dialogs.c:1245
+#: src/dialogs.c:1583 src/dialogs.c:1696 src/dialogs.c:2044 src/dialogs.c:2230
+#: src/dialogs.c:2298 src/multi.c:467
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:671
+#: src/dialogs.c:653
+msgid "Gaim - IM user"
+msgstr "gAIM - Telegramm"
+
+#: src/dialogs.c:670
 #, fuzzy
 msgid "IM who:"
 msgstr "Telegramm an:"
 
-#: src/dialogs.c:695
-msgid "Gaim - IM user"
-msgstr "gAIM - Telegramm"
-
-#: src/dialogs.c:732
+#: src/dialogs.c:718
 #, fuzzy
 msgid "Get User Info"
 msgstr "Benutzer-Info"
 
-#: src/dialogs.c:746
+#: src/dialogs.c:725
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:770
+#. Finish up
+#: src/dialogs.c:753
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "gAIM - Mitgliederinfo"
 
-#: src/dialogs.c:845
+#: src/dialogs.c:823
 msgid "Buddies"
 msgstr "Buddies"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:876
 #, fuzzy
 msgid "Add Group"
 msgstr "Gruppe"
 
-#: src/dialogs.c:928
+#: src/dialogs.c:906
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "gAIM - Buddy hinzufügen"
 
-#: src/dialogs.c:957
+#: src/dialogs.c:933
 msgid "Gaim - Add Buddy"
 msgstr "gAIM - Buddy hinzufügen"
 
-#: src/dialogs.c:967
+#: src/dialogs.c:947
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
 
-#: src/dialogs.c:979 src/dialogs.c:3443
+#: src/dialogs.c:957 src/dialogs.c:3405 src/dialogs.c:3497
 msgid "Buddy"
 msgstr "Buddy"
 
-#: src/dialogs.c:1109
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Please enter a buddy to pounce."
+msgstr "Bitte geben Sie einen Benutzernamen ein"
+
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Buddy Pounce Error"
+msgstr "Buddy-Alert"
+
+#: src/dialogs.c:1076
 msgid "Pounce buddy as:"
 msgstr ""
 
-#: src/dialogs.c:1181
+#: src/dialogs.c:1126
+msgid "Gaim - New Buddy Pounce"
+msgstr "gAIM - Neuer Buddy-Alert"
+
+#: src/dialogs.c:1143
 #, fuzzy
 msgid "Buddy:"
 msgstr "Buddy"
 
+#: src/dialogs.c:1158
+msgid "Pounce on sign on"
+msgstr ""
+
+#: src/dialogs.c:1163
+msgid "Pounce on return from away"
+msgstr ""
+
+#: src/dialogs.c:1167
+msgid "Pounce on return from idle"
+msgstr ""
+
+#: src/dialogs.c:1175
+#, fuzzy
+msgid "Open IM window on pounce"
+msgstr "Öffne Telegrammfenster wenn Buddy sich anmeldet"
+
+#: src/dialogs.c:1180
+#, fuzzy
+msgid "Send IM on pounce"
+msgstr "Schicke Telegramm wenn Buddy sich anmeldet"
+
 #: src/dialogs.c:1189
 #, fuzzy
 msgid "Message:"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:1196 src/prefs.c:2100
-msgid "Events"
-msgstr ""
-
-#. Set up the different options
 #: src/dialogs.c:1201
-msgid "Pounce on sign on"
-msgstr ""
-
-#: src/dialogs.c:1203
-msgid "Pounce on return from away"
-msgstr ""
-
-#: src/dialogs.c:1204
-msgid "Pounce on return from idle"
-msgstr ""
-
-#: src/dialogs.c:1226
 #, fuzzy
-msgid "Actions"
-msgstr "Einstellungen"
-
-#. And now the other stuff
-#: src/dialogs.c:1231
-#, fuzzy
-msgid "Open IM window on pounce"
-msgstr "Öffne Telegrammfenster wenn Buddy sich anmeldet"
-
-#: src/dialogs.c:1234
-#, fuzzy
-msgid "Send IM on pounce"
+msgid "Execute command on pounce"
 msgstr "Schicke Telegramm wenn Buddy sich anmeldet"
 
-#: src/dialogs.c:1263
-msgid "Gaim - New Buddy Pounce"
-msgstr "gAIM - Neuer Buddy-Alert"
-
-#. Build Save Button
-#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
-msgid "Save"
-msgstr "Speichern"
-
-#: src/dialogs.c:1376
+#: src/dialogs.c:1210
+msgid "Command:"
+msgstr ""
+
+#: src/dialogs.c:1227
+msgid "Save this pounce after activation"
+msgstr ""
+
+#: src/dialogs.c:1316
+msgid "Gaim - Set Dir Info"
+msgstr "gAIM - Profil anlegen"
+
+#: src/dialogs.c:1348
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Ermöglicht Personen Ihr Profil im Web zu finden"
 
 #. Line 1
-#: src/dialogs.c:1379 src/dialogs.c:2159
+#: src/dialogs.c:1351 src/dialogs.c:2063
 msgid "First Name"
 msgstr "Vorname"
 
 #. Line 2
-#: src/dialogs.c:1390 src/dialogs.c:2171
+#: src/dialogs.c:1362 src/dialogs.c:2075
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
 #. Line 3
-#: src/dialogs.c:1402 src/dialogs.c:2183
+#: src/dialogs.c:1374 src/dialogs.c:2087
 msgid "Last Name"
 msgstr "Nachname"
 
 #. Line 4
-#: src/dialogs.c:1413 src/dialogs.c:2195
+#: src/dialogs.c:1385 src/dialogs.c:2099
 msgid "Maiden Name"
 msgstr "Mädchenname"
 
 #. Line 5
-#: src/dialogs.c:1424 src/dialogs.c:2207
+#: src/dialogs.c:1396 src/dialogs.c:2111
 msgid "City"
 msgstr "Stadt"
 
 #. Line 6
-#: src/dialogs.c:1435 src/dialogs.c:2218
+#: src/dialogs.c:1407 src/dialogs.c:2122
 msgid "State"
 msgstr "Provinz/Bundesland"
 
 #. Line 7
-#: src/dialogs.c:1446 src/dialogs.c:2229
+#: src/dialogs.c:1418 src/dialogs.c:2133
 msgid "Country"
 msgstr "Land"
 
-#: src/dialogs.c:1490
-msgid "Gaim - Set Dir Info"
-msgstr "gAIM - Profil anlegen"
-
-#: src/dialogs.c:1507
+#: src/dialogs.c:1473
 msgid "New Passwords Do Not Match"
 msgstr "Die neuen Passwörter stimmen nicht überein"
 
-#: src/dialogs.c:1507 src/dialogs.c:1512
+#: src/dialogs.c:1473 src/dialogs.c:1478
 msgid "Gaim - Change Password Error"
 msgstr "gAIM - Fehler Passwort ändern"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1478
 msgid "Fill out all fields completely"
 msgstr "Bitte alle Felder komplett ausfüllen"
 
-#: src/dialogs.c:1541
-#, fuzzy
-msgid "Change password for:"
-msgstr "gAIM - Fehler Passwort ändern"
-
-#: src/dialogs.c:1580 src/toc.c:515
+#: src/dialogs.c:1505 src/toc.c:560
 msgid "Gaim - Password Change"
 msgstr "gAIM - Password Änderung"
 
-#: src/dialogs.c:1612
+#: src/dialogs.c:1536
 msgid "Original Password"
 msgstr "Altes Passwort"
 
-#: src/dialogs.c:1626
+#: src/dialogs.c:1550
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: src/dialogs.c:1640
+#: src/dialogs.c:1564
 msgid "New Password (again)"
 msgstr "Neues Passwort (Wiederholen)"
 
-#: src/dialogs.c:1693
-msgid "Set info for:"
-msgstr ""
-
-#: src/dialogs.c:1776
+#: src/dialogs.c:1609
 msgid "Gaim - Set User Info"
 msgstr "gAIM - Mitgliederinfo"
 
-#: src/dialogs.c:1817
+#: src/dialogs.c:1707
 msgid "Below are the results of your search: "
 msgstr "Das Resultat Ihrer Suche:"
 
-#: src/dialogs.c:1943 src/dialogs.c:1950
+#: src/dialogs.c:1846 src/dialogs.c:1853
 msgid "Permit"
 msgstr "Zulassen"
 
-#: src/dialogs.c:1945 src/dialogs.c:1952
+#: src/dialogs.c:1848 src/dialogs.c:1855
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: src/dialogs.c:1993
+#: src/dialogs.c:1896
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "gAIM - Sperren/Zulassen hinzufügen"
 
-#: src/dialogs.c:1995
+#: src/dialogs.c:1898
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "gAIM - Sperren/Zulassen hinzufügen"
 
-#: src/dialogs.c:2057
+#: src/dialogs.c:1960
 msgid "Gaim - Log Conversation"
 msgstr "gAIM - Telegramm-Mitschnitt"
 
-#: src/dialogs.c:2266
+#: src/dialogs.c:2170
 msgid "Gaim - Find Buddy By Info"
 msgstr "gAIM - Buddy nach Profil finden"
 
-#: src/dialogs.c:2315
-msgid "Email"
-msgstr "eMail"
-
-#: src/dialogs.c:2328
+#: src/dialogs.c:2200
 msgid "Gaim - Find Buddy By Email"
 msgstr "gAIM - Buddy nach eMail-Adresse suchen"
 
-#: src/dialogs.c:2410
+#: src/dialogs.c:2213
+msgid "Email"
+msgstr "eMail"
+
+#: src/dialogs.c:2312
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2320
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2346
 msgid "GAIM - Add URL"
 msgstr "gAIM - Url hinzufügen"
 
-#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
+#: src/dialogs.c:2487 src/dialogs.c:2500 src/dialogs.c:2537
 msgid "Select Text Color"
 msgstr "Textfarbe wählen"
 
-#: src/dialogs.c:2624
+#: src/dialogs.c:2524
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Textfarbe wählen"
 
-#: src/dialogs.c:2847 src/rvous.c:265
+#: src/dialogs.c:2769
 #, c-format
 msgid "Error writing file %s"
 msgstr "Fehler beim Schreiben von %s"
 
-#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
-#: src/rvous.c:548
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
+#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "Fehler"
 
-#: src/dialogs.c:2901
+#: src/dialogs.c:2823
 msgid "Gaim - Export Buddy List"
 msgstr "gAIM - Buddy-Liste speichern"
 
-#: src/dialogs.c:2967 src/rvous.c:547
+#: src/dialogs.c:2891
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: src/dialogs.c:3045
+#: src/dialogs.c:2967
 msgid "Gaim - Import Buddy List"
 msgstr "gAIM - Buddy-Liste laden"
 
-#: src/dialogs.c:3124
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3030
+msgid "You cannot create an away message with a blank title"
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3037
+msgid "You cannot create an empty away message"
+msgstr ""
+
+#: src/dialogs.c:3104
 msgid "Gaim - New away message"
 msgstr "gAIM - Neue Abwesenheits-Mitteilung"
 
-#. Put frame and button-box in the toplevel
-#: src/dialogs.c:3136
+#: src/dialogs.c:3114
 #, fuzzy
 msgid "New away message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3149
+#: src/dialogs.c:3127
 msgid "Away title: "
 msgstr "Abwesenheits-Titel:"
 
-#. Checkbox for showing away msg
-#: src/dialogs.c:3193
-#, fuzzy
-msgid "Make Away Now"
-msgstr "Jetzt abwesend"
+#: src/dialogs.c:3167
+msgid "Use"
+msgstr ""
+
+#: src/dialogs.c:3171
+msgid "Save & Use"
+msgstr ""
 
 #. show everything
-#: src/dialogs.c:3370
+#: src/dialogs.c:3340
 #, fuzzy
 msgid "Smile!"
 msgstr "Datei"
 
-#: src/dialogs.c:3441
+#: src/dialogs.c:3403 src/dialogs.c:3495
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Buddy hinzufügen"
 
-#: src/dialogs.c:3478
+#: src/dialogs.c:3440 src/dialogs.c:3532
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "gAIM - Buddy hinzufügen"
 
-#: src/gnome_applet_mgr.c:95
+#: src/dialogs.c:3604
+#, fuzzy
+msgid "Gaim - Save Log File"
+msgstr "Gaim - Anmeldung"
+
+#: src/dialogs.c:3635
+#, fuzzy, c-format
+msgid "Unable to remove file %s - %s"
+msgstr "Konnte Datei %s nicht lesen."
+
+#: src/dialogs.c:3666
+msgid "Really clear log?"
+msgstr ""
+
+#: src/dialogs.c:3684
+#, fuzzy
+msgid "Okay"
+msgstr "OK"
+
+#: src/dialogs.c:3781
+#, fuzzy
+msgid "Clear"
+msgstr "Schließen"
+
+#: src/gaimrc.c:870
 #, c-format
-msgid "file not found: %s\n"
-msgstr "Datei nicht gefunden: %s\n"
-
-#: src/gnome_applet_mgr.c:121
-msgid "Offilne. Click to bring up login box."
-msgstr "Offline. Hier klicken, um das Anmeldefenster zu öffnen."
-
-#: src/gnome_applet_mgr.c:128
-msgid "Attempting to sign on...."
-msgstr "Anmeldung..."
-
-#: src/gnome_applet_mgr.c:254
-msgid "GAIM"
-msgstr "gAIM"
-
-#: src/gnome_applet_mgr.c:366
-msgid "Can't create GAIM applet!"
-msgstr "Kann gAIM-Applet nicht erstellen"
-
-#: src/gnome_applet_mgr.c:397
-msgid "Offline"
-msgstr "Offline"
-
-#: src/gnome_applet_mgr.c:411
-msgid "Font does not exist"
-msgstr "Schriftart existiert nicht"
-
-#: src/gnome_applet_mgr.c:427
-msgid "About..."
-msgstr "Über..."
-
-#: src/gtkhtml.c:1383
-msgid "HTML Link:"
-msgstr "HTML-Link"
-
-#: src/gtkhtml.c:1796
-msgid "Open URL in existing window"
-msgstr "URL in bestehendem Fenster öffnen."
-
-#: src/gtkhtml.c:1805
-msgid "Open URL in new window"
-msgstr "URL in neuem Fenstern öffnen."
-
-#: src/gtkhtml.c:1813
-msgid "Add URL as bookmark"
-msgstr "URL als Bookmark hinzufügen"
-
-#: src/html.c:122 src/html.c:125
+msgid "Could not open config file %s."
+msgstr ""
+
+#: src/gaimrc.c:871
+#, fuzzy
+msgid "Preferences Error"
+msgstr "Einstellungen"
+
+#: src/html.c:121 src/html.c:124
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fehler: Kann keine Verbindung herstellen.\n"
 
-#: src/html.c:158
+#: src/html.c:156
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "Empfange %d bytes von %s"
 
-#: src/html.c:171
+#: src/html.c:169
 msgid "Getting Data"
 msgstr "Empfange Daten"
 
-#: src/html.c:204
+#: src/html.c:201
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "Empfangen: '%s'\n"
 
-#: src/multi.c:367 src/prefs.c:112
+#: src/multi.c:345 src/prefs.c:114
 #, fuzzy
 msgid "General Options"
 msgstr "Einstellungen"
 
-#: src/multi.c:402
+#: src/multi.c:350
 #, fuzzy
 msgid "Screenname:"
 msgstr "Benutzername: "
 
-#: src/multi.c:414
+#: src/multi.c:359
 #, fuzzy
 msgid "Password:"
 msgstr "Passwort: "
 
-#: src/multi.c:429
+#: src/multi.c:370
+msgid "Protocol:"
+msgstr ""
+
+#: src/multi.c:375
 msgid "Remember Password"
 msgstr "Passwort Speichern"
 
-#: src/multi.c:430
+#: src/multi.c:376
 msgid "Auto-Login"
 msgstr ""
 
-#: src/multi.c:431
+#: src/multi.c:377
 msgid "Send KeepAlive packet (6 bytes/second)"
 msgstr ""
 
-#: src/multi.c:473
+#: src/multi.c:442
 #, fuzzy
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Anmeldung"
 
-#: src/multi.c:482
-msgid "Modify Account"
-msgstr ""
-
-#: src/multi.c:576
+#: src/multi.c:546
 #, fuzzy
 msgid "Enter Password"
 msgstr "Neues Passwort"
 
-#: src/multi.c:669
+#: src/multi.c:641
 #, fuzzy
 msgid "Gaim - Account Editor"
 msgstr "gAIM - Fehler"
 
-#: src/multi.c:678
-msgid "Account Editor"
-msgstr ""
-
-#: src/multi.c:697
+#: src/multi.c:662
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:701
+#: src/multi.c:666
 #, fuzzy
 msgid "Sign On/Off"
 msgstr "Abmelden"
 
-#: src/multi.c:705
+#: src/multi.c:670
 #, fuzzy
 msgid "Delete"
 msgstr "Schriftart wählen "
 
-#: src/multi.c:851
+#: src/multi.c:837
 #, c-format
 msgid "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:300 src/oscar.c:317 src/toc.c:280 src/toc.c:290 src/toc.c:347
+#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "Verbindung unterbrochen"
 
-#: src/oscar.c:308
+#: src/oscar.c:302
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/oscar.c:316
+#: src/oscar.c:310
 #, fuzzy
 msgid "major connection error\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/oscar.c:330 src/toc.c:500
+#: src/oscar.c:323 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:331
+#: src/oscar.c:324
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Fehler"
 
-#: src/oscar.c:362
+#: src/oscar.c:334
+#, fuzzy
+msgid "Chat is currently unavailable"
+msgstr "Chat in %s ist nicht verfügbar."
+
+#: src/oscar.c:335
+#, fuzzy
+msgid "Gaim - Chat"
+msgstr "Gaim - Abwesenheit!"
+
+#: src/oscar.c:382
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Melde an %s\n"
 
-#: src/oscar.c:399
+#: src/oscar.c:420
 msgid "internal connection error\n"
 msgstr "Interner Verbindungsfehler\n"
 
-#: src/oscar.c:400
+#: src/oscar.c:421
 msgid "Unable to login to AIM"
 msgstr "Anmeldung nicht möglich"
 
-#: src/oscar.c:405
+#: src/oscar.c:426
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "Konnte Server nicht finden\n"
 
-#: src/oscar.c:409
+#: src/oscar.c:430
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "Keine Verbindung zum Server\n"
 
-#: src/oscar.c:416
+#: src/oscar.c:437
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: src/oscar.c:426
+#: src/oscar.c:447
 msgid "Password sent, waiting for response\n"
 msgstr "Passwort übertragen, warte auf Antwort\n"
 
-#: src/oscar.c:451
+#: src/oscar.c:474
 msgid "Signed off.\n"
 msgstr "Abgemeldet.\n"
 
 #. connecting too frequently
-#: src/oscar.c:466
+#: src/oscar.c:518
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1229,7 +1366,7 @@
 "versuchen Sie es noch einmal."
 
 #. client too old
-#: src/oscar.c:476
+#: src/oscar.c:528
 #, fuzzy
 msgid ""
 "The client version you are using is too old. Please upgrade at "
@@ -1238,145 +1375,116 @@
 "Ihre AIM-Software ist zu alt. Aktuelle Software finden Sie auf "
 "http://www.aim.de"
 
-#: src/oscar.c:480 src/toc.c:303
+#: src/oscar.c:532 src/toc.c:341
 msgid "Authentication Failed"
 msgstr ""
 
-#: src/oscar.c:513
+#: src/oscar.c:562
 msgid "Internal Error"
 msgstr ""
 
-#: src/oscar.c:520
+#: src/oscar.c:566
 msgid "Could Not Connect"
 msgstr ""
 
-#: src/oscar.c:551
+#: src/oscar.c:600
 msgid "Connection established, cookie sent"
 msgstr ""
 
-#: src/oscar.c:787 src/oscar.c:1860
+#: src/oscar.c:843 src/oscar.c:2100
 #, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr ""
 
-#: src/oscar.c:862 src/rvous.c:333 src/rvous.c:470
-msgid "Gaim - File Transfer"
-msgstr ""
-
-#: src/oscar.c:866 src/rvous.c:454
-#, c-format
-msgid "Sending %s to %s"
-msgstr ""
-
-#: src/oscar.c:898
-msgid "Error in transfer"
-msgstr ""
-
-#: src/oscar.c:959
-msgid "Transfer complete."
-msgstr ""
-
-#: src/oscar.c:1012
-#, fuzzy
-msgid "Error examining file"
-msgstr "Fehler beim Lesen von %s"
-
-#: src/oscar.c:1012 src/oscar.c:1020 src/oscar.c:1043
-#, fuzzy
-msgid "GetFile Error"
-msgstr "gAIM - Fehler"
-
-#: src/oscar.c:1020
-msgid "Could not open temporary file, aborting"
-msgstr ""
-
-#: src/oscar.c:1043
-#, fuzzy
-msgid "Error connecting for transfer"
-msgstr "Fehler beim Verbinden mit Socket.\n"
-
-#: src/oscar.c:1065
-msgid "Gaim - Send File..."
-msgstr ""
-
 #. message too large
-#: src/oscar.c:1194
+#: src/oscar.c:1293
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu groß war."
 
-#: src/oscar.c:1195 src/oscar.c:1200 src/oscar.c:1222 src/oscar.c:1241
-#: src/oscar.c:1266
-msgid "Gaim - Error"
-msgstr "gAIM - Fehler"
-
-#: src/oscar.c:1199
+#: src/oscar.c:1298
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1220
+#: src/oscar.c:1333
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1221 src/oscar.c:1240
+#: src/oscar.c:1334 src/oscar.c:1353
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1239
+#: src/oscar.c:1352
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1265
+#: src/oscar.c:1388
 #, c-format
-msgid "%s has no info/away message."
+msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1271
+#: src/oscar.c:1395
 msgid ""
-"Username : <B>%s</B>\n"
-"<BR>Warning Level : <B>%d %%</B>\n"
-"<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
+"Username : <B>%s</B>  %s <BR>\n"
+"Warning Level : <B>%d %%</B><BR>\n"
+"Online Since : <B>%s</B><BR>\n"
+"Idle Minutes : <B>%d</B>\n"
+"<BR>\n"
+"<HR><BR>\n"
+"%s<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1305
+#: src/oscar.c:1430
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1306
+#: src/oscar.c:1431
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:1913
+#: src/oscar.c:2157
 #, c-format
 msgid "<B>Direct IM with %s closed</B>"
 msgstr ""
 
-#: src/oscar.c:1958
+#: src/oscar.c:2216
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "Anmeldung nicht möglich"
 
-#: src/oscar.c:1967 src/toc.c:970
-#, fuzzy
-msgid "Get Info"
-msgstr "Benutzer-Info"
-
-#: src/oscar.c:1974
+#: src/oscar.c:2226
+#, c-format
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+
+#: src/oscar.c:2243
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Abwesenht."
 
-#: src/oscar.c:1982
+#: src/oscar.c:2251
 #, fuzzy
 msgid "Direct IM"
 msgstr "Profil"
 
+#: src/oscar.c:2443
+msgid ""
+"Unfortunately, currently Oscar only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
 #. Below is basically stolen from plugins.c
-#: src/perl.c:639
+#: src/perl.c:638
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "gAIM - Mitgliederinfo"
@@ -1385,551 +1493,691 @@
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:104
+#: src/plugins.c:105
 msgid "Gaim - Plugin List"
 msgstr ""
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
+#: src/plugins.c:185 src/plugins.c:191 src/plugins.c:215
 msgid "Plugin Error"
 msgstr ""
 
-#: src/plugins.c:262
+#: src/plugins.c:261
 msgid "Gaim - Plugins"
 msgstr ""
 
 #. Build the bottom button bar
-#: src/plugins.c:294
+#: src/plugins.c:290
 msgid "Load Plugin"
 msgstr ""
 
-#: src/plugins.c:301
+#: src/plugins.c:296
 msgid "Configure Plugin"
 msgstr ""
 
-#: src/plugins.c:307
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr ""
 
-#: src/prefs.c:120 src/prefs.c:180 src/prefs.c:227 src/prefs.c:339
-#: src/prefs.c:425 src/prefs.c:814 src/prefs.c:900 src/prefs.c:1043
-#: src/prefs.c:1408 src/prefs.c:1649
+#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
+#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
+#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1761
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#.
-#. prefrem = gaim_button(_("Remember password"), &general_options, OPT_GEN_REMEMBER_PASS, box);
-#. gtk_signal_connect(GTK_OBJECT(prefrem), "destroy", GTK_SIGNAL_FUNC(remdes), 0);
-#. gaim_button(_("Auto-login"), &general_options, OPT_GEN_AUTO_LOGIN, box);
-#.
-#. sep = gtk_hseparator_new();
-#. gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-#. gtk_widget_show(sep);
-#.
-#: src/prefs.c:134
+#: src/prefs.c:126
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:135
+#: src/prefs.c:128
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:138
+#: src/prefs.c:132
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:150
+#: src/prefs.c:144
 msgid "Report Idle Times:"
 msgstr ""
 
-#: src/prefs.c:153
+#: src/prefs.c:147
 msgid "None"
 msgstr ""
 
-#: src/prefs.c:154
+#: src/prefs.c:148
 #, fuzzy
 msgid "GAIM Use"
 msgstr "gAIM"
 
-#: src/prefs.c:156
+#: src/prefs.c:150
 msgid "X Use"
 msgstr ""
 
-#: src/prefs.c:172
+#: src/prefs.c:224
 #, fuzzy
-msgid "Buddy List Options"
-msgstr "Buddy-Liste"
-
-#: src/prefs.c:184
-msgid "Show numbers in groups"
-msgstr ""
-
-#: src/prefs.c:185
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:186
-msgid "Show idle times"
-msgstr ""
-
-#: src/prefs.c:187
-msgid "Show buddy type icons"
-msgstr ""
-
-#: src/prefs.c:193
-msgid "Hide IM/Info/Chat buttons"
-msgstr ""
-
-#: src/prefs.c:194
-msgid "Show pictures on buttons"
+msgid "Browser Options"
+msgstr "Einstellungen"
+
+#: src/prefs.c:236
+msgid "Netscape"
 msgstr ""
 
-#: src/prefs.c:200
-#, fuzzy
-msgid "Save Window Size/Position"
-msgstr "Fensterposition und -größe speichern"
-
-#: src/prefs.c:202
-msgid "Automatically show buddy list on sign on"
-msgstr ""
-
-#: src/prefs.c:203
-msgid "Display Buddy List near applet"
-msgstr ""
-
-#: src/prefs.c:219
-msgid "Conversation Window Options"
-msgstr ""
-
-#: src/prefs.c:231
-msgid "Enter sends message"
-msgstr "Enter verschickt Nachricht"
-
-#: src/prefs.c:232
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr ""
-
-#: src/prefs.c:233
-msgid "Control-(number) inserts smileys"
+#: src/prefs.c:237
+msgid "KFM"
 msgstr ""
 
 #: src/prefs.c:239
-msgid "Show graphical smileys"
-msgstr ""
-
-#: src/prefs.c:240
-msgid "Show timestamp on messages"
+msgid "GNOME URL Handler"
 msgstr ""
 
 #: src/prefs.c:241
-msgid "Ignore incoming colors"
+msgid "Manual"
+msgstr ""
+
+#: src/prefs.c:252
+msgid "Pop up new window by default"
 msgstr ""
 
-#: src/prefs.c:242
-msgid "Ignore white backgrounds"
-msgstr ""
-
-#: src/prefs.c:248
+#: src/prefs.c:279
+#, fuzzy
+msgid "Logging Options"
+msgstr "Melde an %s\n"
+
+#: src/prefs.c:291
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Alles Mitschneiten"
 
-#: src/prefs.c:249
+#: src/prefs.c:292
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "HTML aus Mitschnitt entfernen"
 
-#: src/prefs.c:255
+#: src/prefs.c:298
+msgid "Log when buddies sign on/sign off"
+msgstr ""
+
+#: src/prefs.c:299
+msgid "Log when buddies become idle/un-idle"
+msgstr ""
+
+#: src/prefs.c:300
+msgid "Log when buddies go away/come back"
+msgstr ""
+
+#: src/prefs.c:301
+msgid "Log your own signons/idleness/awayness (as set by options above)"
+msgstr ""
+
+#: src/prefs.c:302
+msgid "Individual log file for each buddy's signons"
+msgstr ""
+
+#: src/prefs.c:317
+#, fuzzy
+msgid "Buddy List Options"
+msgstr "Buddy-Liste"
+
+#: src/prefs.c:329
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "Fensterposition und -größe speichern"
+
+#: src/prefs.c:331
+msgid "Automatically show buddy list on sign on"
+msgstr ""
+
+#: src/prefs.c:333
+msgid "Display Buddy List near applet"
+msgstr ""
+
+#: src/prefs.c:340
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:341
+msgid "Show numbers in groups"
+msgstr ""
+
+#: src/prefs.c:347
+msgid "Show buddy type icons"
+msgstr ""
+
+#: src/prefs.c:348
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:349
+msgid "Show idle times"
+msgstr ""
+
+#: src/prefs.c:355
+msgid "Hide IM/Info/Chat buttons"
+msgstr ""
+
+#: src/prefs.c:356
+msgid "Show pictures on buttons"
+msgstr ""
+
+#: src/prefs.c:371
+msgid "Conversation Window Options"
+msgstr ""
+
+#: src/prefs.c:383
+msgid "Enter sends message"
+msgstr "Enter verschickt Nachricht"
+
+#: src/prefs.c:384
+#, fuzzy
+msgid "Control-Enter sends message"
+msgstr "Enter verschickt Nachricht"
+
+#: src/prefs.c:385
+msgid "Escape closes window"
+msgstr ""
+
+#: src/prefs.c:386
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr ""
+
+#: src/prefs.c:387
+msgid "Control-(number) inserts smileys"
+msgstr ""
+
+#: src/prefs.c:388
+msgid "F2 toggles timestamp display"
+msgstr ""
+
+#: src/prefs.c:394
+msgid "Show graphical smileys"
+msgstr ""
+
+#: src/prefs.c:395
+msgid "Show timestamp on messages"
+msgstr ""
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "Ignore colors"
+msgstr "Ignorieren"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "Ignore font faces"
+msgstr "Schrift größer"
+
+#: src/prefs.c:398
+#, fuzzy
+msgid "Ignore font sizes"
+msgstr "Schrift größer"
+
+#: src/prefs.c:404
 msgid "Highlight misspelled words"
 msgstr ""
 
-#: src/prefs.c:256
+#: src/prefs.c:405
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "URLs als Link verschicken"
 
-#: src/prefs.c:257
+#: src/prefs.c:406
 #, fuzzy
 msgid "Sending messages removes away status"
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: src/prefs.c:298 src/prefs.c:386
+#: src/prefs.c:447 src/prefs.c:540
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:303 src/prefs.c:391
+#: src/prefs.c:453 src/prefs.c:546
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:308 src/prefs.c:396
+#: src/prefs.c:459 src/prefs.c:552
 #, fuzzy
 msgid "Text Only"
 msgstr "Text-Farbe"
 
-#: src/prefs.c:331
+#: src/prefs.c:483
 #, fuzzy
 msgid "IM Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:343
+#: src/prefs.c:495
+msgid "Show all conversations in one tabbed window"
+msgstr ""
+
+#: src/prefs.c:496
 msgid "Show logins in window"
 msgstr ""
 
-#: src/prefs.c:349 src/prefs.c:435
+#: src/prefs.c:502 src/prefs.c:593
 msgid "Show buttons as "
 msgstr ""
 
-#: src/prefs.c:358 src/prefs.c:445
+#: src/prefs.c:511 src/prefs.c:603
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:359 src/prefs.c:446
+#: src/prefs.c:513 src/prefs.c:605
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:360
+#: src/prefs.c:514
 msgid "Ignore new conversations when away"
 msgstr "Neue Telegramme bei Abwesenheit ignorieren"
 
-#: src/prefs.c:361
+#: src/prefs.c:516
 msgid "Ignore TiK Automated Messages"
 msgstr ""
 
-#: src/prefs.c:417 src/prefs.c:620
+#: src/prefs.c:574
 #, fuzzy
 msgid "Chat Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:429
+#: src/prefs.c:586
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
+#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
 msgid "Gaim Chat"
 msgstr ""
 
-#: src/prefs.c:638
+#: src/prefs.c:779 src/prefs.c:2234
+msgid "Chat Rooms"
+msgstr ""
+
+#: src/prefs.c:797
 msgid "Refresh"
 msgstr ""
 
-#: src/prefs.c:666
+#: src/prefs.c:822
 msgid "List of available chats"
 msgstr ""
 
-#: src/prefs.c:680
+#: src/prefs.c:832
 msgid "List of subscribed chats"
 msgstr ""
 
-#: src/prefs.c:806 src/prefs.c:2084
+#: src/prefs.c:962 src/prefs.c:2239
 #, fuzzy
 msgid "Font Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:820
+#: src/prefs.c:976
 msgid "Underlined Text"
 msgstr ""
 
-#: src/prefs.c:821
+#: src/prefs.c:977
 msgid "Strike Text"
 msgstr ""
 
-#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
+#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
 #, fuzzy
 msgid "Select"
 msgstr "Schriftart wählen "
 
-#: src/prefs.c:869
+#: src/prefs.c:1027
 msgid "Font Face for Text"
 msgstr ""
 
-#: src/prefs.c:892
+#: src/prefs.c:1042
+#, fuzzy
+msgid "Font Size for Text"
+msgstr "Schriftart existiert nicht"
+
+#: src/prefs.c:1067
 #, fuzzy
 msgid "Sound Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:904
+#: src/prefs.c:1079
 msgid "No sounds when you log in"
 msgstr ""
 
-#: src/prefs.c:905 src/prefs.c:1296
+#: src/prefs.c:1080 src/prefs.c:1511
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:906
+#: src/prefs.c:1081
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:968
+#: src/prefs.c:1146
 #, fuzzy
 msgid "Gaim - Sound Configuration"
 msgstr "gAIM - Telegramm-Mitschnitt"
 
-#: src/prefs.c:1002
+#: src/prefs.c:1181
 #, fuzzy
 msgid "Reset"
 msgstr "Neu"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1186
 #, fuzzy
-msgid "Choose"
+msgid "Choose..."
 msgstr "Schließen"
 
-#: src/prefs.c:1035
+#: src/prefs.c:1222
 msgid "Sound Events"
 msgstr ""
 
-#: src/prefs.c:1047
+#: src/prefs.c:1234
 msgid "Sound when buddy logs in"
 msgstr ""
 
-#: src/prefs.c:1048
+#: src/prefs.c:1235
 msgid "Sound when buddy logs out"
 msgstr ""
 
-#: src/prefs.c:1054
+#: src/prefs.c:1241
 msgid "Sound when message is received"
 msgstr ""
 
-#: src/prefs.c:1055
+#: src/prefs.c:1242
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1243
 msgid "Sound when message is sent"
 msgstr ""
 
-#: src/prefs.c:1062
+#: src/prefs.c:1249
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1250
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1064
+#: src/prefs.c:1251
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1065
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1197 src/prefs.c:2111
+#: src/prefs.c:1262
+#, c-format
+msgid "Command to play sound files (%s for filename; internal if empty)"
+msgstr ""
+
+#: src/prefs.c:1408 src/prefs.c:2266
 #, fuzzy
 msgid "Away Messages"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/prefs.c:1209
+#: src/prefs.c:1420
 #, fuzzy
 msgid "Title"
 msgstr "Datei"
 
-#: src/prefs.c:1213
+#: src/prefs.c:1424
 #, fuzzy
 msgid "Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/prefs.c:1253
+#: src/prefs.c:1464
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1257
+#: src/prefs.c:1468
 #, fuzzy
 msgid "Make Away"
 msgstr "Jetzt abwesend"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1509
 #, fuzzy
 msgid "Ignore new conversations when away   "
 msgstr "Neue Telegramme bei Abwesenheit ignorieren"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1521
 msgid "Auto Away after"
 msgstr ""
 
-#: src/prefs.c:1318
+#: src/prefs.c:1534
 msgid "minutes using"
 msgstr ""
 
-#: src/prefs.c:1400
-#, fuzzy
-msgid "Browser Options"
-msgstr "Einstellungen"
-
-#: src/prefs.c:1412
-msgid "Netscape"
-msgstr ""
-
-#: src/prefs.c:1413
-msgid "KFM"
-msgstr ""
-
-#: src/prefs.c:1415
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:1417
-msgid "Manual"
-msgstr ""
-
-#: src/prefs.c:1426
-msgid "Pop up new window by default"
-msgstr ""
-
-#: src/prefs.c:1641
+#: src/prefs.c:1753
 #, fuzzy
 msgid "Privacy Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1769
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1677
+#: src/prefs.c:1788
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1678
+#: src/prefs.c:1789
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1680
+#: src/prefs.c:1791
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1712
+#: src/prefs.c:1822
 #, fuzzy
 msgid "Deny all users"
 msgstr "Bestimmte sperren"
 
-#: src/prefs.c:1713
+#: src/prefs.c:1823
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1715
+#: src/prefs.c:1825
 #, fuzzy
 msgid "Block List"
 msgstr "Sperren"
 
-#: src/prefs.c:1791
+#: src/prefs.c:1920
 msgid "Gaim - Preferences"
 msgstr ""
 
-#: src/prefs.c:1877
+#: src/prefs.c:2000
 msgid "GAIM debug output window"
 msgstr ""
 
-#: src/prefs.c:2040
+#: src/prefs.c:2185
 msgid "General"
 msgstr ""
 
-#: src/prefs.c:2064
+#: src/prefs.c:2190
+msgid "Browser"
+msgstr ""
+
+#: src/prefs.c:2219
 #, fuzzy
 msgid "Conversations"
 msgstr "Alles Mitschneiten"
 
-#: src/prefs.c:2069
+#: src/prefs.c:2224
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2074
+#: src/prefs.c:2229
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2079
-msgid "Chat Rooms"
-msgstr ""
-
-#: src/prefs.c:2095
+#: src/prefs.c:2250
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:2122
-msgid "Browser"
+#: src/prefs.c:2255
+msgid "Events"
 msgstr ""
 
-#: src/prefs.c:2133
+#: src/prefs.c:2277
 msgid "Privacy"
 msgstr ""
 
-#: src/rvous.c:148
-msgid "Gaim - Save As..."
+#: src/prpl.c:73
+msgid ""
+"You have attempted to load a protocol which was not compiled from the same "
+"version of the source as this application was. Unfortunately, because it is "
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
+msgstr ""
+
+#: src/prpl.c:77
+msgid "Protocol Error"
 msgstr ""
 
-#: src/rvous.c:317
+#: src/prpl.c:97
 #, c-format
-msgid "Receiving %s from %s"
+msgid "%s was using %s, which got removed. %s is now offline."
 msgstr ""
 
-#: src/rvous.c:693
+#: src/prpl.c:100
+#, fuzzy
+msgid "Disconnect"
+msgstr "Verbindung unterbrochen"
+
+#: src/prpl.c:140
+msgid "Accept?"
+msgstr ""
+
+#: src/prpl.c:160 src/prpl.c:231
 msgid "Accept"
 msgstr ""
 
-#: src/rvous.c:720
-#, c-format
-msgid "%s requests you to accept the file: %s (%d bytes)"
+#: src/prpl.c:204
+#, fuzzy
+msgid "Gaim - Prompt"
+msgstr "gAIM - Sperren/Zulassen hinzufügen"
+
+#: src/prpl.c:299
+#, fuzzy
+msgid "Gaim - New User Registration"
+msgstr "gAIM - Telegramm-Mitschnitt"
+
+#: src/prpl.c:308
+msgid "New User Registration"
 msgstr ""
 
-#: src/rvous.c:723
-#, c-format
-msgid "%s requests you to send them a file"
+#: src/prpl.c:320
+msgid "Register new user for"
 msgstr ""
 
-#: src/rvous.c:733
-msgid "Gaim - File Transfer?"
-msgstr ""
-
-#: src/server.c:581
+#: src/server.c:608
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:582
+#: src/server.c:609
 msgid "No"
 msgstr ""
 
-#: src/toc.c:253 src/toc.c:260
+#: src/toc.c:290 src/toc.c:297
 #, fuzzy
 msgid "Connection Closed"
 msgstr "Verbindungsfehler!\n"
 
-#: src/toc.c:295
+#: src/toc.c:332
 msgid "Waiting for reply..."
 msgstr ""
 
-#: src/toc.c:354
+#: src/toc.c:391
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/toc.c:355
+#: src/toc.c:392
 msgid "TOC Resume"
 msgstr ""
 
-#: src/toc.c:515
+#: src/toc.c:560
 #, fuzzy
 msgid "Password Change Successeful"
 msgstr "gAIM - Password Änderung"
 
-#: src/toc.c:518
+#: src/toc.c:563
 msgid ""
 "TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
 
-#: src/toc.c:521
+#: src/toc.c:566
 msgid "TOC Pause"
 msgstr ""
 
-#: src/toc.c:977
+#: src/toc.c:923
 #, fuzzy
 msgid "Get Dir Info"
 msgstr "Profil"
 
+#: src/toc.c:1190
+msgid ""
+"Unfortunately, currently TOC only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
+#: src/toc.c:1499 src/toc.c:1676
+#, fuzzy
+msgid "Could not connect for transfer!"
+msgstr "Fehler beim Verbinden mit Socket.\n"
+
+#: src/toc.c:1706
+msgid "Could not write file header!"
+msgstr ""
+
+#: src/toc.c:1741
+msgid "Gaim - Save As..."
+msgstr ""
+
+#: src/toc.c:1780
+#, c-format
+msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
+msgstr ""
+
+#: src/toc.c:1785
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Change password for:"
+#~ msgstr "gAIM - Fehler Passwort ändern"
+
+#, fuzzy
+#~ msgid "Make Away Now"
+#~ msgstr "Jetzt abwesend"
+
+#~ msgid "GAIM"
+#~ msgstr "gAIM"
+
+#~ msgid "HTML Link:"
+#~ msgstr "HTML-Link"
+
+#~ msgid "Open URL in existing window"
+#~ msgstr "URL in bestehendem Fenster öffnen."
+
+#~ msgid "Open URL in new window"
+#~ msgstr "URL in neuem Fenstern öffnen."
+
+#~ msgid "Add URL as bookmark"
+#~ msgstr "URL als Bookmark hinzufügen"
+
+#, fuzzy
+#~ msgid "Error examining file"
+#~ msgstr "Fehler beim Lesen von %s"
+
+#, fuzzy
+#~ msgid "GetFile Error"
+#~ msgstr "gAIM - Fehler"
+
 #~ msgid "You must give your password"
 #~ msgstr "Bitte geben Sie ein Passwort ein"
 
@@ -1994,9 +2242,6 @@
 #~ msgid "Remove buddy from permit/deny"
 #~ msgstr "Buddy aus Sperren/Zulassen löschen"
 
-#~ msgid "Ok"
-#~ msgstr "OK"
-
 #~ msgid "Show Lag-O-Meter"
 #~ msgstr "Warnlevel zeigen"
 
--- a/po/es.po	Fri Mar 23 17:34:03 2001 +0000
+++ b/po/es.po	Fri Mar 23 18:01:53 2001 +0000
@@ -2,12 +2,11 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/gnome_applet_mgr.c:256
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-03 23:24-0800\n"
+"POT-Creation-Date: 2001-03-23 09:31-0800\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"
@@ -15,12 +14,61 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: src/about.c:72
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#, fuzzy
+msgid "Get Info"
+msgstr "Información de Usuario"
+
+#: plugins/yay/yay.c:169
+#, fuzzy
+msgid "Your message did not get sent."
+msgstr "Sonido cuando un mensaje es enviado"
+
+#: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
+#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
+#: src/oscar.c:1390
+#, fuzzy
+msgid "Gaim - Error"
+msgstr "Gaim - Error %d"
+
+#: plugins/yay/yay.c:187
+#, c-format
+msgid "%s has made %s their buddy%s%s"
+msgstr ""
+
+#: plugins/yay/yay.c:189
+#, fuzzy
+msgid "Gaim - Buddy"
+msgstr "Gaim - Agregar Amigo"
+
+#: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
+#: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
+#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
+msgid "Close"
+msgstr "Cerrar"
+
+#: plugins/napster.c:1060
+msgid "Napster registration is currently under development"
+msgstr ""
+
+#: src/about.c:77
 #, c-format
 msgid "About GAIM v%s"
 msgstr "Sobre GAIM v%s"
 
-#: src/aim.c:133 src/buddy.c:2100
+#: src/about.c:114
+msgid ""
+"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"written using Gtk+ and is licensed under the GPL.\n"
+"URL: http://www.marko.net/gaim/"
+msgstr ""
+
+#: src/about.c:189
+msgid "Web Site"
+msgstr ""
+
+#: src/aim.c:135 src/buddy.c:2295
 msgid "Signoff"
 msgstr "Desconectar"
 
@@ -28,7 +76,7 @@
 msgid "Please enter your logon"
 msgstr "Porfavor introduzca su nombre de cuenta"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#: src/aim.c:147 src/aim.c:152 src/multi.c:838
 #, fuzzy
 msgid "Signon Error"
 msgstr "Conectar"
@@ -38,653 +86,742 @@
 msgid "Please enter your password"
 msgstr "Porfavor introduzca su nombre de cuenta"
 
-#: src/aim.c:254 src/multi.c:608
-msgid "Signon"
-msgstr "Conectar"
-
-#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+#: src/aim.c:246
+msgid "Gaim - Login"
+msgstr "Conectación - Gaim"
+
+#: src/aim.c:264
+msgid "Screen Name: "
+msgstr "Nomre de Usuario:"
+
+#: src/aim.c:278
+msgid "Password: "
+msgstr "Contraseña: "
+
+#: src/aim.c:299 src/buddy.c:2299
+msgid "Quit"
+msgstr "Salir"
+
+#: src/aim.c:304 src/aim.c:641 src/buddy.c:2358
 msgid "Accounts"
 msgstr ""
 
-#. Build OK Button
-#: src/aim.c:258 src/buddy_chat.c:202 src/buddy_chat.c:243 src/dialogs.c:347
-#: src/dialogs.c:666 src/dialogs.c:741 src/dialogs.c:892 src/dialogs.c:1029
-#: src/dialogs.c:1167 src/dialogs.c:1360 src/dialogs.c:1654 src/dialogs.c:1739
-#: src/dialogs.c:1953 src/dialogs.c:2141 src/dialogs.c:2305 src/dialogs.c:2397
-#: src/dialogs.c:3176 src/dialogs.c:3435 src/multi.c:494 src/multi.c:604
-#: src/multi.c:835 src/oscar.c:879 src/rvous.c:327 src/rvous.c:464
-#: src/rvous.c:696
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/aim.c:259
+#: src/aim.c:306 src/multi.c:578
+msgid "Signon"
+msgstr "Conectar"
+
+#: src/aim.c:338 src/prpl.c:359
 msgid "Register"
 msgstr "Registrar"
 
-#: src/aim.c:260
+#: src/aim.c:339
 msgid "Options"
 msgstr "Opciones"
 
-#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
+#: src/aim.c:341 src/aim.c:644 src/buddy.c:2375
 msgid "Plugins"
 msgstr "Aditivos"
 
-#. Labels for selectors and text boxes
-#: src/aim.c:338
-msgid "Screen Name: "
-msgstr "Nomre de Usuario:"
-
-#: src/aim.c:341
-msgid "Password: "
-msgstr "Contraseña: "
-
-#: src/aim.c:380
-msgid "Gaim - Login"
-msgstr "Conectación - Gaim"
-
-#: src/aim.c:599 src/buddy.c:2163
+#: src/aim.c:638 src/buddy.c:2367
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/away.c:110 src/away.c:227
-msgid "Back"
-msgstr "Retroceder"
-
-#: src/away.c:121
+#: src/applet.c:89
+#, c-format
+msgid "file not found: %s\n"
+msgstr "archivo no encontrado: %s\n"
+
+#: src/applet.c:113
+msgid "Attempting to sign on...."
+msgstr "Tratando de conectarme...."
+
+#: src/applet.c:119
+msgid "Offilne. Click to bring up login box."
+msgstr "Desconectado.  Oprima para abrir ventana para conectarse."
+
+#: src/applet.c:136 src/applet.c:174 src/buddy.c:2313
+msgid "Away"
+msgstr "Ausente"
+
+#: src/applet.c:177 src/away.c:266
+msgid "New Away Message"
+msgstr "Nuevo Mensaje de Ausencia"
+
+#: src/applet.c:317
+msgid "Can't create GAIM applet!"
+msgstr "No pudo crearse el programa GAIM"
+
+#: src/applet.c:348
+msgid "Offline"
+msgstr "Desconectado"
+
+#: src/applet.c:362
+msgid "Font does not exist"
+msgstr "Ese tipo de texto no existe"
+
+#: src/applet.c:377
+msgid "About..."
+msgstr "Sobre..."
+
+#: src/away.c:96
 msgid "I'm Back!"
 msgstr "Ya regrese"
 
-#: src/away.c:160
+#: src/away.c:133
 msgid "Gaim - Away!"
 msgstr "Gaim - Ausente!"
 
-#: src/away.c:266 src/gnome_applet_mgr.c:200
-msgid "New Away Message"
-msgstr "Nuevo Mensaje de Ausencia"
-
-#: src/away.c:284
+#: src/away.c:147 src/away.c:228 src/away.c:393
+msgid "Back"
+msgstr "Retroceder"
+
+#: src/away.c:286
 msgid "Remove Away Message"
 msgstr "Quitar Mensaje de Ausencia"
 
+#: src/away.c:462
+msgid "Set All Away"
+msgstr ""
+
 #. Put the buttons in the box
-#: src/buddy.c:239 src/buddy.c:2234 src/buddy_chat.c:845
-#: src/conversation.c:1641 src/conversation.c:1740 src/dialogs.c:890
-#: src/dialogs.c:1023 src/dialogs.c:1964 src/multi.c:693 src/prefs.c:639
-#: src/prefs.c:1249 src/prefs.c:1700 src/prefs.c:1735
+#: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
+#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
+#: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
 msgstr "Agregar"
 
-#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
+#: src/buddy.c:246 src/buddy.c:2444 src/dialogs.c:878 src/dialogs.c:974
 msgid "Group"
 msgstr "Grupo"
 
-#: src/buddy.c:241 src/buddy.c:2236 src/buddy_chat.c:847
-#: src/conversation.c:1639 src/conversation.c:1738 src/prefs.c:640
-#: src/prefs.c:1261 src/prefs.c:1704 src/prefs.c:1739
+#: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
+#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
+#: src/buddy.c:250 src/buddy.c:1830 src/buddy.c:2186
 msgid "Chat"
 msgstr "Hablar"
 
-#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
+#: src/buddy.c:251 src/buddy.c:443 src/buddy.c:2184 src/buddy_chat.c:474
+#: src/buddy_chat.c:804
 msgid "IM"
 msgstr "Mensaje"
 
-#: src/buddy.c:246 src/buddy.c:2002 src/buddy_chat.c:564 src/buddy_chat.c:853
-#: src/conversation.c:1734 src/rvous.c:694
+#: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
+#: src/buddy_chat.c:1025 src/conversation.c:2073
 msgid "Info"
 msgstr "Información"
 
 #. Put the buttons in the box
-#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
+#: src/buddy.c:449 src/buddy.c:554 src/dialogs.c:968 src/dialogs.c:3395
+#: src/dialogs.c:3410 src/dialogs.c:3487 src/dialogs.c:3502
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:425
+#: src/buddy.c:455 src/buddy.c:568
 msgid "Add Buddy Pounce"
 msgstr "Agregar Calada de Amigo"
 
-#: src/buddy.c:1368
+#: src/buddy.c:461 src/buddy.c:574
+msgid "View Log"
+msgstr ""
+
+#: src/buddy.c:561
+msgid "Un-Alias"
+msgstr ""
+
+#: src/buddy.c:1512
 msgid "New Buddy Pounce"
 msgstr "Nueva Calada de Amigo"
 
-#: src/buddy.c:1386
+#: src/buddy.c:1530
 msgid "Remove Buddy Pounce"
 msgstr "Quitar Calada de Amigo"
 
-#: src/buddy.c:1675
+#: src/buddy.c:1821
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "Calada de Amigo"
 
-#: src/buddy.c:1678
+#: src/buddy.c:1824
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1681
+#: src/buddy.c:1827
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1687
+#: src/buddy.c:1833
 #, fuzzy
 msgid "Get File"
 msgstr "Archivo"
 
-#: src/buddy.c:1690
+#: src/buddy.c:1836
 #, fuzzy
 msgid "Send File"
 msgstr "Archivo"
 
-#: src/buddy.c:1749
+#: src/buddy.c:1839
+msgid "Games"
+msgstr ""
+
+#: src/buddy.c:1842
+msgid "Stocks"
+msgstr ""
+
+#: src/buddy.c:1894
+#, fuzzy, c-format
+msgid "Logged in: %s\n"
+msgstr "Connectando %s\n"
+
+#: src/buddy.c:1905
 msgid "Warnings: %d%%\n"
 msgstr "Advertencias: %d%%\n"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1917
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1758
+#: src/buddy.c:1921
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
 "Screen Name: %s\n"
-"Logged in: %s\n"
-"%s%s%s%s%s"
+"%s%s%s%s%s%s"
 msgstr ""
 "Nombre: %s              \n"
 "Connectado en: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1761
+#: src/buddy.c:1925
 msgid "Idle: "
 msgstr "Inactivo: "
 
-#: src/buddy.c:1828
+#: src/buddy.c:1995
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
-#: src/buddy.c:1878
+#: src/buddy.c:2047
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s desconectado%s%s.</B><BR><HR>"
 
-#: src/buddy.c:2028
+#: src/buddy.c:2211
 msgid "Information on selected Buddy"
 msgstr "Informacion sobre Amigo Escogido"
 
-#: src/buddy.c:2029 src/dialogs.c:657
+#: src/buddy.c:2212 src/dialogs.c:663
 msgid "Send Instant Message"
 msgstr "Mandar Mensaje Instantaneo"
 
-#: src/buddy.c:2030
+#: src/buddy.c:2213
 msgid "Start/join a Buddy Chat"
 msgstr "Empezar/Unirse a Conversación de Amigos"
 
-#: src/buddy.c:2088
+#: src/buddy.c:2277
 msgid "File"
 msgstr "Archivo"
 
-#: src/buddy.c:2092 src/buddy.c:2093
+#: src/buddy.c:2281
 msgid "Add A Buddy"
 msgstr "Agregar Amigo"
 
-#: src/buddy.c:2094
+#: src/buddy.c:2283
 #, fuzzy
 msgid "Join A Chat"
 msgstr "Unirse a conversación"
 
-#: src/buddy.c:2095
+#: src/buddy.c:2285
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Mandar Mensaje Instantaneo"
 
-#: src/buddy.c:2097
+#: src/buddy.c:2290
 msgid "Import Buddy List"
 msgstr "Importar Lista de Amigos"
 
-#: src/buddy.c:2098
+#: src/buddy.c:2292
 msgid "Export Buddy List"
 msgstr "Exportar Lista de Amigos"
 
-#: src/buddy.c:2103
-msgid "Quit"
-msgstr "Salir"
-
-#: src/buddy.c:2105 src/buddy_chat.c:556 src/buddy_chat.c:818
-#: src/buddy_chat.c:841 src/conversation.c:1736 src/dialogs.c:425
-#: src/multi.c:709 src/plugins.c:314 src/prefs.c:1844
-msgid "Close"
-msgstr "Cerrar"
-
-#: src/buddy.c:2110
+#: src/buddy.c:2308
 msgid "Tools"
 msgstr "Herramientas"
 
-#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
-msgid "Away"
-msgstr "Ausente"
-
-#: src/buddy.c:2120
+#: src/buddy.c:2318
 msgid "Buddy Pounce"
 msgstr "Calada de Amigo"
 
-#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
+#: src/buddy.c:2327 src/dialogs.c:2039 src/dialogs.c:2206
 msgid "Search for Buddy"
 msgstr "Buscar un Amigo"
 
-#: src/buddy.c:2131
+#: src/buddy.c:2330
 msgid "by Email"
 msgstr "por Correo Electronico"
 
-#: src/buddy.c:2135
+#: src/buddy.c:2334
 msgid "by Dir Info"
 msgstr "por Información de Directorio"
 
-#: src/buddy.c:2142 src/buddy.c:2143
+#: src/buddy.c:2341 src/buddy.c:2342
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/buddy.c:2146
+#: src/buddy.c:2345
 msgid "User Info"
 msgstr "Información de Usuario"
 
-#: src/buddy.c:2150 src/dialogs.c:1353
+#: src/buddy.c:2349 src/dialogs.c:1326
 msgid "Directory Info"
 msgstr "Información del Directorio"
 
-#: src/buddy.c:2154 src/dialogs.c:1592
+#: src/buddy.c:2353 src/dialogs.c:1517
 msgid "Change Password"
 msgstr "Cambiar Contraseña"
 
-#: src/buddy.c:2171
+#: src/buddy.c:2362
+#, fuzzy
+msgid "Protocol Actions"
+msgstr "Opciones"
+
+#: src/buddy.c:2369
+msgid "View System Log"
+msgstr ""
+
+#: src/buddy.c:2380
 #, fuzzy
 msgid "Perl"
 msgstr "Permitir"
 
-#: src/buddy.c:2174
+#: src/buddy.c:2383
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2178
+#: src/buddy.c:2387
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2182
+#: src/buddy.c:2391
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2190
+#: src/buddy.c:2399
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2404
 #, fuzzy
 msgid "About Gaim"
 msgstr "Sobre"
 
-#: src/buddy.c:2214 src/prefs.c:2053
+#: src/buddy.c:2423 src/prefs.c:2208
 msgid "Buddy List"
 msgstr "Lista de Amigos"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2477
 msgid "Add a new Buddy"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:2267
+#: src/buddy.c:2478
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:2268
+#: src/buddy.c:2479
 msgid "Remove selected Buddy"
 msgstr "Quitar Amigo Escogido"
 
-#: src/buddy.c:2293
+#: src/buddy.c:2504
 msgid "Online"
 msgstr "En Linea"
 
-#: src/buddy.c:2295
+#: src/buddy.c:2506
 msgid "Edit Buddies"
 msgstr "Corregir Amigos["
 
-#: src/buddy.c:2332
+#: src/buddy.c:2543
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista de Amigos"
 
-#: src/buddy_chat.c:135
+#: src/buddy_chat.c:156
 msgid "Join Chat"
 msgstr "Unirse a conversación"
 
-#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
+#: src/buddy_chat.c:163 src/buddy_chat.c:917 src/buddy_chat.c:929
 msgid "Buddy Chat"
 msgstr "Conversación de Amigos"
 
-#: src/buddy_chat.c:151
+#: src/buddy_chat.c:173
 msgid "Join what group:"
 msgstr "Unirse a que grupo:"
 
-#: src/buddy_chat.c:167
+#: src/buddy_chat.c:186
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "Unirse a conversación"
 
-#: src/buddy_chat.c:181
+#: src/buddy_chat.c:198
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:189
+#: src/buddy_chat.c:205
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:197
+#: src/buddy_chat.c:213 src/buddy_chat.c:258 src/dialogs.c:402
+#: src/dialogs.c:682 src/dialogs.c:742 src/dialogs.c:870 src/dialogs.c:987
+#: src/dialogs.c:1240 src/dialogs.c:1450 src/dialogs.c:1578 src/dialogs.c:1643
+#: src/dialogs.c:1856 src/dialogs.c:2045 src/dialogs.c:2225 src/dialogs.c:2299
+#: src/dialogs.c:3163 src/dialogs.c:3397 src/dialogs.c:3489 src/dialogs.c:3676
+#: src/multi.c:463 src/multi.c:574 src/multi.c:821 src/prpl.c:156
+#: src/prpl.c:227
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/buddy_chat.c:218
 msgid "Join"
 msgstr "Unirse"
 
-#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
+#: src/buddy_chat.c:259 src/buddy_chat.c:855 src/buddy_chat.c:984
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/buddy_chat.c:261
+#: src/buddy_chat.c:275
 msgid "Invite who?"
 msgstr "Invitar a quien?"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:279
 msgid "With message:"
 msgstr "Con el mensaje:"
 
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:303
 msgid "Invite to Buddy Chat"
 msgstr "Invitar un Amigo a la conversación"
 
-#: src/buddy_chat.c:420
+#: src/buddy_chat.c:480 src/buddy_chat.c:808
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: src/buddy_chat.c:532 src/buddy_chat.c:638
+#, c-format
+msgid "%d %s in room"
+msgstr ""
+
+#: src/buddy_chat.c:539
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:459
+#: src/buddy_chat.c:602
+#, c-format
+msgid "<B>%s is now known as %s</B>"
+msgstr ""
+
+#: src/buddy_chat.c:645
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:559 src/buddy_chat.c:816
+#: src/buddy_chat.c:785
+msgid "0 people in room"
+msgstr ""
+
+#: src/buddy_chat.c:860 src/buddy_chat.c:983
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
-#: src/conversation.c:1733
+#: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
+#: src/conversation.c:2084
 msgid "Send"
 msgstr "Mandar"
 
-#: src/buddy_chat.c:563
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: src/buddy_chat.c:849 src/conversation.c:1741
+#: src/buddy_chat.c:1021 src/conversation.c:2061
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
-#: src/dialogs.c:345 src/rvous.c:695
+#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/dialogs.c:397
 msgid "Warn"
 msgstr "Advertir"
 
-#: src/conversation.c:426
+#: src/conversation.c:352
+#, fuzzy
+msgid "Gaim - Save Conversation"
+msgstr "Gaim - Guardar Conversación"
+
+#: src/conversation.c:484
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Quitando '%s' de la lista.\n"
 
-#: src/conversation.c:902
+#: src/conversation.c:1044
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Presentemente en %d\n"
 
-#: src/conversation.c:911
+#: src/conversation.c:1052
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Moviendo posición a %d\n"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1574
 msgid "Bold"
 msgstr "Negritas"
 
-#: src/conversation.c:1497 src/prefs.c:818
+#: src/conversation.c:1574 src/prefs.c:974
 msgid "Bold Text"
 msgstr "Texto en Negritas"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1578 src/conversation.c:1579
 msgid "Italics"
 msgstr "Inclinados"
 
-#: src/conversation.c:1501 src/prefs.c:819
+#: src/conversation.c:1578 src/prefs.c:975
 msgid "Italics Text"
 msgstr "Texto Inclinado"
 
-#: src/conversation.c:1505 src/conversation.c:1506
+#: src/conversation.c:1582 src/conversation.c:1583
 msgid "Underline"
 msgstr "Subrayar"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1582
 msgid "Underline Text"
 msgstr "Subrayar Texto"
 
-#: src/conversation.c:1509 src/conversation.c:1510
+#: src/conversation.c:1587
 msgid "Strike"
 msgstr "Cruzar"
 
-#: src/conversation.c:1509
+#: src/conversation.c:1587
 msgid "Strike through Text"
 msgstr "Cruzar el Texto"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Small"
 msgstr "Pequeño"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Decrease font size"
 msgstr "Hacer texto mas pequeño"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal font size"
 msgstr "Texto normal"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Increase font size"
 msgstr "Hacer el texto mas grande "
 
-#: src/conversation.c:1526 src/conversation.c:1527
+#: src/conversation.c:1606 src/conversation.c:1607
 msgid "Font"
 msgstr "Texto"
 
-#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
+#: src/conversation.c:1606 src/dialogs.c:2648 src/dialogs.c:2664
 msgid "Select Font"
 msgstr "Seleccionar un Texto"
 
-#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
-#: src/conversation.c:1535
+#: src/conversation.c:1610 src/conversation.c:1611 src/conversation.c:1615
 msgid "Color"
 msgstr "Color"
 
-#: src/conversation.c:1530 src/prefs.c:832
+#: src/conversation.c:1610 src/prefs.c:988
 msgid "Text Color"
 msgstr "Color del texto"
 
-#: src/conversation.c:1534 src/prefs.c:849
+#: src/conversation.c:1615 src/prefs.c:1006
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1541 src/conversation.c:1542
+#: src/conversation.c:1622 src/conversation.c:1623
 msgid "Link"
 msgstr "Dirección"
 
-#: src/conversation.c:1541 src/dialogs.c:2391
+#: src/conversation.c:1622 src/dialogs.c:2293
 msgid "Insert Link"
 msgstr "Insertar una Dirección"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 #, fuzzy
 msgid "Smiley"
 msgstr "Archivo"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1552 src/conversation.c:1553
+#: src/conversation.c:1633 src/conversation.c:1634 src/prefs.c:2195
 msgid "Logging"
 msgstr "Diario"
 
-#: src/conversation.c:1552
+#: src/conversation.c:1633
 msgid "Enable logging"
 msgstr "Usar Diario"
 
-#: src/conversation.c:1556 src/conversation.c:1557
+#: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+msgid "Save"
+msgstr "Guardar"
+
+#: src/conversation.c:1643
+#, fuzzy
+msgid "Save Conversation"
+msgstr "Guarde todas las conversaciones"
+
+#: src/conversation.c:1648 src/conversation.c:1649
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/conversation.c:1556
+#: src/conversation.c:1648
 msgid "Enable sounds"
 msgstr "Usar Sonidos"
 
-#: src/conversation.c:1768
+#: src/conversation.c:1928
+#, fuzzy
+msgid "Gaim - Conversations"
+msgstr "Gaim - Guardar Conversación"
+
+#: src/conversation.c:2003
 #, fuzzy
 msgid "Send message as: "
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/dialogs.c:360
+#: src/dialogs.c:359
+msgid "Gaim - Warn user?"
+msgstr "Gaim - Advertir usuario?"
+
+#: src/dialogs.c:380
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "¿Deveras quiere advertirle a %s?"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:385
 msgid "Warn anonymously?"
 msgstr "¿Advertirle anonimamente?"
 
-#: src/dialogs.c:367
+#: src/dialogs.c:389
 msgid "Anonymous warnings are less harsh."
 msgstr "Las advertencias anonimas son menos duras."
 
-#: src/dialogs.c:393
-msgid "Gaim - Warn user?"
-msgstr "Gaim - Advertir usuario?"
-
-#: src/dialogs.c:458
+#: src/dialogs.c:465
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No se pudo escribir archivo %s."
 
-#: src/dialogs.c:461
+#: src/dialogs.c:468
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No se pudo leer archivo %s."
 
-#: src/dialogs.c:464
+#: src/dialogs.c:471
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensaje demasiado largo, ultimos %s bytes fueron borrados."
 
-#: src/dialogs.c:467
+#: src/dialogs.c:474
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s no esta en linea ahorita."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:477
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Advertencias para %s estan prohibidas."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:480
 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:476
+#: src/dialogs.c:483
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Conversación en %s no esta disponible."
 
-#: src/dialogs.c:479
+#: src/dialogs.c:486
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esta mandando los mensajes demasiado rapido a %s."
 
-#: src/dialogs.c:482
+#: src/dialogs.c:489
 #, 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:485
+#: src/dialogs.c:492
 #, 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:488
+#: src/dialogs.c:495
 msgid "Failure."
 msgstr "Falla"
 
-#: src/dialogs.c:491
+#: src/dialogs.c:498
 msgid "Too many matches."
 msgstr "Demasiados resultados"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:501
 msgid "Need more qualifiers."
 msgstr "Necesito mas calificadores"
 
-#: src/dialogs.c:497
+#: src/dialogs.c:504
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio no esta disponible ahorita."
 
-#: src/dialogs.c:500
+#: src/dialogs.c:507
 msgid "Email lookup restricted."
 msgstr "Busqueda de correos electronicos es restringida."
 
-#: src/dialogs.c:503
+#: src/dialogs.c:510
 msgid "Keyword ignored."
 msgstr "Palabra ignorada"
 
-#: src/dialogs.c:506
+#: src/dialogs.c:513
 msgid "No keywords."
 msgstr "Sin palabras"
 
-#: src/dialogs.c:509
+#: src/dialogs.c:516
 msgid "User has no directory information."
 msgstr "El usuario no tiene información en el directorio."
 
-#: src/dialogs.c:513
+#: src/dialogs.c:520
 msgid "Country not supported."
 msgstr "País no apoyado"
 
-#: src/dialogs.c:516
+#: src/dialogs.c:523
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Falla desconocida: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:519 src/oscar.c:471
+#: src/dialogs.c:526 src/oscar.c:523
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contraseña incorrecta."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:529
 msgid "The service is temporarily unavailable."
 msgstr "Este servicio no esta disponible en este momento."
 
-#: src/dialogs.c:525
+#: src/dialogs.c:532
 msgid "Your warning level is currently too high to log in."
 msgstr "Su nivel de advertencias es demasiado alto para conectarse."
 
-#: src/dialogs.c:528
+#: src/dialogs.c:535
 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."
@@ -692,535 +829,538 @@
 "Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
 "intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
 
-#: src/dialogs.c:531
+#: src/dialogs.c:538
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Un error al conectarse ha ocurrido: %s."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:541
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Un error desconocido, %d, ha ocurrido.  Informacion: %s"
 
-#: src/dialogs.c:537
+#: src/dialogs.c:544
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - Error %d"
 
 #. Build OK Button
-#: src/dialogs.c:596 src/dialogs.c:661 src/dialogs.c:736 src/dialogs.c:1172
-#: src/dialogs.c:1659 src/dialogs.c:1806 src/dialogs.c:2140 src/dialogs.c:2310
-#: src/dialogs.c:2396 src/multi.c:499
+#: src/dialogs.c:603 src/dialogs.c:687 src/dialogs.c:747 src/dialogs.c:1245
+#: src/dialogs.c:1583 src/dialogs.c:1696 src/dialogs.c:2044 src/dialogs.c:2230
+#: src/dialogs.c:2298 src/multi.c:467
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:671
+#: src/dialogs.c:653
+msgid "Gaim - IM user"
+msgstr "Gaim - Usuario"
+
+#: src/dialogs.c:670
 #, fuzzy
 msgid "IM who:"
 msgstr "Quien: "
 
-#: src/dialogs.c:695
-msgid "Gaim - IM user"
-msgstr "Gaim - Usuario"
-
-#: src/dialogs.c:732
+#: src/dialogs.c:718
 #, fuzzy
 msgid "Get User Info"
 msgstr "Información de Usuario"
 
-#: src/dialogs.c:746
+#: src/dialogs.c:725
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:770
+#. Finish up
+#: src/dialogs.c:753
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Crear Información del Usuario"
 
-#: src/dialogs.c:845
+#: src/dialogs.c:823
 msgid "Buddies"
 msgstr "Amigos"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:876
 #, fuzzy
 msgid "Add Group"
 msgstr "Grupo"
 
-#: src/dialogs.c:928
+#: src/dialogs.c:906
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:957
+#: src/dialogs.c:933
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:967
+#: src/dialogs.c:947
 msgid "Add Buddy"
 msgstr "Agregar Amigo"
 
-#: src/dialogs.c:979 src/dialogs.c:3443
+#: src/dialogs.c:957 src/dialogs.c:3405 src/dialogs.c:3497
 msgid "Buddy"
 msgstr "Amigo"
 
-#: src/dialogs.c:1109
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Please enter a buddy to pounce."
+msgstr "Porfavor introduzca su nombre de cuenta"
+
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Buddy Pounce Error"
+msgstr "Calada de Amigo"
+
+#: src/dialogs.c:1076
 #, fuzzy
 msgid "Pounce buddy as:"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/dialogs.c:1181
+#: src/dialogs.c:1126
+msgid "Gaim - New Buddy Pounce"
+msgstr "Gaim - Nuevo amigo a calar"
+
+#: src/dialogs.c:1143
 #, fuzzy
 msgid "Buddy:"
 msgstr "Amigo"
 
+#: src/dialogs.c:1158
+msgid "Pounce on sign on"
+msgstr ""
+
+#: src/dialogs.c:1163
+msgid "Pounce on return from away"
+msgstr ""
+
+#: src/dialogs.c:1167
+msgid "Pounce on return from idle"
+msgstr ""
+
+#: src/dialogs.c:1175
+#, fuzzy
+msgid "Open IM window on pounce"
+msgstr "Abrir Ventana de Mensage cuando se conecte este amigo"
+
+#: src/dialogs.c:1180
+#, fuzzy
+msgid "Send IM on pounce"
+msgstr "Mandar un mensaje cuando se conecte este amigo"
+
 #: src/dialogs.c:1189
 #, fuzzy
 msgid "Message:"
 msgstr "Crear Mensaje"
 
-#: src/dialogs.c:1196 src/prefs.c:2100
-msgid "Events"
-msgstr ""
-
-#. Set up the different options
 #: src/dialogs.c:1201
-msgid "Pounce on sign on"
-msgstr ""
-
-#: src/dialogs.c:1203
-msgid "Pounce on return from away"
-msgstr ""
-
-#: src/dialogs.c:1204
-msgid "Pounce on return from idle"
-msgstr ""
-
-#: src/dialogs.c:1226
 #, fuzzy
-msgid "Actions"
-msgstr "Opciones"
-
-#. And now the other stuff
-#: src/dialogs.c:1231
-#, fuzzy
-msgid "Open IM window on pounce"
-msgstr "Abrir Ventana de Mensage cuando se conecte este amigo"
-
-#: src/dialogs.c:1234
-#, fuzzy
-msgid "Send IM on pounce"
+msgid "Execute command on pounce"
 msgstr "Mandar un mensaje cuando se conecte este amigo"
 
-#: src/dialogs.c:1263
-msgid "Gaim - New Buddy Pounce"
-msgstr "Gaim - Nuevo amigo a calar"
-
-#. Build Save Button
-#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
-msgid "Save"
-msgstr "Guardar"
-
-#: src/dialogs.c:1376
+#: src/dialogs.c:1210
+msgid "Command:"
+msgstr ""
+
+#: src/dialogs.c:1227
+msgid "Save this pounce after activation"
+msgstr ""
+
+#: src/dialogs.c:1316
+msgid "Gaim - Set Dir Info"
+msgstr "Gaim - Crear Información del directorio"
+
+#: src/dialogs.c:1348
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dejar que busquedas en el Web encuentren su informacion"
 
 #. Line 1
-#: src/dialogs.c:1379 src/dialogs.c:2159
+#: src/dialogs.c:1351 src/dialogs.c:2063
 msgid "First Name"
 msgstr "Nombre"
 
 #. Line 2
-#: src/dialogs.c:1390 src/dialogs.c:2171
+#: src/dialogs.c:1362 src/dialogs.c:2075
 msgid "Middle Name"
 msgstr "Segundo Nombre"
 
 #. Line 3
-#: src/dialogs.c:1402 src/dialogs.c:2183
+#: src/dialogs.c:1374 src/dialogs.c:2087
 msgid "Last Name"
 msgstr "Apellido"
 
 #. Line 4
-#: src/dialogs.c:1413 src/dialogs.c:2195
+#: src/dialogs.c:1385 src/dialogs.c:2099
 msgid "Maiden Name"
 msgstr "Apellido Materno"
 
 #. Line 5
-#: src/dialogs.c:1424 src/dialogs.c:2207
+#: src/dialogs.c:1396 src/dialogs.c:2111
 msgid "City"
 msgstr "Ciudad"
 
 #. Line 6
-#: src/dialogs.c:1435 src/dialogs.c:2218
+#: src/dialogs.c:1407 src/dialogs.c:2122
 msgid "State"
 msgstr "Estado"
 
 #. Line 7
-#: src/dialogs.c:1446 src/dialogs.c:2229
+#: src/dialogs.c:1418 src/dialogs.c:2133
 msgid "Country"
 msgstr "País"
 
-#: src/dialogs.c:1490
-msgid "Gaim - Set Dir Info"
-msgstr "Gaim - Crear Información del directorio"
-
-#: src/dialogs.c:1507
+#: src/dialogs.c:1473
 msgid "New Passwords Do Not Match"
 msgstr "Las contraseñas nuevas no son iguales"
 
-#: src/dialogs.c:1507 src/dialogs.c:1512
+#: src/dialogs.c:1473 src/dialogs.c:1478
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Error sobre el cambio de contraseña"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1478
 msgid "Fill out all fields completely"
 msgstr "Llene todos los campos completamente"
 
-#: src/dialogs.c:1541
-#, fuzzy
-msgid "Change password for:"
-msgstr "Cambiar Contraseña"
-
-#: src/dialogs.c:1580 src/toc.c:515
+#: src/dialogs.c:1505 src/toc.c:560
 msgid "Gaim - Password Change"
 msgstr "Gaim - Cambiar Contraseña"
 
-#: src/dialogs.c:1612
+#: src/dialogs.c:1536
 msgid "Original Password"
 msgstr "Contraseña Original"
 
-#: src/dialogs.c:1626
+#: src/dialogs.c:1550
 msgid "New Password"
 msgstr "Contraseña Nueva"
 
-#: src/dialogs.c:1640
+#: src/dialogs.c:1564
 msgid "New Password (again)"
 msgstr "Contraseña Nueva (de nuevo)"
 
-#: src/dialogs.c:1693
-msgid "Set info for:"
-msgstr ""
-
-#: src/dialogs.c:1776
+#: src/dialogs.c:1609
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Crear Información del Usuario"
 
-#: src/dialogs.c:1817
+#: src/dialogs.c:1707
 msgid "Below are the results of your search: "
 msgstr "Siguientemente estan los resultados de su búsqueda: "
 
-#: src/dialogs.c:1943 src/dialogs.c:1950
+#: src/dialogs.c:1846 src/dialogs.c:1853
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/dialogs.c:1945 src/dialogs.c:1952
+#: src/dialogs.c:1848 src/dialogs.c:1855
 msgid "Deny"
 msgstr "Negar"
 
-#: src/dialogs.c:1993
+#: src/dialogs.c:1896
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Agregar Autorizar/Negar"
 
-#: src/dialogs.c:1995
+#: src/dialogs.c:1898
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Agregar Autorizar/Negar"
 
-#: src/dialogs.c:2057
+#: src/dialogs.c:1960
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/dialogs.c:2266
+#: src/dialogs.c:2170
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Encontrar amgio por información"
 
-#: src/dialogs.c:2315
-msgid "Email"
-msgstr "Correo Electrónico"
-
-#: src/dialogs.c:2328
+#: src/dialogs.c:2200
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electrónico"
 
-#: src/dialogs.c:2410
+#: src/dialogs.c:2213
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: src/dialogs.c:2312
 msgid "URL"
 msgstr "Dirección"
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2320
 msgid "Description"
 msgstr "Descripción"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2346
 msgid "GAIM - Add URL"
 msgstr "GAIM - Agregar dirección"
 
-#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
+#: src/dialogs.c:2487 src/dialogs.c:2500 src/dialogs.c:2537
 msgid "Select Text Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2624
+#: src/dialogs.c:2524
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2847 src/rvous.c:265
+#: src/dialogs.c:2769
 #, c-format
 msgid "Error writing file %s"
 msgstr "Error creando el archivo %s"
 
-#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
-#: src/rvous.c:548
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
+#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "Error"
 
-#: src/dialogs.c:2901
+#: src/dialogs.c:2823
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Exportar lista de amigos"
 
-#: src/dialogs.c:2967 src/rvous.c:547
+#: src/dialogs.c:2891
 #, c-format
 msgid "Error reading file %s"
 msgstr "Error leyendo el archivo %s"
 
-#: src/dialogs.c:3045
+#: src/dialogs.c:2967
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar lista de amigos"
 
-#: src/dialogs.c:3124
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3030
+msgid "You cannot create an away message with a blank title"
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3037
+msgid "You cannot create an empty away message"
+msgstr ""
+
+#: src/dialogs.c:3104
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo mensaje de ausencia"
 
-#. Put frame and button-box in the toplevel
-#: src/dialogs.c:3136
+#: src/dialogs.c:3114
 #, fuzzy
 msgid "New away message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3149
+#: src/dialogs.c:3127
 msgid "Away title: "
 msgstr "Titulo del mensaje: "
 
-#. Checkbox for showing away msg
-#: src/dialogs.c:3193
+#: src/dialogs.c:3167
 #, fuzzy
-msgid "Make Away Now"
-msgstr "Hacerme ausente ahora"
+msgid "Use"
+msgstr "GAIM Usar"
+
+#: src/dialogs.c:3171
+msgid "Save & Use"
+msgstr ""
 
 #. show everything
-#: src/dialogs.c:3370
+#: src/dialogs.c:3340
 #, fuzzy
 msgid "Smile!"
 msgstr "Archivo"
 
-#: src/dialogs.c:3441
+#: src/dialogs.c:3403 src/dialogs.c:3495
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Agregar Amigo"
 
-#: src/dialogs.c:3478
+#: src/dialogs.c:3440 src/dialogs.c:3532
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/gnome_applet_mgr.c:95
+#: src/dialogs.c:3604
+#, fuzzy
+msgid "Gaim - Save Log File"
+msgstr "Gaim - Guardar Como..."
+
+#: src/dialogs.c:3635
+#, fuzzy, c-format
+msgid "Unable to remove file %s - %s"
+msgstr "No se pudo leer archivo %s."
+
+#: src/dialogs.c:3666
+msgid "Really clear log?"
+msgstr ""
+
+#: src/dialogs.c:3684
+#, fuzzy
+msgid "Okay"
+msgstr "OK"
+
+#: src/dialogs.c:3781
+#, fuzzy
+msgid "Clear"
+msgstr "Cerrar"
+
+#: src/gaimrc.c:870
 #, c-format
-msgid "file not found: %s\n"
-msgstr "archivo no encontrado: %s\n"
-
-#: src/gnome_applet_mgr.c:121
-msgid "Offilne. Click to bring up login box."
-msgstr "Desconectado.  Oprima para abrir ventana para conectarse."
-
-#: src/gnome_applet_mgr.c:128
-msgid "Attempting to sign on...."
-msgstr "Tratando de conectarme...."
-
-#: src/gnome_applet_mgr.c:254
-msgid "GAIM"
-msgstr "GAIM"
-
-#: src/gnome_applet_mgr.c:366
-msgid "Can't create GAIM applet!"
-msgstr "No pudo crearse el programa GAIM"
-
-#: src/gnome_applet_mgr.c:397
-msgid "Offline"
-msgstr "Desconectado"
-
-#: src/gnome_applet_mgr.c:411
-msgid "Font does not exist"
-msgstr "Ese tipo de texto no existe"
-
-#: src/gnome_applet_mgr.c:427
-msgid "About..."
-msgstr "Sobre..."
-
-#: src/gtkhtml.c:1383
-msgid "HTML Link:"
-msgstr "Dirección:"
-
-#: src/gtkhtml.c:1796
-msgid "Open URL in existing window"
-msgstr "Abrir dirección en ventana existente"
-
-#: src/gtkhtml.c:1805
-msgid "Open URL in new window"
-msgstr "Abrir dirección en nueva ventana"
-
-#: src/gtkhtml.c:1813
-msgid "Add URL as bookmark"
-msgstr "Agregar dirección como favorito"
-
-#: src/html.c:122 src/html.c:125
+msgid "Could not open config file %s."
+msgstr ""
+
+#: src/gaimrc.c:871
+#, fuzzy
+msgid "Preferences Error"
+msgstr "Preferencias"
+
+#: src/html.c:121 src/html.c:124
 msgid "g003: Error opening connection.\n"
 msgstr "Error abriendo enlaze. \n"
 
-#: src/html.c:158
+#: src/html.c:156
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "Recibiendo %d bytes de %s"
 
-#: src/html.c:171
+#: src/html.c:169
 msgid "Getting Data"
 msgstr "Recibiendo Data"
 
-#: src/html.c:204
+#: src/html.c:201
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "Recibido: '%s'\n"
 
-#: src/multi.c:367 src/prefs.c:112
+#: src/multi.c:345 src/prefs.c:114
 #, fuzzy
 msgid "General Options"
 msgstr "Opciones"
 
-#: src/multi.c:402
+#: src/multi.c:350
 #, fuzzy
 msgid "Screenname:"
 msgstr "Nomre de Usuario:"
 
-#: src/multi.c:414
+#: src/multi.c:359
 #, fuzzy
 msgid "Password:"
 msgstr "Contraseña: "
 
-#: src/multi.c:429
+#: src/multi.c:370
+msgid "Protocol:"
+msgstr ""
+
+#: src/multi.c:375
 msgid "Remember Password"
 msgstr "Acordarse de la Constraseña"
 
-#: src/multi.c:430
+#: src/multi.c:376
 #, fuzzy
 msgid "Auto-Login"
 msgstr "Auto-conectar"
 
-#: src/multi.c:431
+#: src/multi.c:377
 msgid "Send KeepAlive packet (6 bytes/second)"
 msgstr ""
 
-#: src/multi.c:473
+#: src/multi.c:442
 #, fuzzy
 msgid "Gaim - Modify Account"
 msgstr "Conectación - Gaim"
 
-#: src/multi.c:482
-msgid "Modify Account"
-msgstr ""
-
-#: src/multi.c:576
+#: src/multi.c:546
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contraseña Nueva"
 
-#: src/multi.c:669
+#: src/multi.c:641
 #, fuzzy
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Lista de aditivos"
 
-#: src/multi.c:678
-msgid "Account Editor"
-msgstr ""
-
-#: src/multi.c:697
+#: src/multi.c:662
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:701
+#: src/multi.c:666
 #, fuzzy
 msgid "Sign On/Off"
 msgstr "Desconectar"
 
-#: src/multi.c:705
+#: src/multi.c:670
 #, fuzzy
 msgid "Delete"
 msgstr "Seleccionar un Texto"
 
-#: src/multi.c:851
+#: src/multi.c:837
 #, c-format
 msgid "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:300 src/oscar.c:317 src/toc.c:280 src/toc.c:290 src/toc.c:347
+#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: src/oscar.c:308
+#: src/oscar.c:302
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "error de conección!\n"
 
-#: src/oscar.c:316
+#: src/oscar.c:310
 #, fuzzy
 msgid "major connection error\n"
 msgstr "error de conección!\n"
 
-#: src/oscar.c:330 src/toc.c:500
+#: src/oscar.c:323 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:331
+#: src/oscar.c:324
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Error"
 
-#: src/oscar.c:362
+#: src/oscar.c:334
+#, fuzzy
+msgid "Chat is currently unavailable"
+msgstr "Conversación en %s no esta disponible."
+
+#: src/oscar.c:335
+#, fuzzy
+msgid "Gaim - Chat"
+msgstr "Gaim Conversaciones"
+
+#: src/oscar.c:382
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Connectando %s\n"
 
-#: src/oscar.c:399
+#: src/oscar.c:420
 msgid "internal connection error\n"
 msgstr "error interno de conección\n"
 
-#: src/oscar.c:400
+#: src/oscar.c:421
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/oscar.c:405
+#: src/oscar.c:426
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "no se pudo resolver patrón\n"
 
-#: src/oscar.c:409
+#: src/oscar.c:430
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "no se pudo conectar al patrón\n"
 
-#: src/oscar.c:416
+#: src/oscar.c:437
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/oscar.c:426
+#: src/oscar.c:447
 msgid "Password sent, waiting for response\n"
 msgstr "Contraseña mandada, esperando respuesta\n"
 
-#: src/oscar.c:451
+#: src/oscar.c:474
 msgid "Signed off.\n"
 msgstr "Desconectado.\n"
 
 #. connecting too frequently
-#: src/oscar.c:466
+#: src/oscar.c:518
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1230,157 +1370,122 @@
 "intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
 
 #. client too old
-#: src/oscar.c:476
+#: src/oscar.c:528
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:480 src/toc.c:303
+#: src/oscar.c:532 src/toc.c:341
 msgid "Authentication Failed"
 msgstr "Autorización no optenida"
 
-#: src/oscar.c:513
+#: src/oscar.c:562
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/oscar.c:520
+#: src/oscar.c:566
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/oscar.c:551
+#: src/oscar.c:600
 msgid "Connection established, cookie sent"
 msgstr "Conección establesida, cookie enviado"
 
-#: src/oscar.c:787 src/oscar.c:1860
+#: src/oscar.c:843 src/oscar.c:2100
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
-#: src/oscar.c:862 src/rvous.c:333 src/rvous.c:470
-msgid "Gaim - File Transfer"
-msgstr "Gaim - Transferencia de archivos"
-
-#: src/oscar.c:866 src/rvous.c:454
-#, c-format
-msgid "Sending %s to %s"
-msgstr "Mandando %s a %s"
-
-#: src/oscar.c:898
-msgid "Error in transfer"
-msgstr ""
-
-#: src/oscar.c:959
-msgid "Transfer complete."
-msgstr ""
-
-#: src/oscar.c:1012
-#, fuzzy
-msgid "Error examining file"
-msgstr "Error leyendo el archivo %s"
-
-#: src/oscar.c:1012 src/oscar.c:1020 src/oscar.c:1043
-#, fuzzy
-msgid "GetFile Error"
-msgstr "Gaim - Error %d"
-
-#: src/oscar.c:1020
-msgid "Could not open temporary file, aborting"
-msgstr ""
-
-#: src/oscar.c:1043
-#, fuzzy
-msgid "Error connecting for transfer"
-msgstr "Error Connectando al encaje. \n"
-
-#: src/oscar.c:1065
-#, fuzzy
-msgid "Gaim - Send File..."
-msgstr "Gaim - Guardar Como..."
-
 #. message too large
-#: src/oscar.c:1194
+#: src/oscar.c:1293
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
 
-#: src/oscar.c:1195 src/oscar.c:1200 src/oscar.c:1222 src/oscar.c:1241
-#: src/oscar.c:1266
-#, fuzzy
-msgid "Gaim - Error"
-msgstr "Gaim - Error %d"
-
-#: src/oscar.c:1199
+#: src/oscar.c:1298
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1220
+#: src/oscar.c:1333
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1221 src/oscar.c:1240
+#: src/oscar.c:1334 src/oscar.c:1353
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1239
+#: src/oscar.c:1352
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1265
+#: src/oscar.c:1388
 #, c-format
-msgid "%s has no info/away message."
+msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1271
+#: src/oscar.c:1395
 msgid ""
-"Username : <B>%s</B>\n"
-"<BR>Warning Level : <B>%d %%</B>\n"
-"<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
+"Username : <B>%s</B>  %s <BR>\n"
+"Warning Level : <B>%d %%</B><BR>\n"
+"Online Since : <B>%s</B><BR>\n"
+"Idle Minutes : <B>%d</B>\n"
+"<BR>\n"
+"<HR><BR>\n"
+"%s<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
-"Nombre de usuario: <B>%s</B>\n"
-"<BR>Warning Level : <B>%d %%</B>\n"
-"<BR>En línea desde : <B>%s</B><BR>Minutos Desocupados : <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
-
-#: src/oscar.c:1305
+
+#: src/oscar.c:1430
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1306
+#: src/oscar.c:1431
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:1913
+#: src/oscar.c:2157
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s closed</B>"
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
-#: src/oscar.c:1958
+#: src/oscar.c:2216
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/oscar.c:1967 src/toc.c:970
-#, fuzzy
-msgid "Get Info"
-msgstr "Información de Usuario"
-
-#: src/oscar.c:1974
+#: src/oscar.c:2226
+#, c-format
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+
+#: src/oscar.c:2243
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Mensaje de ausencia"
 
-#: src/oscar.c:1982
+#: src/oscar.c:2251
 #, fuzzy
 msgid "Direct IM"
 msgstr "Información del Directorio"
 
+#: src/oscar.c:2443
+msgid ""
+"Unfortunately, currently Oscar only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
 #. Below is basically stolen from plugins.c
-#: src/perl.c:639
+#: src/perl.c:638
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Crear Información del Usuario"
@@ -1389,565 +1494,732 @@
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:104
+#: src/plugins.c:105
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista de aditivos"
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
+#: src/plugins.c:185 src/plugins.c:191 src/plugins.c:215
 msgid "Plugin Error"
 msgstr "Error de aditivo"
 
-#: src/plugins.c:262
+#: src/plugins.c:261
 msgid "Gaim - Plugins"
 msgstr "Gaim - Aditivos"
 
 #. Build the bottom button bar
-#: src/plugins.c:294
+#: src/plugins.c:290
 msgid "Load Plugin"
 msgstr "Usar Aditivo"
 
-#: src/plugins.c:301
+#: src/plugins.c:296
 msgid "Configure Plugin"
 msgstr "Configurar Aditivo"
 
-#: src/plugins.c:307
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr "Desocupar Aditivo"
 
-#: src/prefs.c:120 src/prefs.c:180 src/prefs.c:227 src/prefs.c:339
-#: src/prefs.c:425 src/prefs.c:814 src/prefs.c:900 src/prefs.c:1043
-#: src/prefs.c:1408 src/prefs.c:1649
+#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
+#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
+#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1761
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#.
-#. prefrem = gaim_button(_("Remember password"), &general_options, OPT_GEN_REMEMBER_PASS, box);
-#. gtk_signal_connect(GTK_OBJECT(prefrem), "destroy", GTK_SIGNAL_FUNC(remdes), 0);
-#. gaim_button(_("Auto-login"), &general_options, OPT_GEN_AUTO_LOGIN, box);
-#.
-#. sep = gtk_hseparator_new();
-#. gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-#. gtk_widget_show(sep);
-#.
-#: src/prefs.c:134
+#: src/prefs.c:126
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:135
+#: src/prefs.c:128
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:138
+#: src/prefs.c:132
 msgid "Show Debug Window"
 msgstr ""
 
+#: src/prefs.c:144
+#, fuzzy
+msgid "Report Idle Times:"
+msgstr "Demostrar el tiempo de inactividad de los amigos"
+
+#: src/prefs.c:147
+msgid "None"
+msgstr ""
+
+#: src/prefs.c:148
+msgid "GAIM Use"
+msgstr "GAIM Usar"
+
 #: src/prefs.c:150
 #, fuzzy
-msgid "Report Idle Times:"
-msgstr "Demostrar el tiempo de inactividad de los amigos"
-
-#: src/prefs.c:153
-msgid "None"
-msgstr ""
-
-#: src/prefs.c:154
-msgid "GAIM Use"
-msgstr "GAIM Usar"
-
-#: src/prefs.c:156
-#, fuzzy
 msgid "X Use"
 msgstr "GAIM Usar"
 
-#: src/prefs.c:172
+#: src/prefs.c:224
+#, fuzzy
+msgid "Browser Options"
+msgstr "Opciones"
+
+#: src/prefs.c:236
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/prefs.c:237
+msgid "KFM"
+msgstr ""
+
+#: src/prefs.c:239
+msgid "GNOME URL Handler"
+msgstr ""
+
+#: src/prefs.c:241
+msgid "Manual"
+msgstr "Manual"
+
+#: src/prefs.c:252
+msgid "Pop up new window by default"
+msgstr "Crear una nueva ventana por omisión"
+
+#: src/prefs.c:279
+#, fuzzy
+msgid "Logging Options"
+msgstr "Connectando %s\n"
+
+#: src/prefs.c:291
+#, fuzzy
+msgid "Log all conversations"
+msgstr "Guarde todas las conversaciones"
+
+#: src/prefs.c:292
+#, fuzzy
+msgid "Strip HTML from logs"
+msgstr "Quitar HTML de todas las conversaciones guardadas"
+
+#: src/prefs.c:298
+msgid "Log when buddies sign on/sign off"
+msgstr ""
+
+#: src/prefs.c:299
+msgid "Log when buddies become idle/un-idle"
+msgstr ""
+
+#: src/prefs.c:300
+msgid "Log when buddies go away/come back"
+msgstr ""
+
+#: src/prefs.c:301
+msgid "Log your own signons/idleness/awayness (as set by options above)"
+msgstr ""
+
+#: src/prefs.c:302
+msgid "Individual log file for each buddy's signons"
+msgstr ""
+
+#: src/prefs.c:317
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Lista de Amigos"
 
-#: src/prefs.c:184
-msgid "Show numbers in groups"
-msgstr "Demostrar los numeros en grupos"
-
-#: src/prefs.c:185
+#: src/prefs.c:329
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "Guardar algunas configuraciones de tamaño/posicion de ventanas"
+
+#: src/prefs.c:331
+#, fuzzy
+msgid "Automatically show buddy list on sign on"
+msgstr "Automaticamente demuestre la lista de amigos"
+
+#: src/prefs.c:333
+#, fuzzy
+msgid "Display Buddy List near applet"
+msgstr "Lista de amigos se demuestra cerca del applet"
+
+#: src/prefs.c:340
 msgid "Hide groups with no online buddies"
 msgstr ""
 
-#: src/prefs.c:186
-msgid "Show idle times"
-msgstr "Demostrar el tiempo de inactividad de los amigos"
-
-#: src/prefs.c:187
+#: src/prefs.c:341
+msgid "Show numbers in groups"
+msgstr "Demostrar los numeros en grupos"
+
+#: src/prefs.c:347
 #, fuzzy
 msgid "Show buddy type icons"
 msgstr "Demostrar dibujos de los tipos de amigos"
 
-#: src/prefs.c:193
+#: src/prefs.c:348
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:349
+msgid "Show idle times"
+msgstr "Demostrar el tiempo de inactividad de los amigos"
+
+#: src/prefs.c:355
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
-#: src/prefs.c:194
+#: src/prefs.c:356
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:200
-#, fuzzy
-msgid "Save Window Size/Position"
-msgstr "Guardar algunas configuraciones de tamaño/posicion de ventanas"
-
-#: src/prefs.c:202
-#, fuzzy
-msgid "Automatically show buddy list on sign on"
-msgstr "Automaticamente demuestre la lista de amigos"
-
-#: src/prefs.c:203
-#, fuzzy
-msgid "Display Buddy List near applet"
-msgstr "Lista de amigos se demuestra cerca del applet"
-
-#: src/prefs.c:219
+#: src/prefs.c:371
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:231
+#: src/prefs.c:383
 msgid "Enter sends message"
 msgstr "Enter manda el mensaje"
 
-#: src/prefs.c:232
+#: src/prefs.c:384
+#, fuzzy
+msgid "Control-Enter sends message"
+msgstr "Enter manda el mensaje"
+
+#: src/prefs.c:385
+msgid "Escape closes window"
+msgstr ""
+
+#: src/prefs.c:386
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:233
+#: src/prefs.c:387
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:239
+#: src/prefs.c:388
+msgid "F2 toggles timestamp display"
+msgstr ""
+
+#: src/prefs.c:394
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "Demostrar caritas gráficas (experimental)"
 
-#: src/prefs.c:240
+#: src/prefs.c:395
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "Demostrar la hora de los mensajes"
 
-#: src/prefs.c:241
+#: src/prefs.c:396
 #, fuzzy
-msgid "Ignore incoming colors"
+msgid "Ignore colors"
 msgstr "Ignorar los colores de los amigos"
 
-#: src/prefs.c:242
-msgid "Ignore white backgrounds"
-msgstr ""
-
-#: src/prefs.c:248
+#: src/prefs.c:397
 #, fuzzy
-msgid "Log all conversations"
-msgstr "Guarde todas las conversaciones"
-
-#: src/prefs.c:249
+msgid "Ignore font faces"
+msgstr "Hacer el texto mas grande "
+
+#: src/prefs.c:398
 #, fuzzy
-msgid "Strip HTML from logs"
-msgstr "Quitar HTML de todas las conversaciones guardadas"
-
-#: src/prefs.c:255
+msgid "Ignore font sizes"
+msgstr "Hacer el texto mas grande "
+
+#: src/prefs.c:404
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Automagicamente destaque las faltas de ortografía"
 
-#: src/prefs.c:256
+#: src/prefs.c:405
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "Mandar direcciones como enlaze"
 
-#: src/prefs.c:257
+#: src/prefs.c:406
 msgid "Sending messages removes away status"
 msgstr "Mandando un mensaje quita el estado de ausente"
 
-#: src/prefs.c:298 src/prefs.c:386
+#: src/prefs.c:447 src/prefs.c:540
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:303 src/prefs.c:391
+#: src/prefs.c:453 src/prefs.c:546
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:308 src/prefs.c:396
+#: src/prefs.c:459 src/prefs.c:552
 #, fuzzy
 msgid "Text Only"
 msgstr "Color del texto"
 
-#: src/prefs.c:331
+#: src/prefs.c:483
 #, fuzzy
 msgid "IM Options"
 msgstr "Opciones"
 
-#: src/prefs.c:343
+#: src/prefs.c:495
+#, fuzzy
+msgid "Show all conversations in one tabbed window"
+msgstr ""
+"Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
+"conversaciones"
+
+#: src/prefs.c:496
 #, fuzzy
 msgid "Show logins in window"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:349 src/prefs.c:435
+#: src/prefs.c:502 src/prefs.c:593
 #, fuzzy
 msgid "Show buttons as "
 msgstr "Demostrar los dibujos en los botonoes"
 
-#: src/prefs.c:358 src/prefs.c:445
+#: src/prefs.c:511 src/prefs.c:603
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:359 src/prefs.c:446
+#: src/prefs.c:513 src/prefs.c:605
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Alzar ventanas cuando un mensaje sea recibido"
 
-#: src/prefs.c:360
+#: src/prefs.c:514
 msgid "Ignore new conversations when away"
 msgstr "Ignorar nuevas conversaciones mientras este ausente"
 
-#: src/prefs.c:361
+#: src/prefs.c:516
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "Crear Mensaje"
 
-#: src/prefs.c:417 src/prefs.c:620
+#: src/prefs.c:574
 #, fuzzy
 msgid "Chat Options"
 msgstr "Opciones"
 
-#: src/prefs.c:429
+#: src/prefs.c:586
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
+#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
 msgid "Gaim Chat"
 msgstr "Gaim Conversaciones"
 
-#: src/prefs.c:638
+#: src/prefs.c:779 src/prefs.c:2234
+msgid "Chat Rooms"
+msgstr ""
+
+#: src/prefs.c:797
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/prefs.c:666
+#: src/prefs.c:822
 msgid "List of available chats"
 msgstr "Lista de conversaciones disponibles"
 
-#: src/prefs.c:680
+#: src/prefs.c:832
 msgid "List of subscribed chats"
 msgstr "Lista de conversaciones subscritas"
 
-#: src/prefs.c:806 src/prefs.c:2084
+#: src/prefs.c:962 src/prefs.c:2239
 #, fuzzy
 msgid "Font Options"
 msgstr "Opciones"
 
-#: src/prefs.c:820
+#: src/prefs.c:976
 msgid "Underlined Text"
 msgstr "Texto Subrayado"
 
-#: src/prefs.c:821
+#: src/prefs.c:977
 msgid "Strike Text"
 msgstr "Texto cruzado por una linea"
 
-#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
+#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
 #, fuzzy
 msgid "Select"
 msgstr "Seleccionar un Texto"
 
-#: src/prefs.c:869
+#: src/prefs.c:1027
 msgid "Font Face for Text"
 msgstr "Tipo de texto"
 
-#: src/prefs.c:892
+#: src/prefs.c:1042
+#, fuzzy
+msgid "Font Size for Text"
+msgstr "Tipo de texto"
+
+#: src/prefs.c:1067
 #, fuzzy
 msgid "Sound Options"
 msgstr "Opciones"
 
-#: src/prefs.c:904
+#: src/prefs.c:1079
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:905 src/prefs.c:1296
+#: src/prefs.c:1080 src/prefs.c:1511
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:906
+#: src/prefs.c:1081
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:968
+#: src/prefs.c:1146
 #, fuzzy
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/prefs.c:1002
+#: src/prefs.c:1181
 #, fuzzy
 msgid "Reset"
 msgstr "Registrar"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1186
 #, fuzzy
-msgid "Choose"
+msgid "Choose..."
 msgstr "Cerrar"
 
-#: src/prefs.c:1035
+#: src/prefs.c:1222
 #, fuzzy
 msgid "Sound Events"
 msgstr "Sonidos"
 
-#: src/prefs.c:1047
+#: src/prefs.c:1234
 msgid "Sound when buddy logs in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:1048
+#: src/prefs.c:1235
 msgid "Sound when buddy logs out"
 msgstr "Sonido cuando un amigo se desconecte"
 
-#: src/prefs.c:1054
+#: src/prefs.c:1241
 msgid "Sound when message is received"
 msgstr "Sonido cuando un mensaje es recibido"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1242
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "Sonido cuando un mensaje es recibido"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1243
 msgid "Sound when message is sent"
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1249
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "Sonidos en conversaciones cuando gente entra o sale"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1250
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "Sonidos en conversaciones cuando gente entra o sale"
 
-#: src/prefs.c:1064
+#: src/prefs.c:1251
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "Sonidos en conversaciones cuando getne habla"
 
-#: src/prefs.c:1065
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "Sonidos en conversaciones cuando getne habla"
 
-#: src/prefs.c:1197 src/prefs.c:2111
+#: src/prefs.c:1262
+#, c-format
+msgid "Command to play sound files (%s for filename; internal if empty)"
+msgstr ""
+
+#: src/prefs.c:1408 src/prefs.c:2266
 #, fuzzy
 msgid "Away Messages"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/prefs.c:1209
+#: src/prefs.c:1420
 #, fuzzy
 msgid "Title"
 msgstr "Archivo"
 
-#: src/prefs.c:1213
+#: src/prefs.c:1424
 #, fuzzy
 msgid "Message"
 msgstr "Crear Mensaje"
 
-#: src/prefs.c:1253
+#: src/prefs.c:1464
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1257
+#: src/prefs.c:1468
 #, fuzzy
 msgid "Make Away"
 msgstr "Hacerme ausente ahora"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1509
 #, fuzzy
 msgid "Ignore new conversations when away   "
 msgstr "Ignorar nuevas conversaciones mientras este ausente"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1521
 msgid "Auto Away after"
 msgstr ""
 
-#: src/prefs.c:1318
+#: src/prefs.c:1534
 msgid "minutes using"
 msgstr ""
 
-#: src/prefs.c:1400
-#, fuzzy
-msgid "Browser Options"
-msgstr "Opciones"
-
-#: src/prefs.c:1412
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:1413
-msgid "KFM"
-msgstr ""
-
-#: src/prefs.c:1415
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:1417
-msgid "Manual"
-msgstr "Manual"
-
-#: src/prefs.c:1426
-msgid "Pop up new window by default"
-msgstr "Crear una nueva ventana por omisión"
-
-#: src/prefs.c:1641
+#: src/prefs.c:1753
 #, fuzzy
 msgid "Privacy Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1769
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1677
+#: src/prefs.c:1788
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1678
+#: src/prefs.c:1789
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1680
+#: src/prefs.c:1791
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1712
+#: src/prefs.c:1822
 #, fuzzy
 msgid "Deny all users"
 msgstr "Negar algunos"
 
-#: src/prefs.c:1713
+#: src/prefs.c:1823
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1715
+#: src/prefs.c:1825
 #, fuzzy
 msgid "Block List"
 msgstr "Bloquear"
 
-#: src/prefs.c:1791
+#: src/prefs.c:1920
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
-#: src/prefs.c:1877
+#: src/prefs.c:2000
 msgid "GAIM debug output window"
 msgstr "GAIM ventana de respuestas del programa"
 
-#: src/prefs.c:2040
+#: src/prefs.c:2185
 msgid "General"
 msgstr "General"
 
-#: src/prefs.c:2064
+#: src/prefs.c:2190
+msgid "Browser"
+msgstr "Navegador"
+
+#: src/prefs.c:2219
 #, fuzzy
 msgid "Conversations"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:2069
+#: src/prefs.c:2224
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2074
+#: src/prefs.c:2229
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2079
-msgid "Chat Rooms"
-msgstr ""
-
-#: src/prefs.c:2095
+#: src/prefs.c:2250
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/prefs.c:2122
-msgid "Browser"
-msgstr "Navegador"
-
-#: src/prefs.c:2133
+#: src/prefs.c:2255
+msgid "Events"
+msgstr ""
+
+#: src/prefs.c:2277
 msgid "Privacy"
 msgstr ""
 
-#: src/rvous.c:148
-msgid "Gaim - Save As..."
-msgstr "Gaim - Guardar Como..."
-
-#: src/rvous.c:317
+#: src/prpl.c:73
+msgid ""
+"You have attempted to load a protocol which was not compiled from the same "
+"version of the source as this application was. Unfortunately, because it is "
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
+msgstr ""
+
+#: src/prpl.c:77
+#, fuzzy
+msgid "Protocol Error"
+msgstr "Error de aditivo"
+
+#: src/prpl.c:97
 #, c-format
-msgid "Receiving %s from %s"
-msgstr "Recibiendo %s de %s"
-
-#: src/rvous.c:693
+msgid "%s was using %s, which got removed. %s is now offline."
+msgstr ""
+
+#: src/prpl.c:100
+#, fuzzy
+msgid "Disconnect"
+msgstr "Desconectado."
+
+#: src/prpl.c:140
+#, fuzzy
+msgid "Accept?"
+msgstr "Aceptar"
+
+#: src/prpl.c:160 src/prpl.c:231
 msgid "Accept"
 msgstr "Aceptar"
 
-#: src/rvous.c:720
-#, c-format
-msgid "%s requests you to accept the file: %s (%d bytes)"
-msgstr "%s le pide que acepte el archivo: %s (%d bytes)"
-
-#: src/rvous.c:723
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s le pide que les mande un archivo"
-
-#: src/rvous.c:733
-msgid "Gaim - File Transfer?"
-msgstr "¿Gaim - Transferir Archivos?"
-
-#: src/server.c:581
+#: src/prpl.c:204
+#, fuzzy
+msgid "Gaim - Prompt"
+msgstr "Gaim - Agregar Autorizar/Negar"
+
+#: src/prpl.c:299
+#, fuzzy
+msgid "Gaim - New User Registration"
+msgstr "Gaim - Guardar Conversación"
+
+#: src/prpl.c:308
+msgid "New User Registration"
+msgstr ""
+
+#: src/prpl.c:320
+msgid "Register new user for"
+msgstr ""
+
+#: src/server.c:608
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:582
+#: src/server.c:609
 msgid "No"
 msgstr ""
 
-#: src/toc.c:253 src/toc.c:260
+#: src/toc.c:290 src/toc.c:297
 #, fuzzy
 msgid "Connection Closed"
 msgstr "Connección"
 
-#: src/toc.c:295
+#: src/toc.c:332
 msgid "Waiting for reply..."
 msgstr ""
 
-#: src/toc.c:354
+#: src/toc.c:391
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/toc.c:355
+#: src/toc.c:392
 msgid "TOC Resume"
 msgstr ""
 
-#: src/toc.c:515
+#: src/toc.c:560
 #, fuzzy
 msgid "Password Change Successeful"
 msgstr "Gaim - Cambiar Contraseña"
 
-#: src/toc.c:518
+#: src/toc.c:563
 msgid ""
 "TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
 
-#: src/toc.c:521
+#: src/toc.c:566
 msgid "TOC Pause"
 msgstr ""
 
-#: src/toc.c:977
+#: src/toc.c:923
 #, fuzzy
 msgid "Get Dir Info"
 msgstr "Información del Directorio"
 
+#: src/toc.c:1190
+msgid ""
+"Unfortunately, currently TOC only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
+#: src/toc.c:1499 src/toc.c:1676
+#, fuzzy
+msgid "Could not connect for transfer!"
+msgstr "Error Connectando al encaje. \n"
+
+#: src/toc.c:1706
+msgid "Could not write file header!"
+msgstr ""
+
+#: src/toc.c:1741
+msgid "Gaim - Save As..."
+msgstr "Gaim - Guardar Como..."
+
+#: src/toc.c:1780
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
+msgstr "%s le pide que acepte el archivo: %s (%d bytes)"
+
+#: src/toc.c:1785
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr "%s le pide que les mande un archivo"
+
+#, fuzzy
+#~ msgid "Change password for:"
+#~ msgstr "Cambiar Contraseña"
+
+#, fuzzy
+#~ msgid "Make Away Now"
+#~ msgstr "Hacerme ausente ahora"
+
+#~ msgid "GAIM"
+#~ msgstr "GAIM"
+
+#~ msgid "HTML Link:"
+#~ msgstr "Dirección:"
+
+#~ msgid "Open URL in existing window"
+#~ msgstr "Abrir dirección en ventana existente"
+
+#~ msgid "Open URL in new window"
+#~ msgstr "Abrir dirección en nueva ventana"
+
+#~ msgid "Add URL as bookmark"
+#~ msgstr "Agregar dirección como favorito"
+
+#~ msgid "Gaim - File Transfer"
+#~ msgstr "Gaim - Transferencia de archivos"
+
+#~ msgid "Sending %s to %s"
+#~ msgstr "Mandando %s a %s"
+
+#, fuzzy
+#~ msgid "Error examining file"
+#~ msgstr "Error leyendo el archivo %s"
+
+#, fuzzy
+#~ msgid "GetFile Error"
+#~ msgstr "Gaim - Error %d"
+
+#~ msgid ""
+#~ "Username : <B>%s</B>\n"
+#~ "<BR>Warning Level : <B>%d %%</B>\n"
+#~ "<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
+#~ "<BR><HR><BR>%s\n"
+#~ msgstr ""
+#~ "Nombre de usuario: <B>%s</B>\n"
+#~ "<BR>Warning Level : <B>%d %%</B>\n"
+#~ "<BR>En línea desde : <B>%s</B><BR>Minutos Desocupados : <B>%d</B>\n"
+#~ "<BR><HR><BR>%s\n"
+
+#~ msgid "Receiving %s from %s"
+#~ msgstr "Recibiendo %s de %s"
+
+#~ msgid "Gaim - File Transfer?"
+#~ msgstr "¿Gaim - Transferir Archivos?"
+
 #~ msgid "You must give your password"
 #~ msgstr "Tiene que introduzir su contraseña"
 
@@ -2055,9 +2327,6 @@
 #~ msgid "Remove buddy from permit/deny"
 #~ msgstr "Quitar amigo de autorizar/negar"
 
-#~ msgid "Ok"
-#~ msgstr "OK"
-
 #~ msgid "Idle"
 #~ msgstr "Desocupado"
 
--- a/po/fr.po	Fri Mar 23 17:34:03 2001 +0000
+++ b/po/fr.po	Fri Mar 23 18:01:53 2001 +0000
@@ -2,24 +2,72 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/gnome_applet_mgr.c:256
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2000-12-03 23:24-0800\n"
+"POT-Creation-Date: 2001-03-23 09:31-0800\n"
 "PO-Revision-Date: 2000-06-13 22:26-0700\n"
 "Last-Translator: Seb Carpe\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: src/about.c:72
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#, fuzzy
+msgid "Get Info"
+msgstr "Message d'Information"
+
+#: plugins/yay/yay.c:169
+#, fuzzy
+msgid "Your message did not get sent."
+msgstr "Son à l'envoi d'un message"
+
+#: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
+#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
+#: src/oscar.c:1390
+#, fuzzy
+msgid "Gaim - Error"
+msgstr "Gaim - Erreur %d"
+
+#: plugins/yay/yay.c:187
+#, c-format
+msgid "%s has made %s their buddy%s%s"
+msgstr ""
+
+#: plugins/yay/yay.c:189
+#, fuzzy
+msgid "Gaim - Buddy"
+msgstr "GAIM - Ajouter un Pote"
+
+#: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
+#: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
+#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
+msgid "Close"
+msgstr "Fermer"
+
+#: plugins/napster.c:1060
+msgid "Napster registration is currently under development"
+msgstr ""
+
+#: src/about.c:77
 #, c-format
 msgid "About GAIM v%s"
 msgstr "A propos de GAIM v%s"
 
-#: src/aim.c:133 src/buddy.c:2100
+#: src/about.c:114
+msgid ""
+"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"written using Gtk+ and is licensed under the GPL.\n"
+"URL: http://www.marko.net/gaim/"
+msgstr ""
+
+#: src/about.c:189
+msgid "Web Site"
+msgstr ""
+
+#: src/aim.c:135 src/buddy.c:2295
 msgid "Signoff"
 msgstr "Deconnection"
 
@@ -27,7 +75,7 @@
 msgid "Please enter your logon"
 msgstr "Entrez votre login"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#: src/aim.c:147 src/aim.c:152 src/multi.c:838
 #, fuzzy
 msgid "Signon Error"
 msgstr "Connection"
@@ -37,654 +85,743 @@
 msgid "Please enter your password"
 msgstr "Entrez votre login"
 
-#: src/aim.c:254 src/multi.c:608
-msgid "Signon"
-msgstr "Connection"
-
-#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+#: src/aim.c:246
+msgid "Gaim - Login"
+msgstr "Gaim - Connection"
+
+#: src/aim.c:264
+msgid "Screen Name: "
+msgstr "Pseudonyme: "
+
+#: src/aim.c:278
+msgid "Password: "
+msgstr "Mot de Passe: "
+
+#: src/aim.c:299 src/buddy.c:2299
+msgid "Quit"
+msgstr "Quitter"
+
+#: src/aim.c:304 src/aim.c:641 src/buddy.c:2358
 msgid "Accounts"
 msgstr ""
 
-#. Build OK Button
-#: src/aim.c:258 src/buddy_chat.c:202 src/buddy_chat.c:243 src/dialogs.c:347
-#: src/dialogs.c:666 src/dialogs.c:741 src/dialogs.c:892 src/dialogs.c:1029
-#: src/dialogs.c:1167 src/dialogs.c:1360 src/dialogs.c:1654 src/dialogs.c:1739
-#: src/dialogs.c:1953 src/dialogs.c:2141 src/dialogs.c:2305 src/dialogs.c:2397
-#: src/dialogs.c:3176 src/dialogs.c:3435 src/multi.c:494 src/multi.c:604
-#: src/multi.c:835 src/oscar.c:879 src/rvous.c:327 src/rvous.c:464
-#: src/rvous.c:696
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/aim.c:259
+#: src/aim.c:306 src/multi.c:578
+msgid "Signon"
+msgstr "Connection"
+
+#: src/aim.c:338 src/prpl.c:359
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: src/aim.c:260
+#: src/aim.c:339
 msgid "Options"
 msgstr "Options"
 
-#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
+#: src/aim.c:341 src/aim.c:644 src/buddy.c:2375
 msgid "Plugins"
 msgstr "Plugins"
 
-#. Labels for selectors and text boxes
-#: src/aim.c:338
-msgid "Screen Name: "
-msgstr "Pseudonyme: "
-
-#: src/aim.c:341
-msgid "Password: "
-msgstr "Mot de Passe: "
-
-#: src/aim.c:380
-msgid "Gaim - Login"
-msgstr "Gaim - Connection"
-
-#: src/aim.c:599 src/buddy.c:2163
+#: src/aim.c:638 src/buddy.c:2367
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/away.c:110 src/away.c:227
-msgid "Back"
-msgstr "De retour"
-
-#: src/away.c:121
+#: src/applet.c:89
+#, c-format
+msgid "file not found: %s\n"
+msgstr "Fichier non trouvé: %s\n"
+
+#: src/applet.c:113
+msgid "Attempting to sign on...."
+msgstr "Tentative de connection"
+
+#: src/applet.c:119
+msgid "Offilne. Click to bring up login box."
+msgstr "Déconnecté. Cliquer pour obtenir la fenêtre de connection."
+
+#: src/applet.c:136 src/applet.c:174 src/buddy.c:2313
+msgid "Away"
+msgstr "Absent"
+
+#: src/applet.c:177 src/away.c:266
+msgid "New Away Message"
+msgstr "Nouveau Message d'absence"
+
+#: src/applet.c:317
+msgid "Can't create GAIM applet!"
+msgstr "Impossible de créer l'applet GAIM"
+
+#: src/applet.c:348
+msgid "Offline"
+msgstr "Hors Ligne"
+
+#: src/applet.c:362
+msgid "Font does not exist"
+msgstr "Cette fonte n'existe pas."
+
+#: src/applet.c:377
+msgid "About..."
+msgstr "A Propos..."
+
+#: src/away.c:96
 msgid "I'm Back!"
 msgstr "Je suis de Retour!!"
 
-#: src/away.c:160
+#: src/away.c:133
 msgid "Gaim - Away!"
 msgstr "Gaim - Absent!"
 
-#: src/away.c:266 src/gnome_applet_mgr.c:200
-msgid "New Away Message"
-msgstr "Nouveau Message d'absence"
-
-#: src/away.c:284
+#: src/away.c:147 src/away.c:228 src/away.c:393
+msgid "Back"
+msgstr "De retour"
+
+#: src/away.c:286
 msgid "Remove Away Message"
 msgstr "Enlever le message d'absence"
 
+#: src/away.c:462
+msgid "Set All Away"
+msgstr ""
+
 #. Put the buttons in the box
-#: src/buddy.c:239 src/buddy.c:2234 src/buddy_chat.c:845
-#: src/conversation.c:1641 src/conversation.c:1740 src/dialogs.c:890
-#: src/dialogs.c:1023 src/dialogs.c:1964 src/multi.c:693 src/prefs.c:639
-#: src/prefs.c:1249 src/prefs.c:1700 src/prefs.c:1735
+#: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
+#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
+#: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
+#: src/buddy.c:246 src/buddy.c:2444 src/dialogs.c:878 src/dialogs.c:974
 msgid "Group"
 msgstr "Groupe"
 
-#: src/buddy.c:241 src/buddy.c:2236 src/buddy_chat.c:847
-#: src/conversation.c:1639 src/conversation.c:1738 src/prefs.c:640
-#: src/prefs.c:1261 src/prefs.c:1704 src/prefs.c:1739
+#: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
+#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
+#: src/buddy.c:250 src/buddy.c:1830 src/buddy.c:2186
 msgid "Chat"
 msgstr "Forum"
 
-#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
+#: src/buddy.c:251 src/buddy.c:443 src/buddy.c:2184 src/buddy_chat.c:474
+#: src/buddy_chat.c:804
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:246 src/buddy.c:2002 src/buddy_chat.c:564 src/buddy_chat.c:853
-#: src/conversation.c:1734 src/rvous.c:694
+#: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
+#: src/buddy_chat.c:1025 src/conversation.c:2073
 msgid "Info"
 msgstr "Info"
 
 #. Put the buttons in the box
-#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
+#: src/buddy.c:449 src/buddy.c:554 src/dialogs.c:968 src/dialogs.c:3395
+#: src/dialogs.c:3410 src/dialogs.c:3487 src/dialogs.c:3502
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:425
+#: src/buddy.c:455 src/buddy.c:568
 msgid "Add Buddy Pounce"
 msgstr "Ajouter une Alerte"
 
-#: src/buddy.c:1368
+#: src/buddy.c:461 src/buddy.c:574
+msgid "View Log"
+msgstr ""
+
+#: src/buddy.c:561
+msgid "Un-Alias"
+msgstr ""
+
+#: src/buddy.c:1512
 msgid "New Buddy Pounce"
 msgstr "Nouvelle Alerte"
 
-#: src/buddy.c:1386
+#: src/buddy.c:1530
 msgid "Remove Buddy Pounce"
 msgstr "Enlever une Alerte"
 
-#: src/buddy.c:1675
+#: src/buddy.c:1821
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "Alerte"
 
-#: src/buddy.c:1678
+#: src/buddy.c:1824
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1681
+#: src/buddy.c:1827
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1687
+#: src/buddy.c:1833
 #, fuzzy
 msgid "Get File"
 msgstr "Fichier"
 
-#: src/buddy.c:1690
+#: src/buddy.c:1836
 #, fuzzy
 msgid "Send File"
 msgstr "Fichier"
 
-#: src/buddy.c:1749
+#: src/buddy.c:1839
+msgid "Games"
+msgstr ""
+
+#: src/buddy.c:1842
+msgid "Stocks"
+msgstr ""
+
+#: src/buddy.c:1894
+#, fuzzy, c-format
+msgid "Logged in: %s\n"
+msgstr "Connection de %s.\n"
+
+#: src/buddy.c:1905
 msgid "Warnings: %d%%\n"
 msgstr "Attention: %d%%\n"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1917
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1758
+#: src/buddy.c:1921
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
 "Screen Name: %s\n"
-"Logged in: %s\n"
-"%s%s%s%s%s"
+"%s%s%s%s%s%s"
 msgstr ""
 "Nom: %s                \n"
 "Connecté depuis: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1761
+#: src/buddy.c:1925
 msgid "Idle: "
 msgstr "Inactif: "
 
-#: src/buddy.c:1828
+#: src/buddy.c:1995
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s s'est connecté%s%s.</B><BR><HR>"
 
-#: src/buddy.c:1878
+#: src/buddy.c:2047
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "HR><B>%s s'est déconnecté%s%s.</B><BR><HR>"
 
-#: src/buddy.c:2028
+#: src/buddy.c:2211
 msgid "Information on selected Buddy"
 msgstr "Information sur le pote sélectionné"
 
-#: src/buddy.c:2029 src/dialogs.c:657
+#: src/buddy.c:2212 src/dialogs.c:663
 msgid "Send Instant Message"
 msgstr "Envoyer un message"
 
-#: src/buddy.c:2030
+#: src/buddy.c:2213
 msgid "Start/join a Buddy Chat"
 msgstr "Ouvrir/Rallier un Forum"
 
-#: src/buddy.c:2088
+#: src/buddy.c:2277
 msgid "File"
 msgstr "Fichier"
 
-#: src/buddy.c:2092 src/buddy.c:2093
+#: src/buddy.c:2281
 msgid "Add A Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/buddy.c:2094
+#: src/buddy.c:2283
 #, fuzzy
 msgid "Join A Chat"
 msgstr "Rallier le forum"
 
-#: src/buddy.c:2095
+#: src/buddy.c:2285
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Envoyer un message"
 
-#: src/buddy.c:2097
+#: src/buddy.c:2290
 msgid "Import Buddy List"
 msgstr "Importer une Liste de Potes"
 
-#: src/buddy.c:2098
+#: src/buddy.c:2292
 msgid "Export Buddy List"
 msgstr "Exporter une Liste de Potes"
 
-#: src/buddy.c:2103
-msgid "Quit"
-msgstr "Quitter"
-
-#: src/buddy.c:2105 src/buddy_chat.c:556 src/buddy_chat.c:818
-#: src/buddy_chat.c:841 src/conversation.c:1736 src/dialogs.c:425
-#: src/multi.c:709 src/plugins.c:314 src/prefs.c:1844
-msgid "Close"
-msgstr "Fermer"
-
-#: src/buddy.c:2110
+#: src/buddy.c:2308
 msgid "Tools"
 msgstr "Outils"
 
-#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
-msgid "Away"
-msgstr "Absent"
-
-#: src/buddy.c:2120
+#: src/buddy.c:2318
 msgid "Buddy Pounce"
 msgstr "Alerte"
 
-#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
+#: src/buddy.c:2327 src/dialogs.c:2039 src/dialogs.c:2206
 msgid "Search for Buddy"
 msgstr "Rechercher un Pote"
 
-#: src/buddy.c:2131
+#: src/buddy.c:2330
 msgid "by Email"
 msgstr "Par son Email"
 
-#: src/buddy.c:2135
+#: src/buddy.c:2334
 msgid "by Dir Info"
 msgstr "Par ses Informations Personnelles"
 
-#: src/buddy.c:2142 src/buddy.c:2143
+#: src/buddy.c:2341 src/buddy.c:2342
 msgid "Settings"
 msgstr "Préférences"
 
-#: src/buddy.c:2146
+#: src/buddy.c:2345
 msgid "User Info"
 msgstr "Message d'Information"
 
-#: src/buddy.c:2150 src/dialogs.c:1353
+#: src/buddy.c:2349 src/dialogs.c:1326
 msgid "Directory Info"
 msgstr "Information Personnelle"
 
-#: src/buddy.c:2154 src/dialogs.c:1592
+#: src/buddy.c:2353 src/dialogs.c:1517
 msgid "Change Password"
 msgstr "Changer de Mot de Passe"
 
-#: src/buddy.c:2171
+#: src/buddy.c:2362
+#, fuzzy
+msgid "Protocol Actions"
+msgstr "Options"
+
+#: src/buddy.c:2369
+msgid "View System Log"
+msgstr ""
+
+#: src/buddy.c:2380
 #, fuzzy
 msgid "Perl"
 msgstr "Autoriser"
 
-#: src/buddy.c:2174
+#: src/buddy.c:2383
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2178
+#: src/buddy.c:2387
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2182
+#: src/buddy.c:2391
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2190
+#: src/buddy.c:2399
 msgid "Help"
 msgstr "Aide"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2404
 #, fuzzy
 msgid "About Gaim"
 msgstr "A propos..."
 
-#: src/buddy.c:2214 src/prefs.c:2053
+#: src/buddy.c:2423 src/prefs.c:2208
 msgid "Buddy List"
 msgstr "Liste de Potes"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2477
 msgid "Add a new Buddy"
 msgstr "Ajouter un Nouveau Pote"
 
-#: src/buddy.c:2267
+#: src/buddy.c:2478
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Ajouter un Nouveau Pote"
 
-#: src/buddy.c:2268
+#: src/buddy.c:2479
 msgid "Remove selected Buddy"
 msgstr "Supprimer le Pote sélectionné"
 
-#: src/buddy.c:2293
+#: src/buddy.c:2504
 msgid "Online"
 msgstr "En Ligne"
 
-#: src/buddy.c:2295
+#: src/buddy.c:2506
 msgid "Edit Buddies"
 msgstr "Editer ses amis"
 
-#: src/buddy.c:2332
+#: src/buddy.c:2543
 msgid "Gaim - Buddy List"
 msgstr "GAIM - Liste des Potes"
 
-#: src/buddy_chat.c:135
+#: src/buddy_chat.c:156
 msgid "Join Chat"
 msgstr "Rallier le forum"
 
-#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
+#: src/buddy_chat.c:163 src/buddy_chat.c:917 src/buddy_chat.c:929
 msgid "Buddy Chat"
 msgstr "Forum"
 
-#: src/buddy_chat.c:151
+#: src/buddy_chat.c:173
 msgid "Join what group:"
 msgstr "Joindre le groupe: "
 
-#: src/buddy_chat.c:167
+#: src/buddy_chat.c:186
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "Rallier le forum"
 
-#: src/buddy_chat.c:181
+#: src/buddy_chat.c:198
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:189
+#: src/buddy_chat.c:205
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:197
+#: src/buddy_chat.c:213 src/buddy_chat.c:258 src/dialogs.c:402
+#: src/dialogs.c:682 src/dialogs.c:742 src/dialogs.c:870 src/dialogs.c:987
+#: src/dialogs.c:1240 src/dialogs.c:1450 src/dialogs.c:1578 src/dialogs.c:1643
+#: src/dialogs.c:1856 src/dialogs.c:2045 src/dialogs.c:2225 src/dialogs.c:2299
+#: src/dialogs.c:3163 src/dialogs.c:3397 src/dialogs.c:3489 src/dialogs.c:3676
+#: src/multi.c:463 src/multi.c:574 src/multi.c:821 src/prpl.c:156
+#: src/prpl.c:227
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/buddy_chat.c:218
 msgid "Join"
 msgstr "Joindre"
 
-#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
+#: src/buddy_chat.c:259 src/buddy_chat.c:855 src/buddy_chat.c:984
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/buddy_chat.c:261
+#: src/buddy_chat.c:275
 msgid "Invite who?"
 msgstr "Inviter qui ?"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:279
 msgid "With message:"
 msgstr "En utilisant le message:"
 
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:303
 msgid "Invite to Buddy Chat"
 msgstr "Inviter à un Forum"
 
-#: src/buddy_chat.c:420
+#: src/buddy_chat.c:480 src/buddy_chat.c:808
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: src/buddy_chat.c:532 src/buddy_chat.c:638
+#, c-format
+msgid "%d %s in room"
+msgstr ""
+
+#: src/buddy_chat.c:539
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:459
+#: src/buddy_chat.c:602
+#, c-format
+msgid "<B>%s is now known as %s</B>"
+msgstr ""
+
+#: src/buddy_chat.c:645
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:559 src/buddy_chat.c:816
+#: src/buddy_chat.c:785
+msgid "0 people in room"
+msgstr ""
+
+#: src/buddy_chat.c:860 src/buddy_chat.c:983
 msgid "Whisper"
 msgstr "Murmurer"
 
-#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
-#: src/conversation.c:1733
+#: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
+#: src/conversation.c:2084
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/buddy_chat.c:563
-msgid "Ignore"
-msgstr "Ignorer"
-
-#: src/buddy_chat.c:849 src/conversation.c:1741
+#: src/buddy_chat.c:1021 src/conversation.c:2061
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
-#: src/dialogs.c:345 src/rvous.c:695
+#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/dialogs.c:397
 msgid "Warn"
 msgstr "Donner un Avertissement"
 
-#: src/conversation.c:426
+#: src/conversation.c:352
+#, fuzzy
+msgid "Gaim - Save Conversation"
+msgstr "Gaim - Tracer la Conversation"
+
+#: src/conversation.c:484
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Suppression de '%s' de la Liste\n"
 
-#: src/conversation.c:902
+#: src/conversation.c:1044
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Actuellement à %d\n"
 
-#: src/conversation.c:911
+#: src/conversation.c:1052
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Positionné à %d\n"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1574
 msgid "Bold"
 msgstr "Gras"
 
-#: src/conversation.c:1497 src/prefs.c:818
+#: src/conversation.c:1574 src/prefs.c:974
 msgid "Bold Text"
 msgstr "Texte en Gras"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1578 src/conversation.c:1579
 msgid "Italics"
 msgstr "Italique"
 
-#: src/conversation.c:1501 src/prefs.c:819
+#: src/conversation.c:1578 src/prefs.c:975
 msgid "Italics Text"
 msgstr "Texte en Italique"
 
-#: src/conversation.c:1505 src/conversation.c:1506
+#: src/conversation.c:1582 src/conversation.c:1583
 msgid "Underline"
 msgstr "Souligné"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1582
 msgid "Underline Text"
 msgstr "Texte Souligné"
 
-#: src/conversation.c:1509 src/conversation.c:1510
+#: src/conversation.c:1587
 msgid "Strike"
 msgstr "Barré"
 
-#: src/conversation.c:1509
+#: src/conversation.c:1587
 msgid "Strike through Text"
 msgstr "Texte Barré"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Small"
 msgstr "Petit"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Decrease font size"
 msgstr "Fonte plus Petite"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal font size"
 msgstr "Fonte Normale"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Big"
 msgstr "Grand"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Increase font size"
 msgstr "Fonte plus Grande"
 
-#: src/conversation.c:1526 src/conversation.c:1527
+#: src/conversation.c:1606 src/conversation.c:1607
 msgid "Font"
 msgstr "Fonte"
 
-#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
+#: src/conversation.c:1606 src/dialogs.c:2648 src/dialogs.c:2664
 msgid "Select Font"
 msgstr "Sectionner une fonte"
 
-#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
-#: src/conversation.c:1535
+#: src/conversation.c:1610 src/conversation.c:1611 src/conversation.c:1615
 msgid "Color"
 msgstr "Couleur"
 
-#: src/conversation.c:1530 src/prefs.c:832
+#: src/conversation.c:1610 src/prefs.c:988
 msgid "Text Color"
 msgstr "Couleur de texte"
 
-#: src/conversation.c:1534 src/prefs.c:849
+#: src/conversation.c:1615 src/prefs.c:1006
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1541 src/conversation.c:1542
+#: src/conversation.c:1622 src/conversation.c:1623
 msgid "Link"
 msgstr "Lien"
 
-#: src/conversation.c:1541 src/dialogs.c:2391
+#: src/conversation.c:1622 src/dialogs.c:2293
 msgid "Insert Link"
 msgstr "Insérer un Lien"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 #, fuzzy
 msgid "Smiley"
 msgstr "Fichier"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1552 src/conversation.c:1553
+#: src/conversation.c:1633 src/conversation.c:1634 src/prefs.c:2195
 msgid "Logging"
 msgstr "Connection"
 
-#: src/conversation.c:1552
+#: src/conversation.c:1633
 msgid "Enable logging"
 msgstr "Activer la Connection"
 
-#: src/conversation.c:1556 src/conversation.c:1557
+#: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+msgid "Save"
+msgstr "Enregistrer"
+
+#: src/conversation.c:1643
+#, fuzzy
+msgid "Save Conversation"
+msgstr "Tracer toutes les conversations"
+
+#: src/conversation.c:1648 src/conversation.c:1649
 msgid "Sound"
 msgstr "Son"
 
-#: src/conversation.c:1556
+#: src/conversation.c:1648
 msgid "Enable sounds"
 msgstr "Activer le son"
 
-#: src/conversation.c:1768
+#: src/conversation.c:1928
+#, fuzzy
+msgid "Gaim - Conversations"
+msgstr "Gaim - Tracer la Conversation"
+
+#: src/conversation.c:2003
 #, fuzzy
 msgid "Send message as: "
 msgstr "Son à l'envoi d'un message"
 
-#: src/dialogs.c:360
+#: src/dialogs.c:359
+msgid "Gaim - Warn user?"
+msgstr "Gaim - Donner un Avertissement?"
+
+#: src/dialogs.c:380
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Voulez-vous réellement donner un avertissement à %s?"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:385
 msgid "Warn anonymously?"
 msgstr "Donner un avertissement anonyme?"
 
-#: src/dialogs.c:367
+#: src/dialogs.c:389
 msgid "Anonymous warnings are less harsh."
 msgstr "Les avertissements anonymes sont moins durs."
 
-#: src/dialogs.c:393
-msgid "Gaim - Warn user?"
-msgstr "Gaim - Donner un Avertissement?"
-
-#: src/dialogs.c:458
+#: src/dialogs.c:465
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossible d'ecrire dans le fichier %s."
 
-#: src/dialogs.c:461
+#: src/dialogs.c:468
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossible de lire le fichier %s."
 
-#: src/dialogs.c:464
+#: src/dialogs.c:471
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message trop long, perte des %d derniers octets."
 
-#: src/dialogs.c:467
+#: src/dialogs.c:474
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s n'est pas en ligne."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:477
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Les Avertissements à %s ne sont pas permis."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:480
 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:476
+#: src/dialogs.c:483
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Le forum %s est inaccessible."
 
-#: src/dialogs.c:479
+#: src/dialogs.c:486
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Vous envoyez vos messages trop vite à %s."
 
-#: src/dialogs.c:482
+#: src/dialogs.c:489
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 "Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
 
-#: src/dialogs.c:485
+#: src/dialogs.c:492
 #, 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:488
+#: src/dialogs.c:495
 msgid "Failure."
 msgstr "Echec"
 
-#: src/dialogs.c:491
+#: src/dialogs.c:498
 msgid "Too many matches."
 msgstr "Trop de réponses"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:501
 msgid "Need more qualifiers."
 msgstr "Besoin de plus de critères."
 
-#: src/dialogs.c:497
+#: src/dialogs.c:504
 msgid "Dir service temporarily unavailable."
 msgstr "Le repertoire est temporairement indisponible."
 
-#: src/dialogs.c:500
+#: src/dialogs.c:507
 msgid "Email lookup restricted."
 msgstr "La recherche par Email est restreinte."
 
-#: src/dialogs.c:503
+#: src/dialogs.c:510
 msgid "Keyword ignored."
 msgstr "Mot clé ignoré."
 
-#: src/dialogs.c:506
+#: src/dialogs.c:513
 msgid "No keywords."
 msgstr "Pas de mot-clé."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:516
 msgid "User has no directory information."
 msgstr "L'utilisateur n'a pas d'information personnelle."
 
-#: src/dialogs.c:513
+#: src/dialogs.c:520
 msgid "Country not supported."
 msgstr "Pays non supporté."
 
-#: src/dialogs.c:516
+#: src/dialogs.c:523
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Echec inconnu: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:519 src/oscar.c:471
+#: src/dialogs.c:526 src/oscar.c:523
 msgid "Incorrect nickname or password."
 msgstr "Pseudonye ou Mot de Passe incorrect."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:529
 msgid "The service is temporarily unavailable."
 msgstr "Le service est termporairement indisponible."
 
-#: src/dialogs.c:525
+#: src/dialogs.c:532
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Votre niveau d'avertissement est actuellement trop élevé pour que vous "
 "puissiez vous connecter"
 
-#: src/dialogs.c:528
+#: src/dialogs.c:535
 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."
@@ -693,535 +830,538 @@
 "etRéessayez. Si vous continuez d'essayer, il vous faudra attendre encore "
 "plus longtemps."
 
-#: src/dialogs.c:531
+#: src/dialogs.c:538
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Une erreur inconnue est survenue à la connection: %s."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:541
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Une erreur inconnue, %d, s'est produite. Info:%s"
 
-#: src/dialogs.c:537
+#: src/dialogs.c:544
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - Erreur %d"
 
 #. Build OK Button
-#: src/dialogs.c:596 src/dialogs.c:661 src/dialogs.c:736 src/dialogs.c:1172
-#: src/dialogs.c:1659 src/dialogs.c:1806 src/dialogs.c:2140 src/dialogs.c:2310
-#: src/dialogs.c:2396 src/multi.c:499
+#: src/dialogs.c:603 src/dialogs.c:687 src/dialogs.c:747 src/dialogs.c:1245
+#: src/dialogs.c:1583 src/dialogs.c:1696 src/dialogs.c:2044 src/dialogs.c:2230
+#: src/dialogs.c:2298 src/multi.c:467
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:671
+#: src/dialogs.c:653
+msgid "Gaim - IM user"
+msgstr "Gaim - IM Utilisateur"
+
+#: src/dialogs.c:670
 #, fuzzy
 msgid "IM who:"
 msgstr "Envoyer un message à qui: "
 
-#: src/dialogs.c:695
-msgid "Gaim - IM user"
-msgstr "Gaim - IM Utilisateur"
-
-#: src/dialogs.c:732
+#: src/dialogs.c:718
 #, fuzzy
 msgid "Get User Info"
 msgstr "Message d'Information"
 
-#: src/dialogs.c:746
+#: src/dialogs.c:725
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:770
+#. Finish up
+#: src/dialogs.c:753
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Message d'information"
 
-#: src/dialogs.c:845
+#: src/dialogs.c:823
 msgid "Buddies"
 msgstr "Potes"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:876
 #, fuzzy
 msgid "Add Group"
 msgstr "Groupe"
 
-#: src/dialogs.c:928
+#: src/dialogs.c:906
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "GAIM - Ajouter un Pote"
 
-#: src/dialogs.c:957
+#: src/dialogs.c:933
 msgid "Gaim - Add Buddy"
 msgstr "GAIM - Ajouter un Pote"
 
-#: src/dialogs.c:967
+#: src/dialogs.c:947
 msgid "Add Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/dialogs.c:979 src/dialogs.c:3443
+#: src/dialogs.c:957 src/dialogs.c:3405 src/dialogs.c:3497
 msgid "Buddy"
 msgstr "Pote"
 
-#: src/dialogs.c:1109
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Please enter a buddy to pounce."
+msgstr "Entrez votre login"
+
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Buddy Pounce Error"
+msgstr "Alerte"
+
+#: src/dialogs.c:1076
 #, fuzzy
 msgid "Pounce buddy as:"
 msgstr "Son quand vos potes se connectent"
 
-#: src/dialogs.c:1181
+#: src/dialogs.c:1126
+msgid "Gaim - New Buddy Pounce"
+msgstr "Gaim - Nouvelle Alerte"
+
+#: src/dialogs.c:1143
 #, fuzzy
 msgid "Buddy:"
 msgstr "Pote"
 
+#: src/dialogs.c:1158
+msgid "Pounce on sign on"
+msgstr ""
+
+#: src/dialogs.c:1163
+msgid "Pounce on return from away"
+msgstr ""
+
+#: src/dialogs.c:1167
+msgid "Pounce on return from idle"
+msgstr ""
+
+#: src/dialogs.c:1175
+#, fuzzy
+msgid "Open IM window on pounce"
+msgstr "Ouvrir la fenetre des messages à la connection"
+
+#: src/dialogs.c:1180
+#, fuzzy
+msgid "Send IM on pounce"
+msgstr "Envoyer un message à la connection"
+
 #: src/dialogs.c:1189
 #, fuzzy
 msgid "Message:"
 msgstr "Créer un Message"
 
-#: src/dialogs.c:1196 src/prefs.c:2100
-msgid "Events"
-msgstr ""
-
-#. Set up the different options
 #: src/dialogs.c:1201
-msgid "Pounce on sign on"
-msgstr ""
-
-#: src/dialogs.c:1203
-msgid "Pounce on return from away"
-msgstr ""
-
-#: src/dialogs.c:1204
-msgid "Pounce on return from idle"
-msgstr ""
-
-#: src/dialogs.c:1226
 #, fuzzy
-msgid "Actions"
-msgstr "Options"
-
-#. And now the other stuff
-#: src/dialogs.c:1231
-#, fuzzy
-msgid "Open IM window on pounce"
-msgstr "Ouvrir la fenetre des messages à la connection"
-
-#: src/dialogs.c:1234
-#, fuzzy
-msgid "Send IM on pounce"
+msgid "Execute command on pounce"
 msgstr "Envoyer un message à la connection"
 
-#: src/dialogs.c:1263
-msgid "Gaim - New Buddy Pounce"
-msgstr "Gaim - Nouvelle Alerte"
-
-#. Build Save Button
-#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
-msgid "Save"
-msgstr "Enregistrer"
-
-#: src/dialogs.c:1376
+#: src/dialogs.c:1210
+msgid "Command:"
+msgstr ""
+
+#: src/dialogs.c:1227
+msgid "Save this pounce after activation"
+msgstr ""
+
+#: src/dialogs.c:1316
+msgid "Gaim - Set Dir Info"
+msgstr "Gaim - Donner vos informations personnelles"
+
+#: src/dialogs.c:1348
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Autoriser les recherches sur le web à trouver vos informations"
 
 #. Line 1
-#: src/dialogs.c:1379 src/dialogs.c:2159
+#: src/dialogs.c:1351 src/dialogs.c:2063
 msgid "First Name"
 msgstr "Prénom"
 
 #. Line 2
-#: src/dialogs.c:1390 src/dialogs.c:2171
+#: src/dialogs.c:1362 src/dialogs.c:2075
 msgid "Middle Name"
 msgstr "Surnom"
 
 #. Line 3
-#: src/dialogs.c:1402 src/dialogs.c:2183
+#: src/dialogs.c:1374 src/dialogs.c:2087
 msgid "Last Name"
 msgstr "Nom"
 
 #. Line 4
-#: src/dialogs.c:1413 src/dialogs.c:2195
+#: src/dialogs.c:1385 src/dialogs.c:2099
 msgid "Maiden Name"
 msgstr "Nom de jeune-fille"
 
 #. Line 5
-#: src/dialogs.c:1424 src/dialogs.c:2207
+#: src/dialogs.c:1396 src/dialogs.c:2111
 msgid "City"
 msgstr "Ville"
 
 #. Line 6
-#: src/dialogs.c:1435 src/dialogs.c:2218
+#: src/dialogs.c:1407 src/dialogs.c:2122
 msgid "State"
 msgstr "Etat"
 
 #. Line 7
-#: src/dialogs.c:1446 src/dialogs.c:2229
+#: src/dialogs.c:1418 src/dialogs.c:2133
 msgid "Country"
 msgstr "Pays"
 
-#: src/dialogs.c:1490
-msgid "Gaim - Set Dir Info"
-msgstr "Gaim - Donner vos informations personnelles"
-
-#: src/dialogs.c:1507
+#: src/dialogs.c:1473
 msgid "New Passwords Do Not Match"
 msgstr "Les nouveaux password diffèrent"
 
-#: src/dialogs.c:1507 src/dialogs.c:1512
+#: src/dialogs.c:1473 src/dialogs.c:1478
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Erreur au changement de Mot de Passe"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1478
 msgid "Fill out all fields completely"
 msgstr "Remplissez tous les champs"
 
-#: src/dialogs.c:1541
-#, fuzzy
-msgid "Change password for:"
-msgstr "Changer de Mot de Passe"
-
-#: src/dialogs.c:1580 src/toc.c:515
+#: src/dialogs.c:1505 src/toc.c:560
 msgid "Gaim - Password Change"
 msgstr "Gaim - Changement de mot de passe"
 
-#: src/dialogs.c:1612
+#: src/dialogs.c:1536
 msgid "Original Password"
 msgstr "Mot de Passe courrant"
 
-#: src/dialogs.c:1626
+#: src/dialogs.c:1550
 msgid "New Password"
 msgstr "Nouveau Mot de Passe"
 
-#: src/dialogs.c:1640
+#: src/dialogs.c:1564
 msgid "New Password (again)"
 msgstr "Nouveau Mot de passe (confirmation)"
 
-#: src/dialogs.c:1693
-msgid "Set info for:"
-msgstr ""
-
-#: src/dialogs.c:1776
+#: src/dialogs.c:1609
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Message d'information"
 
-#: src/dialogs.c:1817
+#: src/dialogs.c:1707
 msgid "Below are the results of your search: "
 msgstr "Résultats de votre recherche: "
 
-#: src/dialogs.c:1943 src/dialogs.c:1950
+#: src/dialogs.c:1846 src/dialogs.c:1853
 msgid "Permit"
 msgstr "Autoriser"
 
-#: src/dialogs.c:1945 src/dialogs.c:1952
+#: src/dialogs.c:1848 src/dialogs.c:1855
 msgid "Deny"
 msgstr "Interdire"
 
-#: src/dialogs.c:1993
+#: src/dialogs.c:1896
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ajouter des autorisation/Permission"
 
-#: src/dialogs.c:1995
+#: src/dialogs.c:1898
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ajouter des autorisation/Permission"
 
-#: src/dialogs.c:2057
+#: src/dialogs.c:1960
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/dialogs.c:2266
+#: src/dialogs.c:2170
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - trouver un pote d'après ses Infos."
 
-#: src/dialogs.c:2315
-msgid "Email"
-msgstr "Email"
-
-#: src/dialogs.c:2328
+#: src/dialogs.c:2200
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Trouver un ami d'après son Email"
 
-#: src/dialogs.c:2410
+#: src/dialogs.c:2213
+msgid "Email"
+msgstr "Email"
+
+#: src/dialogs.c:2312
 msgid "URL"
 msgstr "Site Web"
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2320
 msgid "Description"
 msgstr "Description"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2346
 msgid "GAIM - Add URL"
 msgstr "Gaim - Ajouter un site Web"
 
-#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
+#: src/dialogs.c:2487 src/dialogs.c:2500 src/dialogs.c:2537
 msgid "Select Text Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2624
+#: src/dialogs.c:2524
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2847 src/rvous.c:265
+#: src/dialogs.c:2769
 #, c-format
 msgid "Error writing file %s"
 msgstr "Erreur à l'écriture du fichier %s"
 
-#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
-#: src/rvous.c:548
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
+#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "Erreur"
 
-#: src/dialogs.c:2901
+#: src/dialogs.c:2823
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Exporter la liste de Potes"
 
-#: src/dialogs.c:2967 src/rvous.c:547
+#: src/dialogs.c:2891
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erreur à la lecture du fichier %s"
 
-#: src/dialogs.c:3045
+#: src/dialogs.c:2967
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importer la liste de Potes"
 
-#: src/dialogs.c:3124
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3030
+msgid "You cannot create an away message with a blank title"
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3037
+msgid "You cannot create an empty away message"
+msgstr ""
+
+#: src/dialogs.c:3104
 msgid "Gaim - New away message"
 msgstr "Gaim - Nouveau message d'absence"
 
-#. Put frame and button-box in the toplevel
-#: src/dialogs.c:3136
+#: src/dialogs.c:3114
 #, fuzzy
 msgid "New away message"
 msgstr "Nouveau Message d'absence"
 
-#: src/dialogs.c:3149
+#: src/dialogs.c:3127
 msgid "Away title: "
 msgstr "Intitulé: "
 
-#. Checkbox for showing away msg
-#: src/dialogs.c:3193
+#: src/dialogs.c:3167
 #, fuzzy
-msgid "Make Away Now"
-msgstr "Etre absent maintenant"
+msgid "Use"
+msgstr "Utilisation de GAIM"
+
+#: src/dialogs.c:3171
+msgid "Save & Use"
+msgstr ""
 
 #. show everything
-#: src/dialogs.c:3370
+#: src/dialogs.c:3340
 #, fuzzy
 msgid "Smile!"
 msgstr "Fichier"
 
-#: src/dialogs.c:3441
+#: src/dialogs.c:3403 src/dialogs.c:3495
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/dialogs.c:3478
+#: src/dialogs.c:3440 src/dialogs.c:3532
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "GAIM - Ajouter un Pote"
 
-#: src/gnome_applet_mgr.c:95
+#: src/dialogs.c:3604
+#, fuzzy
+msgid "Gaim - Save Log File"
+msgstr "Gaim - Enregistrer sous..."
+
+#: src/dialogs.c:3635
+#, fuzzy, c-format
+msgid "Unable to remove file %s - %s"
+msgstr "Impossible de lire le fichier %s."
+
+#: src/dialogs.c:3666
+msgid "Really clear log?"
+msgstr ""
+
+#: src/dialogs.c:3684
+#, fuzzy
+msgid "Okay"
+msgstr "Ok"
+
+#: src/dialogs.c:3781
+#, fuzzy
+msgid "Clear"
+msgstr "Fermer"
+
+#: src/gaimrc.c:870
 #, c-format
-msgid "file not found: %s\n"
-msgstr "Fichier non trouvé: %s\n"
-
-#: src/gnome_applet_mgr.c:121
-msgid "Offilne. Click to bring up login box."
-msgstr "Déconnecté. Cliquer pour obtenir la fenêtre de connection."
-
-#: src/gnome_applet_mgr.c:128
-msgid "Attempting to sign on...."
-msgstr "Tentative de connection"
-
-#: src/gnome_applet_mgr.c:254
-msgid "GAIM"
-msgstr "GAIM"
-
-#: src/gnome_applet_mgr.c:366
-msgid "Can't create GAIM applet!"
-msgstr "Impossible de créer l'applet GAIM"
-
-#: src/gnome_applet_mgr.c:397
-msgid "Offline"
-msgstr "Hors Ligne"
-
-#: src/gnome_applet_mgr.c:411
-msgid "Font does not exist"
-msgstr "Cette fonte n'existe pas."
-
-#: src/gnome_applet_mgr.c:427
-msgid "About..."
-msgstr "A Propos..."
-
-#: src/gtkhtml.c:1383
-msgid "HTML Link:"
-msgstr "Lien HTML:"
-
-#: src/gtkhtml.c:1796
-msgid "Open URL in existing window"
-msgstr "Ouvrir l'URL dans une fenêtre existante"
-
-#: src/gtkhtml.c:1805
-msgid "Open URL in new window"
-msgstr "Ouvrir l'URL dans une nouvelle fenêtre"
-
-#: src/gtkhtml.c:1813
-msgid "Add URL as bookmark"
-msgstr "Ajouter l'URL aux favoris/bookmarks"
-
-#: src/html.c:122 src/html.c:125
+msgid "Could not open config file %s."
+msgstr ""
+
+#: src/gaimrc.c:871
+#, fuzzy
+msgid "Preferences Error"
+msgstr "Préférences"
+
+#: src/html.c:121 src/html.c:124
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erreur à l'ouvcerture de connection.\n"
 
-#: src/html.c:158
+#: src/html.c:156
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "Obtention de %d octets de %s"
 
-#: src/html.c:171
+#: src/html.c:169
 msgid "Getting Data"
 msgstr "Recuperation de donnée"
 
-#: src/html.c:204
+#: src/html.c:201
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "Reçu: '%s'\n"
 
-#: src/multi.c:367 src/prefs.c:112
+#: src/multi.c:345 src/prefs.c:114
 #, fuzzy
 msgid "General Options"
 msgstr "Options"
 
-#: src/multi.c:402
+#: src/multi.c:350
 #, fuzzy
 msgid "Screenname:"
 msgstr "Pseudonyme: "
 
-#: src/multi.c:414
+#: src/multi.c:359
 #, fuzzy
 msgid "Password:"
 msgstr "Mot de Passe: "
 
-#: src/multi.c:429
+#: src/multi.c:370
+msgid "Protocol:"
+msgstr ""
+
+#: src/multi.c:375
 msgid "Remember Password"
 msgstr "Mémoriser le mot de passe"
 
-#: src/multi.c:430
+#: src/multi.c:376
 #, fuzzy
 msgid "Auto-Login"
 msgstr "Connection automatique"
 
-#: src/multi.c:431
+#: src/multi.c:377
 msgid "Send KeepAlive packet (6 bytes/second)"
 msgstr ""
 
-#: src/multi.c:473
+#: src/multi.c:442
 #, fuzzy
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Connection"
 
-#: src/multi.c:482
-msgid "Modify Account"
-msgstr ""
-
-#: src/multi.c:576
+#: src/multi.c:546
 #, fuzzy
 msgid "Enter Password"
 msgstr "Nouveau Mot de Passe"
 
-#: src/multi.c:669
+#: src/multi.c:641
 #, fuzzy
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Liste des Plugins"
 
-#: src/multi.c:678
-msgid "Account Editor"
-msgstr ""
-
-#: src/multi.c:697
+#: src/multi.c:662
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:701
+#: src/multi.c:666
 #, fuzzy
 msgid "Sign On/Off"
 msgstr "Deconnection"
 
-#: src/multi.c:705
+#: src/multi.c:670
 #, fuzzy
 msgid "Delete"
 msgstr "Sectionner une fonte"
 
-#: src/multi.c:851
+#: src/multi.c:837
 #, c-format
 msgid "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:300 src/oscar.c:317 src/toc.c:280 src/toc.c:290 src/toc.c:347
+#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "Déconnecté."
 
-#: src/oscar.c:308
+#: src/oscar.c:302
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "erreur à la connection!\n"
 
-#: src/oscar.c:316
+#: src/oscar.c:310
 #, fuzzy
 msgid "major connection error\n"
 msgstr "erreur à la connection!\n"
 
-#: src/oscar.c:330 src/toc.c:500
+#: src/oscar.c:323 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:331
+#: src/oscar.c:324
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Erreur"
 
-#: src/oscar.c:362
+#: src/oscar.c:334
+#, fuzzy
+msgid "Chat is currently unavailable"
+msgstr "Le forum %s est inaccessible."
+
+#: src/oscar.c:335
+#, fuzzy
+msgid "Gaim - Chat"
+msgstr "Forum Gaim"
+
+#: src/oscar.c:382
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Connection de %s.\n"
 
-#: src/oscar.c:399
+#: src/oscar.c:420
 msgid "internal connection error\n"
 msgstr "erreur interne de connection\n"
 
-#: src/oscar.c:400
+#: src/oscar.c:421
 msgid "Unable to login to AIM"
 msgstr "Impossible de se connecter à AIM."
 
-#: src/oscar.c:405
+#: src/oscar.c:426
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "incapable de résoudre l'adresse\n"
 
-#: src/oscar.c:409
+#: src/oscar.c:430
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "incapable de se connecter au serveur\n"
 
-#: src/oscar.c:416
+#: src/oscar.c:437
 #, c-format
 msgid "Signon: %s"
 msgstr "Connection: %s"
 
-#: src/oscar.c:426
+#: src/oscar.c:447
 msgid "Password sent, waiting for response\n"
 msgstr "Mot de passe envoyé, en attente de réponse\n"
 
-#: src/oscar.c:451
+#: src/oscar.c:474
 msgid "Signed off.\n"
 msgstr "Hors Ligne.\n"
 
 #. connecting too frequently
-#: src/oscar.c:466
+#: src/oscar.c:518
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1232,158 +1372,123 @@
 "plus longtemps."
 
 #. client too old
-#: src/oscar.c:476
+#: src/oscar.c:528
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:480 src/toc.c:303
+#: src/oscar.c:532 src/toc.c:341
 msgid "Authentication Failed"
 msgstr "Echec de Vérification."
 
-#: src/oscar.c:513
+#: src/oscar.c:562
 msgid "Internal Error"
 msgstr "Erreur Interne"
 
-#: src/oscar.c:520
+#: src/oscar.c:566
 msgid "Could Not Connect"
 msgstr "Impossible de se Connecter"
 
-#: src/oscar.c:551
+#: src/oscar.c:600
 msgid "Connection established, cookie sent"
 msgstr "Connection établie, cookie envoyé"
 
-#: src/oscar.c:787 src/oscar.c:1860
+#: src/oscar.c:843 src/oscar.c:2100
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr "<HR><B>%s s'est connecté%s%s.</B><BR><HR>"
 
-#: src/oscar.c:862 src/rvous.c:333 src/rvous.c:470
-msgid "Gaim - File Transfer"
-msgstr "Gaim - Transfert de fichier"
-
-#: src/oscar.c:866 src/rvous.c:454
-#, c-format
-msgid "Sending %s to %s"
-msgstr "Envoi de %s à %s"
-
-#: src/oscar.c:898
-msgid "Error in transfer"
-msgstr ""
-
-#: src/oscar.c:959
-msgid "Transfer complete."
-msgstr ""
-
-#: src/oscar.c:1012
-#, fuzzy
-msgid "Error examining file"
-msgstr "Erreur à la lecture du fichier %s"
-
-#: src/oscar.c:1012 src/oscar.c:1020 src/oscar.c:1043
-#, fuzzy
-msgid "GetFile Error"
-msgstr "Gaim - Erreur %d"
-
-#: src/oscar.c:1020
-msgid "Could not open temporary file, aborting"
-msgstr ""
-
-#: src/oscar.c:1043
-#, fuzzy
-msgid "Error connecting for transfer"
-msgstr "Erreur à la connection socket\n"
-
-#: src/oscar.c:1065
-#, fuzzy
-msgid "Gaim - Send File..."
-msgstr "Gaim - Enregistrer sous..."
-
 #. message too large
-#: src/oscar.c:1194
+#: src/oscar.c:1293
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr ""
 "Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
 
-#: src/oscar.c:1195 src/oscar.c:1200 src/oscar.c:1222 src/oscar.c:1241
-#: src/oscar.c:1266
-#, fuzzy
-msgid "Gaim - Error"
-msgstr "Gaim - Erreur %d"
-
-#: src/oscar.c:1199
+#: src/oscar.c:1298
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1220
+#: src/oscar.c:1333
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1221 src/oscar.c:1240
+#: src/oscar.c:1334 src/oscar.c:1353
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1239
+#: src/oscar.c:1352
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1265
+#: src/oscar.c:1388
 #, c-format
-msgid "%s has no info/away message."
+msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1271
+#: src/oscar.c:1395
 msgid ""
-"Username : <B>%s</B>\n"
-"<BR>Warning Level : <B>%d %%</B>\n"
-"<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
+"Username : <B>%s</B>  %s <BR>\n"
+"Warning Level : <B>%d %%</B><BR>\n"
+"Online Since : <B>%s</B><BR>\n"
+"Idle Minutes : <B>%d</B>\n"
+"<BR>\n"
+"<HR><BR>\n"
+"%s<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
-"Pseudonyme : <B>%s</B>\n"
-"<BR>Niveau d'avertissement : <B>%d %%</B>\n"
-"<BR>En Ligne depuis : <B>%s</B><BR>Minutes d'inactivité : <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
-
-#: src/oscar.c:1305
+
+#: src/oscar.c:1430
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1306
+#: src/oscar.c:1431
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:1913
+#: src/oscar.c:2157
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s closed</B>"
 msgstr "<HR><B>%s s'est connecté%s%s.</B><BR><HR>"
 
-#: src/oscar.c:1958
+#: src/oscar.c:2216
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "Impossible de se connecter à AIM."
 
-#: src/oscar.c:1967 src/toc.c:970
-#, fuzzy
-msgid "Get Info"
-msgstr "Message d'Information"
-
-#: src/oscar.c:1974
+#: src/oscar.c:2226
+#, c-format
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+
+#: src/oscar.c:2243
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Message d'absence"
 
-#: src/oscar.c:1982
+#: src/oscar.c:2251
 #, fuzzy
 msgid "Direct IM"
 msgstr "Information Personnelle"
 
+#: src/oscar.c:2443
+msgid ""
+"Unfortunately, currently Oscar only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
 #. Below is basically stolen from plugins.c
-#: src/perl.c:639
+#: src/perl.c:638
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Message d'information"
@@ -1392,563 +1497,728 @@
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:104
+#: src/plugins.c:105
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Liste des Plugins"
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
+#: src/plugins.c:185 src/plugins.c:191 src/plugins.c:215
 msgid "Plugin Error"
 msgstr "Erreur de Plugin"
 
-#: src/plugins.c:262
+#: src/plugins.c:261
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
 #. Build the bottom button bar
-#: src/plugins.c:294
+#: src/plugins.c:290
 msgid "Load Plugin"
 msgstr "Charger le Plugin"
 
-#: src/plugins.c:301
+#: src/plugins.c:296
 msgid "Configure Plugin"
 msgstr "Configurer le Plugin"
 
-#: src/plugins.c:307
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr "Décharger le Plugin"
 
-#: src/prefs.c:120 src/prefs.c:180 src/prefs.c:227 src/prefs.c:339
-#: src/prefs.c:425 src/prefs.c:814 src/prefs.c:900 src/prefs.c:1043
-#: src/prefs.c:1408 src/prefs.c:1649
+#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
+#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
+#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1761
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#.
-#. prefrem = gaim_button(_("Remember password"), &general_options, OPT_GEN_REMEMBER_PASS, box);
-#. gtk_signal_connect(GTK_OBJECT(prefrem), "destroy", GTK_SIGNAL_FUNC(remdes), 0);
-#. gaim_button(_("Auto-login"), &general_options, OPT_GEN_AUTO_LOGIN, box);
-#.
-#. sep = gtk_hseparator_new();
-#. gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-#. gtk_widget_show(sep);
-#.
-#: src/prefs.c:134
+#: src/prefs.c:126
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:135
+#: src/prefs.c:128
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:138
+#: src/prefs.c:132
 msgid "Show Debug Window"
 msgstr ""
 
+#: src/prefs.c:144
+#, fuzzy
+msgid "Report Idle Times:"
+msgstr "Afficher les temps d'inactivité"
+
+#: src/prefs.c:147
+msgid "None"
+msgstr ""
+
+#: src/prefs.c:148
+msgid "GAIM Use"
+msgstr "Utilisation de GAIM"
+
 #: src/prefs.c:150
 #, fuzzy
-msgid "Report Idle Times:"
-msgstr "Afficher les temps d'inactivité"
-
-#: src/prefs.c:153
-msgid "None"
-msgstr ""
-
-#: src/prefs.c:154
-msgid "GAIM Use"
-msgstr "Utilisation de GAIM"
-
-#: src/prefs.c:156
-#, fuzzy
 msgid "X Use"
 msgstr "Utilisation de GAIM"
 
-#: src/prefs.c:172
+#: src/prefs.c:224
+#, fuzzy
+msgid "Browser Options"
+msgstr "Options"
+
+#: src/prefs.c:236
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/prefs.c:237
+msgid "KFM"
+msgstr ""
+
+#: src/prefs.c:239
+msgid "GNOME URL Handler"
+msgstr ""
+
+#: src/prefs.c:241
+msgid "Manual"
+msgstr "Manuel"
+
+#: src/prefs.c:252
+msgid "Pop up new window by default"
+msgstr "Afficher une nouvelle fenêtre par défaut"
+
+#: src/prefs.c:279
+#, fuzzy
+msgid "Logging Options"
+msgstr "Connection de %s.\n"
+
+#: src/prefs.c:291
+#, fuzzy
+msgid "Log all conversations"
+msgstr "Tracer toutes les conversations"
+
+#: src/prefs.c:292
+#, fuzzy
+msgid "Strip HTML from logs"
+msgstr "Enlever l'HTML des traces"
+
+#: src/prefs.c:298
+msgid "Log when buddies sign on/sign off"
+msgstr ""
+
+#: src/prefs.c:299
+msgid "Log when buddies become idle/un-idle"
+msgstr ""
+
+#: src/prefs.c:300
+msgid "Log when buddies go away/come back"
+msgstr ""
+
+#: src/prefs.c:301
+msgid "Log your own signons/idleness/awayness (as set by options above)"
+msgstr ""
+
+#: src/prefs.c:302
+msgid "Individual log file for each buddy's signons"
+msgstr ""
+
+#: src/prefs.c:317
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Liste de Potes"
 
-#: src/prefs.c:184
-msgid "Show numbers in groups"
-msgstr "Afficher le nombre dans les groupes"
-
-#: src/prefs.c:185
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:186
-msgid "Show idle times"
-msgstr "Afficher les temps d'inactivité"
-
-#: src/prefs.c:187
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "afficher les images des potes"
-
-#: src/prefs.c:193
-msgid "Hide IM/Info/Chat buttons"
-msgstr ""
-
-#: src/prefs.c:194
-msgid "Show pictures on buttons"
-msgstr ""
-
-#: src/prefs.c:200
+#: src/prefs.c:329
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "Mémoriser la taille et la position de certaines fenetres"
 
-#: src/prefs.c:202
+#: src/prefs.c:331
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "Afficher la liste des potes automagiquement"
 
-#: src/prefs.c:203
+#: src/prefs.c:333
 #, fuzzy
 msgid "Display Buddy List near applet"
 msgstr "La liste des potes disparait près de l'applet"
 
-#: src/prefs.c:219
+#: src/prefs.c:340
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:341
+msgid "Show numbers in groups"
+msgstr "Afficher le nombre dans les groupes"
+
+#: src/prefs.c:347
+#, fuzzy
+msgid "Show buddy type icons"
+msgstr "afficher les images des potes"
+
+#: src/prefs.c:348
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:349
+msgid "Show idle times"
+msgstr "Afficher les temps d'inactivité"
+
+#: src/prefs.c:355
+msgid "Hide IM/Info/Chat buttons"
+msgstr ""
+
+#: src/prefs.c:356
+msgid "Show pictures on buttons"
+msgstr ""
+
+#: src/prefs.c:371
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:231
+#: src/prefs.c:383
 msgid "Enter sends message"
 msgstr "Entrer les messages envoyés"
 
-#: src/prefs.c:232
+#: src/prefs.c:384
+#, fuzzy
+msgid "Control-Enter sends message"
+msgstr "Entrer les messages envoyés"
+
+#: src/prefs.c:385
+msgid "Escape closes window"
+msgstr ""
+
+#: src/prefs.c:386
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:233
+#: src/prefs.c:387
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:239
+#: src/prefs.c:388
+msgid "F2 toggles timestamp display"
+msgstr ""
+
+#: src/prefs.c:394
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "Afficher graphiquement les smileys (expérimental)"
 
-#: src/prefs.c:240
+#: src/prefs.c:395
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "Afficher l'heure su les messages"
 
-#: src/prefs.c:241
+#: src/prefs.c:396
 #, fuzzy
-msgid "Ignore incoming colors"
+msgid "Ignore colors"
 msgstr "Ignorer les couleurs envoyées"
 
-#: src/prefs.c:242
-msgid "Ignore white backgrounds"
-msgstr ""
-
-#: src/prefs.c:248
+#: src/prefs.c:397
 #, fuzzy
-msgid "Log all conversations"
-msgstr "Tracer toutes les conversations"
-
-#: src/prefs.c:249
+msgid "Ignore font faces"
+msgstr "Fonte plus Grande"
+
+#: src/prefs.c:398
 #, fuzzy
-msgid "Strip HTML from logs"
-msgstr "Enlever l'HTML des traces"
-
-#: src/prefs.c:255
+msgid "Ignore font sizes"
+msgstr "Fonte plus Grande"
+
+#: src/prefs.c:404
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Surligner automagiquement les mots mal orthographiés"
 
-#: src/prefs.c:256
+#: src/prefs.c:405
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "Envoyer les URL comme des liens cliquables"
 
-#: src/prefs.c:257
+#: src/prefs.c:406
 msgid "Sending messages removes away status"
 msgstr "L'envoi de message supprime le statut d'absence"
 
-#: src/prefs.c:298 src/prefs.c:386
+#: src/prefs.c:447 src/prefs.c:540
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:303 src/prefs.c:391
+#: src/prefs.c:453 src/prefs.c:546
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:308 src/prefs.c:396
+#: src/prefs.c:459 src/prefs.c:552
 #, fuzzy
 msgid "Text Only"
 msgstr "Couleur de texte"
 
-#: src/prefs.c:331
+#: src/prefs.c:483
 #, fuzzy
 msgid "IM Options"
 msgstr "Options"
 
-#: src/prefs.c:343
+#: src/prefs.c:495
+#, fuzzy
+msgid "Show all conversations in one tabbed window"
+msgstr "Afficher les (dé)connection dans la fenetre de forum"
+
+#: src/prefs.c:496
 #, fuzzy
 msgid "Show logins in window"
 msgstr "Afficher les (dé)connection dans la fenetre de forum"
 
-#: src/prefs.c:349 src/prefs.c:435
+#: src/prefs.c:502 src/prefs.c:593
 #, fuzzy
 msgid "Show buttons as "
 msgstr "Afficher les images sur les boutons"
 
-#: src/prefs.c:358 src/prefs.c:445
+#: src/prefs.c:511 src/prefs.c:603
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:359 src/prefs.c:446
+#: src/prefs.c:513 src/prefs.c:605
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Avancer les fenêtres recevant un message"
 
-#: src/prefs.c:360
+#: src/prefs.c:514
 msgid "Ignore new conversations when away"
 msgstr "Ignorer les nouveaux forums lors des absences"
 
-#: src/prefs.c:361
+#: src/prefs.c:516
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "Créer un Message"
 
-#: src/prefs.c:417 src/prefs.c:620
+#: src/prefs.c:574
 #, fuzzy
 msgid "Chat Options"
 msgstr "Options"
 
-#: src/prefs.c:429
+#: src/prefs.c:586
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
+#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
 msgid "Gaim Chat"
 msgstr "Forum Gaim"
 
-#: src/prefs.c:638
+#: src/prefs.c:779 src/prefs.c:2234
+msgid "Chat Rooms"
+msgstr ""
+
+#: src/prefs.c:797
 msgid "Refresh"
 msgstr "Rafraichir"
 
-#: src/prefs.c:666
+#: src/prefs.c:822
 msgid "List of available chats"
 msgstr "Liste des forums disponibles"
 
-#: src/prefs.c:680
+#: src/prefs.c:832
 msgid "List of subscribed chats"
 msgstr "Liste des forums souscrits"
 
-#: src/prefs.c:806 src/prefs.c:2084
+#: src/prefs.c:962 src/prefs.c:2239
 #, fuzzy
 msgid "Font Options"
 msgstr "Options"
 
-#: src/prefs.c:820
+#: src/prefs.c:976
 msgid "Underlined Text"
 msgstr "Texte Souligné"
 
-#: src/prefs.c:821
+#: src/prefs.c:977
 msgid "Strike Text"
 msgstr "Texte barré"
 
-#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
+#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
 #, fuzzy
 msgid "Select"
 msgstr "Sectionner une fonte"
 
-#: src/prefs.c:869
+#: src/prefs.c:1027
 msgid "Font Face for Text"
 msgstr "Fonte pour le Texte"
 
-#: src/prefs.c:892
+#: src/prefs.c:1042
+#, fuzzy
+msgid "Font Size for Text"
+msgstr "Fonte pour le Texte"
+
+#: src/prefs.c:1067
 #, fuzzy
 msgid "Sound Options"
 msgstr "Options"
 
-#: src/prefs.c:904
+#: src/prefs.c:1079
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Son quand vos potes se connectent"
 
-#: src/prefs.c:905 src/prefs.c:1296
+#: src/prefs.c:1080 src/prefs.c:1511
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:906
+#: src/prefs.c:1081
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:968
+#: src/prefs.c:1146
 #, fuzzy
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/prefs.c:1002
+#: src/prefs.c:1181
 #, fuzzy
 msgid "Reset"
 msgstr "S'enregistrer"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1186
 #, fuzzy
-msgid "Choose"
+msgid "Choose..."
 msgstr "Fermer"
 
-#: src/prefs.c:1035
+#: src/prefs.c:1222
 #, fuzzy
 msgid "Sound Events"
 msgstr "Sons"
 
-#: src/prefs.c:1047
+#: src/prefs.c:1234
 msgid "Sound when buddy logs in"
 msgstr "Son quand vos potes se connectent"
 
-#: src/prefs.c:1048
+#: src/prefs.c:1235
 msgid "Sound when buddy logs out"
 msgstr "Son quand vos potes se déconnectent"
 
-#: src/prefs.c:1054
+#: src/prefs.c:1241
 msgid "Sound when message is received"
 msgstr "Son à la reception d'un message"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1242
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "Son à la reception d'un message"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1243
 msgid "Sound when message is sent"
 msgstr "Son à l'envoi d'un message"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1249
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "Son lorsque les personnes entrent/sortent d'un forum"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1250
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "Son lorsque les personnes entrent/sortent d'un forum"
 
-#: src/prefs.c:1064
+#: src/prefs.c:1251
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "Son lorsque els personnes parlent dnas un forum"
 
-#: src/prefs.c:1065
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "Son lorsque els personnes parlent dnas un forum"
 
-#: src/prefs.c:1197 src/prefs.c:2111
+#: src/prefs.c:1262
+#, c-format
+msgid "Command to play sound files (%s for filename; internal if empty)"
+msgstr ""
+
+#: src/prefs.c:1408 src/prefs.c:2266
 #, fuzzy
 msgid "Away Messages"
 msgstr "Nouveau Message d'absence"
 
-#: src/prefs.c:1209
+#: src/prefs.c:1420
 #, fuzzy
 msgid "Title"
 msgstr "Fichier"
 
-#: src/prefs.c:1213
+#: src/prefs.c:1424
 #, fuzzy
 msgid "Message"
 msgstr "Créer un Message"
 
-#: src/prefs.c:1253
+#: src/prefs.c:1464
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1257
+#: src/prefs.c:1468
 #, fuzzy
 msgid "Make Away"
 msgstr "Etre absent maintenant"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1509
 #, fuzzy
 msgid "Ignore new conversations when away   "
 msgstr "Ignorer les nouveaux forums lors des absences"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1521
 msgid "Auto Away after"
 msgstr ""
 
-#: src/prefs.c:1318
+#: src/prefs.c:1534
 msgid "minutes using"
 msgstr ""
 
-#: src/prefs.c:1400
-#, fuzzy
-msgid "Browser Options"
-msgstr "Options"
-
-#: src/prefs.c:1412
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:1413
-msgid "KFM"
-msgstr ""
-
-#: src/prefs.c:1415
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:1417
-msgid "Manual"
-msgstr "Manuel"
-
-#: src/prefs.c:1426
-msgid "Pop up new window by default"
-msgstr "Afficher une nouvelle fenêtre par défaut"
-
-#: src/prefs.c:1641
+#: src/prefs.c:1753
 #, fuzzy
 msgid "Privacy Options"
 msgstr "Options"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1769
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1677
+#: src/prefs.c:1788
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1678
+#: src/prefs.c:1789
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1680
+#: src/prefs.c:1791
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1712
+#: src/prefs.c:1822
 #, fuzzy
 msgid "Deny all users"
 msgstr "Interdire certains"
 
-#: src/prefs.c:1713
+#: src/prefs.c:1823
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1715
+#: src/prefs.c:1825
 #, fuzzy
 msgid "Block List"
 msgstr "Bloquer"
 
-#: src/prefs.c:1791
+#: src/prefs.c:1920
 msgid "Gaim - Preferences"
 msgstr "Gaim - Préférences"
 
-#: src/prefs.c:1877
+#: src/prefs.c:2000
 msgid "GAIM debug output window"
 msgstr "fenetre de debug GAIM"
 
-#: src/prefs.c:2040
+#: src/prefs.c:2185
 msgid "General"
 msgstr "Génerale"
 
-#: src/prefs.c:2064
+#: src/prefs.c:2190
+msgid "Browser"
+msgstr "Navigateur"
+
+#: src/prefs.c:2219
 #, fuzzy
 msgid "Conversations"
 msgstr "Tracer toutes les conversations"
 
-#: src/prefs.c:2069
+#: src/prefs.c:2224
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2074
+#: src/prefs.c:2229
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2079
-msgid "Chat Rooms"
-msgstr ""
-
-#: src/prefs.c:2095
+#: src/prefs.c:2250
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/prefs.c:2122
-msgid "Browser"
-msgstr "Navigateur"
-
-#: src/prefs.c:2133
+#: src/prefs.c:2255
+msgid "Events"
+msgstr ""
+
+#: src/prefs.c:2277
 msgid "Privacy"
 msgstr ""
 
-#: src/rvous.c:148
-msgid "Gaim - Save As..."
-msgstr "Gaim - Enregistrer sous..."
-
-#: src/rvous.c:317
+#: src/prpl.c:73
+msgid ""
+"You have attempted to load a protocol which was not compiled from the same "
+"version of the source as this application was. Unfortunately, because it is "
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
+msgstr ""
+
+#: src/prpl.c:77
+#, fuzzy
+msgid "Protocol Error"
+msgstr "Erreur de Plugin"
+
+#: src/prpl.c:97
 #, c-format
-msgid "Receiving %s from %s"
-msgstr "Reception de %s en provenance de %s"
-
-#: src/rvous.c:693
+msgid "%s was using %s, which got removed. %s is now offline."
+msgstr ""
+
+#: src/prpl.c:100
+#, fuzzy
+msgid "Disconnect"
+msgstr "Déconnecté."
+
+#: src/prpl.c:140
+#, fuzzy
+msgid "Accept?"
+msgstr "Accepter"
+
+#: src/prpl.c:160 src/prpl.c:231
 msgid "Accept"
 msgstr "Accepter"
 
-#: src/rvous.c:720
-#, 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:723
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s vous demande de leur envoyer un fichier"
-
-#: src/rvous.c:733
-msgid "Gaim - File Transfer?"
-msgstr "Gaim - Transfert de fichier?"
-
-#: src/server.c:581
+#: src/prpl.c:204
+#, fuzzy
+msgid "Gaim - Prompt"
+msgstr "Gaim - Ajouter des autorisation/Permission"
+
+#: src/prpl.c:299
+#, fuzzy
+msgid "Gaim - New User Registration"
+msgstr "Gaim - Tracer la Conversation"
+
+#: src/prpl.c:308
+msgid "New User Registration"
+msgstr ""
+
+#: src/prpl.c:320
+msgid "Register new user for"
+msgstr ""
+
+#: src/server.c:608
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:582
+#: src/server.c:609
 msgid "No"
 msgstr ""
 
-#: src/toc.c:253 src/toc.c:260
+#: src/toc.c:290 src/toc.c:297
 #, fuzzy
 msgid "Connection Closed"
 msgstr "Connection"
 
-#: src/toc.c:295
+#: src/toc.c:332
 msgid "Waiting for reply..."
 msgstr ""
 
-#: src/toc.c:354
+#: src/toc.c:391
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/toc.c:355
+#: src/toc.c:392
 msgid "TOC Resume"
 msgstr ""
 
-#: src/toc.c:515
+#: src/toc.c:560
 #, fuzzy
 msgid "Password Change Successeful"
 msgstr "Gaim - Changement de mot de passe"
 
-#: src/toc.c:518
+#: src/toc.c:563
 msgid ""
 "TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
 
-#: src/toc.c:521
+#: src/toc.c:566
 msgid "TOC Pause"
 msgstr ""
 
-#: src/toc.c:977
+#: src/toc.c:923
 #, fuzzy
 msgid "Get Dir Info"
 msgstr "Info Personnelle"
 
+#: src/toc.c:1190
+msgid ""
+"Unfortunately, currently TOC only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
+#: src/toc.c:1499 src/toc.c:1676
+#, fuzzy
+msgid "Could not connect for transfer!"
+msgstr "Erreur à la connection socket\n"
+
+#: src/toc.c:1706
+msgid "Could not write file header!"
+msgstr ""
+
+#: src/toc.c:1741
+msgid "Gaim - Save As..."
+msgstr "Gaim - Enregistrer sous..."
+
+#: src/toc.c:1780
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
+msgstr "%s vous demande d'accepter le fichier: %s (%d bytes)"
+
+#: src/toc.c:1785
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr "%s vous demande de leur envoyer un fichier"
+
+#, fuzzy
+#~ msgid "Change password for:"
+#~ msgstr "Changer de Mot de Passe"
+
+#, fuzzy
+#~ msgid "Make Away Now"
+#~ msgstr "Etre absent maintenant"
+
+#~ msgid "GAIM"
+#~ msgstr "GAIM"
+
+#~ msgid "HTML Link:"
+#~ msgstr "Lien HTML:"
+
+#~ msgid "Open URL in existing window"
+#~ msgstr "Ouvrir l'URL dans une fenêtre existante"
+
+#~ msgid "Open URL in new window"
+#~ msgstr "Ouvrir l'URL dans une nouvelle fenêtre"
+
+#~ msgid "Add URL as bookmark"
+#~ msgstr "Ajouter l'URL aux favoris/bookmarks"
+
+#~ msgid "Gaim - File Transfer"
+#~ msgstr "Gaim - Transfert de fichier"
+
+#~ msgid "Sending %s to %s"
+#~ msgstr "Envoi de %s à %s"
+
+#, fuzzy
+#~ msgid "Error examining file"
+#~ msgstr "Erreur à la lecture du fichier %s"
+
+#, fuzzy
+#~ msgid "GetFile Error"
+#~ msgstr "Gaim - Erreur %d"
+
+#~ msgid ""
+#~ "Username : <B>%s</B>\n"
+#~ "<BR>Warning Level : <B>%d %%</B>\n"
+#~ "<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
+#~ "<BR><HR><BR>%s\n"
+#~ msgstr ""
+#~ "Pseudonyme : <B>%s</B>\n"
+#~ "<BR>Niveau d'avertissement : <B>%d %%</B>\n"
+#~ "<BR>En Ligne depuis : <B>%s</B><BR>Minutes d'inactivité : <B>%d</B>\n"
+#~ "<BR><HR><BR>%s\n"
+
+#~ msgid "Receiving %s from %s"
+#~ msgstr "Reception de %s en provenance de %s"
+
+#~ msgid "Gaim - File Transfer?"
+#~ msgstr "Gaim - Transfert de fichier?"
+
 #~ msgid "You must give your password"
 #~ msgstr "Vous devez indiquer votre mot de passe"
 
@@ -2056,9 +2326,6 @@
 #~ msgid "Remove buddy from permit/deny"
 #~ msgstr "Enlever des potes des Autorisations/Interdictions"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
 #~ msgid "Idle"
 #~ msgstr "Inactivité"
 
--- a/po/ko.po	Fri Mar 23 17:34:03 2001 +0000
+++ b/po/ko.po	Fri Mar 23 18:01:53 2001 +0000
@@ -2,12 +2,11 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/gnome_applet_mgr.c:256
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-03 23:24-0800\n"
+"POT-Creation-Date: 2001-03-23 09:31-0800\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"
@@ -15,12 +14,61 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: src/about.c:72
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#, fuzzy
+msgid "Get Info"
+msgstr "»ç¿ëÀÚ Á¤º¸"
+
+#: plugins/yay/yay.c:169
+#, fuzzy
+msgid "Your message did not get sent."
+msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¶§ ¼Ò¸® ³»±â"
+
+#: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
+#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
+#: src/oscar.c:1390
+#, fuzzy
+msgid "Gaim - Error"
+msgstr "Gaim - ¿À·ù %d"
+
+#: plugins/yay/yay.c:187
+#, c-format
+msgid "%s has made %s their buddy%s%s"
+msgstr ""
+
+#: plugins/yay/yay.c:189
+#, fuzzy
+msgid "Gaim - Buddy"
+msgstr "Gaim - Ä£±¸ ´õÇϱâ"
+
+#: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
+#: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
+#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
+msgid "Close"
+msgstr "´Ý±â"
+
+#: plugins/napster.c:1060
+msgid "Napster registration is currently under development"
+msgstr ""
+
+#: src/about.c:77
 #, c-format
 msgid "About GAIM v%s"
 msgstr "GAIM v%s ¿¡ ´ëÇÏ¿©"
 
-#: src/aim.c:133 src/buddy.c:2100
+#: src/about.c:114
+msgid ""
+"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"written using Gtk+ and is licensed under the GPL.\n"
+"URL: http://www.marko.net/gaim/"
+msgstr ""
+
+#: src/about.c:189
+msgid "Web Site"
+msgstr ""
+
+#: src/aim.c:135 src/buddy.c:2295
 msgid "Signoff"
 msgstr "²÷±â"
 
@@ -28,7 +76,7 @@
 msgid "Please enter your logon"
 msgstr "À̸§À» ÀÔ·ÂÇϼ¼¿ä"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#: src/aim.c:147 src/aim.c:152 src/multi.c:838
 #, fuzzy
 msgid "Signon Error"
 msgstr "¿¬°á"
@@ -38,651 +86,740 @@
 msgid "Please enter your password"
 msgstr "À̸§À» ÀÔ·ÂÇϼ¼¿ä"
 
-#: src/aim.c:254 src/multi.c:608
-msgid "Signon"
-msgstr "¿¬°á"
-
-#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+#: src/aim.c:246
+msgid "Gaim - Login"
+msgstr "Gaim - ·Î±×ÀÎ"
+
+#: src/aim.c:264
+msgid "Screen Name: "
+msgstr "È­¸éÀ̸§: "
+
+#: src/aim.c:278
+msgid "Password: "
+msgstr "¾ÏÈ£: "
+
+#: src/aim.c:299 src/buddy.c:2299
+msgid "Quit"
+msgstr "³¡³»±â"
+
+#: src/aim.c:304 src/aim.c:641 src/buddy.c:2358
 msgid "Accounts"
 msgstr ""
 
-#. Build OK Button
-#: src/aim.c:258 src/buddy_chat.c:202 src/buddy_chat.c:243 src/dialogs.c:347
-#: src/dialogs.c:666 src/dialogs.c:741 src/dialogs.c:892 src/dialogs.c:1029
-#: src/dialogs.c:1167 src/dialogs.c:1360 src/dialogs.c:1654 src/dialogs.c:1739
-#: src/dialogs.c:1953 src/dialogs.c:2141 src/dialogs.c:2305 src/dialogs.c:2397
-#: src/dialogs.c:3176 src/dialogs.c:3435 src/multi.c:494 src/multi.c:604
-#: src/multi.c:835 src/oscar.c:879 src/rvous.c:327 src/rvous.c:464
-#: src/rvous.c:696
-msgid "Cancel"
-msgstr "Ãë¼Ò"
-
-#: src/aim.c:259
+#: src/aim.c:306 src/multi.c:578
+msgid "Signon"
+msgstr "¿¬°á"
+
+#: src/aim.c:338 src/prpl.c:359
 msgid "Register"
 msgstr "µî·Ï"
 
-#: src/aim.c:260
+#: src/aim.c:339
 msgid "Options"
 msgstr "¿É¼Ç"
 
-#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
+#: src/aim.c:341 src/aim.c:644 src/buddy.c:2375
 msgid "Plugins"
 msgstr "Ç÷¯±×ÀÎ"
 
-#. Labels for selectors and text boxes
-#: src/aim.c:338
-msgid "Screen Name: "
-msgstr "È­¸éÀ̸§: "
-
-#: src/aim.c:341
-msgid "Password: "
-msgstr "¾ÏÈ£: "
-
-#: src/aim.c:380
-msgid "Gaim - Login"
-msgstr "Gaim - ·Î±×ÀÎ"
-
-#: src/aim.c:599 src/buddy.c:2163
+#: src/aim.c:638 src/buddy.c:2367
 msgid "Preferences"
 msgstr "¼³Á¤"
 
-#: src/away.c:110 src/away.c:227
-msgid "Back"
-msgstr "µÚ·Î"
-
-#: src/away.c:121
+#: src/applet.c:89
+#, c-format
+msgid "file not found: %s\n"
+msgstr "ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù: %s\n"
+
+#: src/applet.c:113
+msgid "Attempting to sign on...."
+msgstr "Á¢¼ÓÀ» ½ÃµµÇÕ´Ï´Ù...."
+
+#: src/applet.c:119
+msgid "Offilne. Click to bring up login box."
+msgstr "Á¢¼ÓµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù. Ŭ¸¯ÇÏ¸é ·Î±×ÀÎ È­¸éÀÌ ³ª¿É´Ï´Ù."
+
+#: src/applet.c:136 src/applet.c:174 src/buddy.c:2313
+msgid "Away"
+msgstr "Àá¼ö"
+
+#: src/applet.c:177 src/away.c:266
+msgid "New Away Message"
+msgstr "»õ·Î¿î Àá¼ö ¸Þ½ÃÁö"
+
+#: src/applet.c:317
+msgid "Can't create GAIM applet!"
+msgstr "GAIM ¾ÖÇø´À» ¸¸µé ¼ö ¾ø½À´Ï´Ù!"
+
+#: src/applet.c:348
+msgid "Offline"
+msgstr "²÷±è"
+
+#: src/applet.c:362
+msgid "Font does not exist"
+msgstr "±Û²ÃÀÌ ¾ø½À´Ï´Ù"
+
+#: src/applet.c:377
+msgid "About..."
+msgstr "...¿¡ ´ëÇÏ¿©"
+
+#: src/away.c:96
 msgid "I'm Back!"
 msgstr "³»°¡ µ¹¾Æ¿Ô´Ù!"
 
-#: src/away.c:160
+#: src/away.c:133
 msgid "Gaim - Away!"
 msgstr "Gaim - Àá¼ö!"
 
-#: src/away.c:266 src/gnome_applet_mgr.c:200
-msgid "New Away Message"
-msgstr "»õ·Î¿î Àá¼ö ¸Þ½ÃÁö"
-
-#: src/away.c:284
+#: src/away.c:147 src/away.c:228 src/away.c:393
+msgid "Back"
+msgstr "µÚ·Î"
+
+#: src/away.c:286
 msgid "Remove Away Message"
 msgstr "Àá¼ö ¸Þ½ÃÁö ¾ø¾Ö±â"
 
+#: src/away.c:462
+msgid "Set All Away"
+msgstr ""
+
 #. Put the buttons in the box
-#: src/buddy.c:239 src/buddy.c:2234 src/buddy_chat.c:845
-#: src/conversation.c:1641 src/conversation.c:1740 src/dialogs.c:890
-#: src/dialogs.c:1023 src/dialogs.c:1964 src/multi.c:693 src/prefs.c:639
-#: src/prefs.c:1249 src/prefs.c:1700 src/prefs.c:1735
+#: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
+#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
+#: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
 msgstr "´õÇϱâ"
 
-#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
+#: src/buddy.c:246 src/buddy.c:2444 src/dialogs.c:878 src/dialogs.c:974
 msgid "Group"
 msgstr "±×·ì"
 
-#: src/buddy.c:241 src/buddy.c:2236 src/buddy_chat.c:847
-#: src/conversation.c:1639 src/conversation.c:1738 src/prefs.c:640
-#: src/prefs.c:1261 src/prefs.c:1704 src/prefs.c:1739
+#: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
+#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "Á¦°Å"
 
-#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
+#: src/buddy.c:250 src/buddy.c:1830 src/buddy.c:2186
 msgid "Chat"
 msgstr "äÆÃ"
 
-#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
+#: src/buddy.c:251 src/buddy.c:443 src/buddy.c:2184 src/buddy_chat.c:474
+#: src/buddy_chat.c:804
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:246 src/buddy.c:2002 src/buddy_chat.c:564 src/buddy_chat.c:853
-#: src/conversation.c:1734 src/rvous.c:694
+#: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
+#: src/buddy_chat.c:1025 src/conversation.c:2073
 msgid "Info"
 msgstr "Á¤º¸"
 
 #. Put the buttons in the box
-#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
+#: src/buddy.c:449 src/buddy.c:554 src/dialogs.c:968 src/dialogs.c:3395
+#: src/dialogs.c:3410 src/dialogs.c:3487 src/dialogs.c:3502
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:425
+#: src/buddy.c:455 src/buddy.c:568
 msgid "Add Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â ¸¸µé±â"
 
-#: src/buddy.c:1368
+#: src/buddy.c:461 src/buddy.c:574
+msgid "View Log"
+msgstr ""
+
+#: src/buddy.c:561
+msgid "Un-Alias"
+msgstr ""
+
+#: src/buddy.c:1512
 msgid "New Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â »õ·Î ¸¸µé±â"
 
-#: src/buddy.c:1386
+#: src/buddy.c:1530
 msgid "Remove Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â Áö¿ì±â"
 
-#: src/buddy.c:1675
+#: src/buddy.c:1821
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "Ä£±¸ ºÙÀâ±â"
 
-#: src/buddy.c:1678
+#: src/buddy.c:1824
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1681
+#: src/buddy.c:1827
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1687
+#: src/buddy.c:1833
 #, fuzzy
 msgid "Get File"
 msgstr "ÆÄÀÏ"
 
-#: src/buddy.c:1690
+#: src/buddy.c:1836
 #, fuzzy
 msgid "Send File"
 msgstr "ÆÄÀÏ"
 
-#: src/buddy.c:1749
+#: src/buddy.c:1839
+msgid "Games"
+msgstr ""
+
+#: src/buddy.c:1842
+msgid "Stocks"
+msgstr ""
+
+#: src/buddy.c:1894
+#, fuzzy, c-format
+msgid "Logged in: %s\n"
+msgstr "%s ¿¡ Á¢¼Ó\n"
+
+#: src/buddy.c:1905
 msgid "Warnings: %d%%\n"
 msgstr "ÁÖÀÇ: %d%%\n"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1917
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1758
+#: src/buddy.c:1921
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
 "Screen Name: %s\n"
-"Logged in: %s\n"
-"%s%s%s%s%s"
+"%s%s%s%s%s%s"
 msgstr ""
 "À̸§: %s                \n"
 "·Î±×ÀÎ ÇÑ ¶§: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1761
+#: src/buddy.c:1925
 msgid "Idle: "
 msgstr "³î±â: "
 
-#: src/buddy.c:1828
+#: src/buddy.c:1995
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
-#: src/buddy.c:1878
+#: src/buddy.c:2047
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s °¡ ·Î±×¾Æ¿ô ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
-#: src/buddy.c:2028
+#: src/buddy.c:2211
 msgid "Information on selected Buddy"
 msgstr "¼±ÅÃÇÑ Ä£±¸¿¡ ´ëÇÑ Á¤º¸"
 
-#: src/buddy.c:2029 src/dialogs.c:657
+#: src/buddy.c:2212 src/dialogs.c:663
 msgid "Send Instant Message"
 msgstr "¸Þ½ÃÁö º¸³»±â"
 
-#: src/buddy.c:2030
+#: src/buddy.c:2213
 msgid "Start/join a Buddy Chat"
 msgstr "äÆà ½ÃÀÛ/Âü°¡"
 
-#: src/buddy.c:2088
+#: src/buddy.c:2277
 msgid "File"
 msgstr "ÆÄÀÏ"
 
-#: src/buddy.c:2092 src/buddy.c:2093
+#: src/buddy.c:2281
 msgid "Add A Buddy"
 msgstr "Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:2094
+#: src/buddy.c:2283
 #, fuzzy
 msgid "Join A Chat"
 msgstr "äÆÿ¡ Âü°¡"
 
-#: src/buddy.c:2095
+#: src/buddy.c:2285
 #, fuzzy
 msgid "New Instant Message"
 msgstr "¸Þ½ÃÁö º¸³»±â"
 
-#: src/buddy.c:2097
+#: src/buddy.c:2290
 msgid "Import Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï °¡Á®¿À±â"
 
-#: src/buddy.c:2098
+#: src/buddy.c:2292
 msgid "Export Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï ³»º¸³»±â"
 
-#: src/buddy.c:2103
-msgid "Quit"
-msgstr "³¡³»±â"
-
-#: src/buddy.c:2105 src/buddy_chat.c:556 src/buddy_chat.c:818
-#: src/buddy_chat.c:841 src/conversation.c:1736 src/dialogs.c:425
-#: src/multi.c:709 src/plugins.c:314 src/prefs.c:1844
-msgid "Close"
-msgstr "´Ý±â"
-
-#: src/buddy.c:2110
+#: src/buddy.c:2308
 msgid "Tools"
 msgstr "µµ±¸"
 
-#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
-msgid "Away"
-msgstr "Àá¼ö"
-
-#: src/buddy.c:2120
+#: src/buddy.c:2318
 msgid "Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â"
 
-#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
+#: src/buddy.c:2327 src/dialogs.c:2039 src/dialogs.c:2206
 msgid "Search for Buddy"
 msgstr "Ä£±¸ ã±â"
 
-#: src/buddy.c:2131
+#: src/buddy.c:2330
 msgid "by Email"
 msgstr "¸ÞÀÏ·Î"
 
-#: src/buddy.c:2135
+#: src/buddy.c:2334
 msgid "by Dir Info"
 msgstr "µð·ºÅ丮 Á¤º¸·Î"
 
-#: src/buddy.c:2142 src/buddy.c:2143
+#: src/buddy.c:2341 src/buddy.c:2342
 msgid "Settings"
 msgstr "¼³Á¤"
 
-#: src/buddy.c:2146
+#: src/buddy.c:2345
 msgid "User Info"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: src/buddy.c:2150 src/dialogs.c:1353
+#: src/buddy.c:2349 src/dialogs.c:1326
 msgid "Directory Info"
 msgstr "µð·ºÅ丮 Á¤º¸"
 
-#: src/buddy.c:2154 src/dialogs.c:1592
+#: src/buddy.c:2353 src/dialogs.c:1517
 msgid "Change Password"
 msgstr "Æнº¿öµå ¹Ù²Ù±â"
 
-#: src/buddy.c:2171
+#: src/buddy.c:2362
+#, fuzzy
+msgid "Protocol Actions"
+msgstr "¿É¼Ç"
+
+#: src/buddy.c:2369
+msgid "View System Log"
+msgstr ""
+
+#: src/buddy.c:2380
 #, fuzzy
 msgid "Perl"
 msgstr "Çã¿ë"
 
-#: src/buddy.c:2174
+#: src/buddy.c:2383
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2178
+#: src/buddy.c:2387
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2182
+#: src/buddy.c:2391
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2190
+#: src/buddy.c:2399
 msgid "Help"
 msgstr "µµ¿ò¸»"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2404
 #, fuzzy
 msgid "About Gaim"
 msgstr "GAIM ˼"
 
-#: src/buddy.c:2214 src/prefs.c:2053
+#: src/buddy.c:2423 src/prefs.c:2208
 msgid "Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2477
 msgid "Add a new Buddy"
 msgstr "»õ Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:2267
+#: src/buddy.c:2478
 #, fuzzy
 msgid "Add a new Group"
 msgstr "»õ Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:2268
+#: src/buddy.c:2479
 msgid "Remove selected Buddy"
 msgstr "¼±ÅÃÇÑ Ä£±¸ »©±â"
 
-#: src/buddy.c:2293
+#: src/buddy.c:2504
 msgid "Online"
 msgstr "¿¬°áÁß"
 
-#: src/buddy.c:2295
+#: src/buddy.c:2506
 msgid "Edit Buddies"
 msgstr "Ä£±¸ ÆíÁý"
 
-#: src/buddy.c:2332
+#: src/buddy.c:2543
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï"
 
-#: src/buddy_chat.c:135
+#: src/buddy_chat.c:156
 msgid "Join Chat"
 msgstr "äÆÿ¡ Âü°¡"
 
-#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
+#: src/buddy_chat.c:163 src/buddy_chat.c:917 src/buddy_chat.c:929
 msgid "Buddy Chat"
 msgstr "äÆÃ"
 
-#: src/buddy_chat.c:151
+#: src/buddy_chat.c:173
 msgid "Join what group:"
 msgstr "Âü°¡ÇÒ ±×·ìÀº:"
 
-#: src/buddy_chat.c:167
+#: src/buddy_chat.c:186
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "äÆÿ¡ Âü°¡"
 
-#: src/buddy_chat.c:181
+#: src/buddy_chat.c:198
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:189
+#: src/buddy_chat.c:205
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:197
+#: src/buddy_chat.c:213 src/buddy_chat.c:258 src/dialogs.c:402
+#: src/dialogs.c:682 src/dialogs.c:742 src/dialogs.c:870 src/dialogs.c:987
+#: src/dialogs.c:1240 src/dialogs.c:1450 src/dialogs.c:1578 src/dialogs.c:1643
+#: src/dialogs.c:1856 src/dialogs.c:2045 src/dialogs.c:2225 src/dialogs.c:2299
+#: src/dialogs.c:3163 src/dialogs.c:3397 src/dialogs.c:3489 src/dialogs.c:3676
+#: src/multi.c:463 src/multi.c:574 src/multi.c:821 src/prpl.c:156
+#: src/prpl.c:227
+msgid "Cancel"
+msgstr "Ãë¼Ò"
+
+#: src/buddy_chat.c:218
 msgid "Join"
 msgstr "Âü°¡"
 
-#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
+#: src/buddy_chat.c:259 src/buddy_chat.c:855 src/buddy_chat.c:984
 msgid "Invite"
 msgstr "ÃÊ´ë"
 
-#: src/buddy_chat.c:261
+#: src/buddy_chat.c:275
 msgid "Invite who?"
 msgstr "´©±¼ ÃÊ´ëÇÒ±î¿ä?"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:279
 msgid "With message:"
 msgstr "¸Þ½ÃÁö´Â:"
 
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:303
 msgid "Invite to Buddy Chat"
 msgstr "äÆÿ¡ ÃÊ´ë"
 
-#: src/buddy_chat.c:420
+#: src/buddy_chat.c:480 src/buddy_chat.c:808
+msgid "Ignore"
+msgstr "¹«½Ã"
+
+#: src/buddy_chat.c:532 src/buddy_chat.c:638
+#, c-format
+msgid "%d %s in room"
+msgstr ""
+
+#: src/buddy_chat.c:539
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:459
+#: src/buddy_chat.c:602
+#, c-format
+msgid "<B>%s is now known as %s</B>"
+msgstr ""
+
+#: src/buddy_chat.c:645
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:559 src/buddy_chat.c:816
+#: src/buddy_chat.c:785
+msgid "0 people in room"
+msgstr ""
+
+#: src/buddy_chat.c:860 src/buddy_chat.c:983
 msgid "Whisper"
 msgstr "±Ó¼Ó¸»"
 
-#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
-#: src/conversation.c:1733
+#: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
+#: src/conversation.c:2084
 msgid "Send"
 msgstr "º¸³»±â"
 
-#: src/buddy_chat.c:563
-msgid "Ignore"
-msgstr "¹«½Ã"
-
-#: src/buddy_chat.c:849 src/conversation.c:1741
+#: src/buddy_chat.c:1021 src/conversation.c:2061
 msgid "Block"
 msgstr "Â÷´Ü"
 
-#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
-#: src/dialogs.c:345 src/rvous.c:695
+#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/dialogs.c:397
 msgid "Warn"
 msgstr "ÁÖÀÇ"
 
-#: src/conversation.c:426
+#: src/conversation.c:352
+#, fuzzy
+msgid "Gaim - Save Conversation"
+msgstr "Gaim - ´ëÈ­ ·Î±ë"
+
+#: src/conversation.c:484
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "'%s' ¸¦ Ä£±¸ ¸ñ·Ï¿¡¼­ »®´Ï´Ù.\n"
 
-#: src/conversation.c:902
+#: src/conversation.c:1044
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "ÇöÀç %d ¿¡ ÀÖ½À´Ï´Ù\n"
 
-#: src/conversation.c:911
+#: src/conversation.c:1052
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "À§Ä¡¸¦ %d ·Î ¿Å±é´Ï´Ù\n"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1574
 msgid "Bold"
 msgstr "±½°Ô"
 
-#: src/conversation.c:1497 src/prefs.c:818
+#: src/conversation.c:1574 src/prefs.c:974
 msgid "Bold Text"
 msgstr "±½Àº ±Û¾¾"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1578 src/conversation.c:1579
 msgid "Italics"
 msgstr "±â¿ïÀÓ"
 
-#: src/conversation.c:1501 src/prefs.c:819
+#: src/conversation.c:1578 src/prefs.c:975
 msgid "Italics Text"
 msgstr "±â¿ïÀÎ ±Û¾¾"
 
-#: src/conversation.c:1505 src/conversation.c:1506
+#: src/conversation.c:1582 src/conversation.c:1583
 msgid "Underline"
 msgstr "¹ØÁÙ"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1582
 msgid "Underline Text"
 msgstr "¹ØÁÙÄ£ ±Û¾¾"
 
-#: src/conversation.c:1509 src/conversation.c:1510
+#: src/conversation.c:1587
 msgid "Strike"
 msgstr "°¡¿îµ¥ÁÙ"
 
-#: src/conversation.c:1509
+#: src/conversation.c:1587
 msgid "Strike through Text"
 msgstr "°¡¿îµ¥ÁÙÄ£ ±Û¾¾"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Small"
 msgstr "ÀÛ°Ô"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Decrease font size"
 msgstr "±Û¾¾ Å©±â ÁÙÀ̱â"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal"
 msgstr "º¸Åë"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal font size"
 msgstr "º¸Åë ±Û¾¾ Å©±â"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Big"
 msgstr "Å©°Ô"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Increase font size"
 msgstr "±Û¾¾ Å©±â Å°¿ì±â"
 
-#: src/conversation.c:1526 src/conversation.c:1527
+#: src/conversation.c:1606 src/conversation.c:1607
 msgid "Font"
 msgstr "±Û²Ã"
 
-#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
+#: src/conversation.c:1606 src/dialogs.c:2648 src/dialogs.c:2664
 msgid "Select Font"
 msgstr "±Û²Ã ¼±ÅÃ"
 
-#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
-#: src/conversation.c:1535
+#: src/conversation.c:1610 src/conversation.c:1611 src/conversation.c:1615
 msgid "Color"
 msgstr "»ö±ò"
 
-#: src/conversation.c:1530 src/prefs.c:832
+#: src/conversation.c:1610 src/prefs.c:988
 msgid "Text Color"
 msgstr "±Û¾¾ »ö±ò"
 
-#: src/conversation.c:1534 src/prefs.c:849
+#: src/conversation.c:1615 src/prefs.c:1006
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1541 src/conversation.c:1542
+#: src/conversation.c:1622 src/conversation.c:1623
 msgid "Link"
 msgstr "¿¬°á"
 
-#: src/conversation.c:1541 src/dialogs.c:2391
+#: src/conversation.c:1622 src/dialogs.c:2293
 msgid "Insert Link"
 msgstr "¿¬°á ³Ö±â"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 #, fuzzy
 msgid "Smiley"
 msgstr "ÆÄÀÏ"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1552 src/conversation.c:1553
+#: src/conversation.c:1633 src/conversation.c:1634 src/prefs.c:2195
 msgid "Logging"
 msgstr "·Î±ë"
 
-#: src/conversation.c:1552
+#: src/conversation.c:1633
 msgid "Enable logging"
 msgstr "·Î±ë Çϱâ"
 
-#: src/conversation.c:1556 src/conversation.c:1557
+#: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+msgid "Save"
+msgstr "ÀúÀå"
+
+#: src/conversation.c:1643
+#, fuzzy
+msgid "Save Conversation"
+msgstr "¸ðµç ´ëÈ­¸¦ ·Î±ë"
+
+#: src/conversation.c:1648 src/conversation.c:1649
 msgid "Sound"
 msgstr "¼Ò¸®"
 
-#: src/conversation.c:1556
+#: src/conversation.c:1648
 msgid "Enable sounds"
 msgstr "¼Ò¸® µé¸®°Ô"
 
-#: src/conversation.c:1768
+#: src/conversation.c:1928
+#, fuzzy
+msgid "Gaim - Conversations"
+msgstr "Gaim - ´ëÈ­ ·Î±ë"
+
+#: src/conversation.c:2003
 #, fuzzy
 msgid "Send message as: "
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¶§ ¼Ò¸® ³»±â"
 
-#: src/dialogs.c:360
+#: src/dialogs.c:359
+msgid "Gaim - Warn user?"
+msgstr "Gaim - »ç¿ëÀÚ¿¡°Ô ÁÖÀÇ º¸³»±â"
+
+#: src/dialogs.c:380
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "%s ¿¡°Ô Á¤¸»·Î ÁÖÀǸ¦ º¸³»½Ã·Æ´Ï±î?"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:385
 msgid "Warn anonymously?"
 msgstr "ÁÖÀǸ¦ À͸íÀ¸·Î º¸³¾±î¿ä?"
 
-#: src/dialogs.c:367
+#: src/dialogs.c:389
 msgid "Anonymous warnings are less harsh."
 msgstr "À͸íÀÇ ÁÖÀÇ°¡ ´ú °Å½½¸± ¼ö ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:393
-msgid "Gaim - Warn user?"
-msgstr "Gaim - »ç¿ëÀÚ¿¡°Ô ÁÖÀÇ º¸³»±â"
-
-#: src/dialogs.c:458
+#: src/dialogs.c:465
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%s ÆÄÀÏ¿¡ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:461
+#: src/dialogs.c:468
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:464
+#: src/dialogs.c:471
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±æ¾î¼­ ¸¶Áö¸· %s ¹ÙÀÌÆ®°¡ ©·È½À´Ï´Ù."
 
-#: src/dialogs.c:467
+#: src/dialogs.c:474
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ´Â ÇöÀç ·Î±×ÀÎÇÏÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:477
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s ¿¡°Ô ÁÖÀǸ¦ º¸³»´Â °ÍÀº Çã¿ëµÇÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:480
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "¼­¹öÀÇ ¼ÓµµÇѰ踦 ³Ñ¾ú±â ¶§¹®¿¡ ¸Þ½ÃÁö¸¦ ¹ö·È½À´Ï´Ù."
 
-#: src/dialogs.c:476
+#: src/dialogs.c:483
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s ¿¡ äÆà Âü°¡¸¦ ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:479
+#: src/dialogs.c:486
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "%s ¿¡°Ô ³Ê¹« »¡¸® ¸Þ½ÃÁö¸¦ º¸³»°í ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:482
+#: src/dialogs.c:489
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« Ä¿¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/dialogs.c:485
+#: src/dialogs.c:492
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« »¡¶ó¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/dialogs.c:488
+#: src/dialogs.c:495
 msgid "Failure."
 msgstr "½ÇÆÐ."
 
-#: src/dialogs.c:491
+#: src/dialogs.c:498
 msgid "Too many matches."
 msgstr "ÇØ´ç Ç׸ñÀÌ ³Ê¹« ¸¹½À´Ï´Ù."
 
-#: src/dialogs.c:494
+#: src/dialogs.c:501
 msgid "Need more qualifiers."
 msgstr "´õ »ó¼¼È÷ ÁöÁ¤ÇϽʽÿä."
 
-#: src/dialogs.c:497
+#: src/dialogs.c:504
 msgid "Dir service temporarily unavailable."
 msgstr "µð·ºÅ丮 ¼­ºñ½º¸¦ ÀϽÃÀûÀ¸·Î »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:500
+#: src/dialogs.c:507
 msgid "Email lookup restricted."
 msgstr "¸ÞÀÏ Ã£¾Æº¸±â¿¡ Á¦¾àÀÌ ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:503
+#: src/dialogs.c:510
 msgid "Keyword ignored."
 msgstr "Å°¿öµå°¡ ¹«½ÃµÇ¾ú½À´Ï´Ù."
 
-#: src/dialogs.c:506
+#: src/dialogs.c:513
 msgid "No keywords."
 msgstr "Å°¿öµå°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:516
 msgid "User has no directory information."
 msgstr "»ç¿ëÀÚ°¡ µð·ºÅ丮 Á¤º¸¸¦ °®°í ÀÖÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:513
+#: src/dialogs.c:520
 msgid "Country not supported."
 msgstr "±¹°¡´Â Áö¿øµÇÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:516
+#: src/dialogs.c:523
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "¾Ë ¼ö ¾ø´Â ½ÇÆÐ: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:519 src/oscar.c:471
+#: src/dialogs.c:526 src/oscar.c:523
 msgid "Incorrect nickname or password."
 msgstr "À̸§À̳ª Æнº¿öµå°¡ Ʋ·È½À´Ï´Ù."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:529
 msgid "The service is temporarily unavailable."
 msgstr "Àá½Ã ¼­ºñ½º°¡ »ç¿ëºÒ°¡´ÉÇÕ´Ï´Ù."
 
-#: src/dialogs.c:525
+#: src/dialogs.c:532
 msgid "Your warning level is currently too high to log in."
 msgstr "´ç½ÅÀº ÁÖÀÇ ¼öÁØÀÌ ³ô¾î¼­ ·Î±×ÀÎ ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:528
+#: src/dialogs.c:535
 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."
@@ -690,535 +827,538 @@
 "´ç½ÅÀº ³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°íÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã "
 "½ÃµµÇϽʽÿä. °è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
-#: src/dialogs.c:531
+#: src/dialogs.c:538
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Á¢¼Ó Áß¿¡ ¾Ë ¼ö ¾ø´Â ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù: %s."
 
-#: src/dialogs.c:534
+#: src/dialogs.c:541
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù, %d °¡ ¹ß»ýÇÏ¿´½À´Ï´Ù.  Á¤º¸´Â: %s"
 
-#: src/dialogs.c:537
+#: src/dialogs.c:544
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - ¿À·ù %d"
 
 #. Build OK Button
-#: src/dialogs.c:596 src/dialogs.c:661 src/dialogs.c:736 src/dialogs.c:1172
-#: src/dialogs.c:1659 src/dialogs.c:1806 src/dialogs.c:2140 src/dialogs.c:2310
-#: src/dialogs.c:2396 src/multi.c:499
+#: src/dialogs.c:603 src/dialogs.c:687 src/dialogs.c:747 src/dialogs.c:1245
+#: src/dialogs.c:1583 src/dialogs.c:1696 src/dialogs.c:2044 src/dialogs.c:2230
+#: src/dialogs.c:2298 src/multi.c:467
 msgid "OK"
 msgstr "È®ÀÎ"
 
-#: src/dialogs.c:671
+#: src/dialogs.c:653
+msgid "Gaim - IM user"
+msgstr "Gaim - ÀνºÅÏÆ® ¸Þ½ÅÀú »ç¿ëÀÚ"
+
+#: src/dialogs.c:670
 #, fuzzy
 msgid "IM who:"
 msgstr "ÀνºÅÏÆ® ¸Þ½ÅÀú »ç¿ëÀÚ: "
 
-#: src/dialogs.c:695
-msgid "Gaim - IM user"
-msgstr "Gaim - ÀνºÅÏÆ® ¸Þ½ÅÀú »ç¿ëÀÚ"
-
-#: src/dialogs.c:732
+#: src/dialogs.c:718
 #, fuzzy
 msgid "Get User Info"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: src/dialogs.c:746
+#: src/dialogs.c:725
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:770
+#. Finish up
+#: src/dialogs.c:753
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - »ç¿ëÀÚ Á¤º¸ ¼³Á¤"
 
-#: src/dialogs.c:845
+#: src/dialogs.c:823
 msgid "Buddies"
 msgstr "Ä£±¸"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:876
 #, fuzzy
 msgid "Add Group"
 msgstr "±×·ì"
 
-#: src/dialogs.c:928
+#: src/dialogs.c:906
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:957
+#: src/dialogs.c:933
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:967
+#: src/dialogs.c:947
 msgid "Add Buddy"
 msgstr "Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:979 src/dialogs.c:3443
+#: src/dialogs.c:957 src/dialogs.c:3405 src/dialogs.c:3497
 msgid "Buddy"
 msgstr "Ä£±¸"
 
-#: src/dialogs.c:1109
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Please enter a buddy to pounce."
+msgstr "À̸§À» ÀÔ·ÂÇϼ¼¿ä"
+
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Buddy Pounce Error"
+msgstr "Ä£±¸ ºÙÀâ±â"
+
+#: src/dialogs.c:1076
 #, fuzzy
 msgid "Pounce buddy as:"
 msgstr "Ä£±¸°¡ µé¾î¿À¸é ¼Ò¸® ³»±â"
 
-#: src/dialogs.c:1181
+#: src/dialogs.c:1126
+msgid "Gaim - New Buddy Pounce"
+msgstr "Gaim - ºÙÀâÀ» Ä£±¸ »õ·Î ¸¸µé±â"
+
+#: src/dialogs.c:1143
 #, fuzzy
 msgid "Buddy:"
 msgstr "Ä£±¸"
 
+#: src/dialogs.c:1158
+msgid "Pounce on sign on"
+msgstr ""
+
+#: src/dialogs.c:1163
+msgid "Pounce on return from away"
+msgstr ""
+
+#: src/dialogs.c:1167
+msgid "Pounce on return from idle"
+msgstr ""
+
+#: src/dialogs.c:1175
+#, fuzzy
+msgid "Open IM window on pounce"
+msgstr "Ä£±¸°¡ Á¢¼ÓÇÒ ¶§ ¸Þ½ÃÁö â ¿­±â"
+
+#: src/dialogs.c:1180
+#, fuzzy
+msgid "Send IM on pounce"
+msgstr "Ä£±¸°¡ Á¢¼ÓÇÒ ¶§ ¸Þ½ÃÁö º¸³»±â"
+
 #: src/dialogs.c:1189
 #, fuzzy
 msgid "Message:"
 msgstr "¸Þ½ÃÁö ¸¸µé±â"
 
-#: src/dialogs.c:1196 src/prefs.c:2100
-msgid "Events"
-msgstr ""
-
-#. Set up the different options
 #: src/dialogs.c:1201
-msgid "Pounce on sign on"
-msgstr ""
-
-#: src/dialogs.c:1203
-msgid "Pounce on return from away"
-msgstr ""
-
-#: src/dialogs.c:1204
-msgid "Pounce on return from idle"
-msgstr ""
-
-#: src/dialogs.c:1226
 #, fuzzy
-msgid "Actions"
-msgstr "¿É¼Ç"
-
-#. And now the other stuff
-#: src/dialogs.c:1231
-#, fuzzy
-msgid "Open IM window on pounce"
-msgstr "Ä£±¸°¡ Á¢¼ÓÇÒ ¶§ ¸Þ½ÃÁö â ¿­±â"
-
-#: src/dialogs.c:1234
-#, fuzzy
-msgid "Send IM on pounce"
+msgid "Execute command on pounce"
 msgstr "Ä£±¸°¡ Á¢¼ÓÇÒ ¶§ ¸Þ½ÃÁö º¸³»±â"
 
-#: src/dialogs.c:1263
-msgid "Gaim - New Buddy Pounce"
-msgstr "Gaim - ºÙÀâÀ» Ä£±¸ »õ·Î ¸¸µé±â"
-
-#. Build Save Button
-#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
-msgid "Save"
-msgstr "ÀúÀå"
-
-#: src/dialogs.c:1376
+#: src/dialogs.c:1210
+msgid "Command:"
+msgstr ""
+
+#: src/dialogs.c:1227
+msgid "Save this pounce after activation"
+msgstr ""
+
+#: src/dialogs.c:1316
+msgid "Gaim - Set Dir Info"
+msgstr "Gaim - µð·ºÅ丮 Á¤º¸ ¼³Á¤"
+
+#: src/dialogs.c:1348
 msgid "Allow Web Searches To Find Your Info"
 msgstr "À¥À» ÅëÇÏ¿© ³ªÀÇ Á¤º¸¸¦ °Ë»öÇÒ ¼ö ÀÖµµ·Ï Çã¿ë"
 
 #. Line 1
-#: src/dialogs.c:1379 src/dialogs.c:2159
+#: src/dialogs.c:1351 src/dialogs.c:2063
 msgid "First Name"
 msgstr "À̸§"
 
 #. Line 2
-#: src/dialogs.c:1390 src/dialogs.c:2171
+#: src/dialogs.c:1362 src/dialogs.c:2075
 msgid "Middle Name"
 msgstr "Áß°£ À̸§"
 
 #. Line 3
-#: src/dialogs.c:1402 src/dialogs.c:2183
+#: src/dialogs.c:1374 src/dialogs.c:2087
 msgid "Last Name"
 msgstr "¼º"
 
 #. Line 4
-#: src/dialogs.c:1413 src/dialogs.c:2195
+#: src/dialogs.c:1385 src/dialogs.c:2099
 msgid "Maiden Name"
 msgstr "ó³à½ÃÀý À̸§"
 
 #. Line 5
-#: src/dialogs.c:1424 src/dialogs.c:2207
+#: src/dialogs.c:1396 src/dialogs.c:2111
 msgid "City"
 msgstr "±º/±¸"
 
 #. Line 6
-#: src/dialogs.c:1435 src/dialogs.c:2218
+#: src/dialogs.c:1407 src/dialogs.c:2122
 msgid "State"
 msgstr "½Ã/µµ"
 
 #. Line 7
-#: src/dialogs.c:1446 src/dialogs.c:2229
+#: src/dialogs.c:1418 src/dialogs.c:2133
 msgid "Country"
 msgstr "±¹°¡"
 
-#: src/dialogs.c:1490
-msgid "Gaim - Set Dir Info"
-msgstr "Gaim - µð·ºÅ丮 Á¤º¸ ¼³Á¤"
-
-#: src/dialogs.c:1507
+#: src/dialogs.c:1473
 msgid "New Passwords Do Not Match"
 msgstr "»õ ¾ÏÈ£°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/dialogs.c:1507 src/dialogs.c:1512
+#: src/dialogs.c:1473 src/dialogs.c:1478
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ¾ÏÈ£ º¯°æ ½ÇÆÐ"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1478
 msgid "Fill out all fields completely"
 msgstr "¸ðµç Ç׸ñÀ» ¿ÏÀüÈ÷ ä¿ì½Ê½Ã¿ä"
 
-#: src/dialogs.c:1541
-#, fuzzy
-msgid "Change password for:"
-msgstr "Æнº¿öµå ¹Ù²Ù±â"
-
-#: src/dialogs.c:1580 src/toc.c:515
+#: src/dialogs.c:1505 src/toc.c:560
 msgid "Gaim - Password Change"
 msgstr "Gaim - ¾ÏÈ£ º¯°æ"
 
-#: src/dialogs.c:1612
+#: src/dialogs.c:1536
 msgid "Original Password"
 msgstr "¿ø·¡ ¾ÏÈ£"
 
-#: src/dialogs.c:1626
+#: src/dialogs.c:1550
 msgid "New Password"
 msgstr "»õ ¾ÏÈ£"
 
-#: src/dialogs.c:1640
+#: src/dialogs.c:1564
 msgid "New Password (again)"
 msgstr "»õ ¾ÏÈ£ (Çѹø´õ)"
 
-#: src/dialogs.c:1693
-msgid "Set info for:"
-msgstr ""
-
-#: src/dialogs.c:1776
+#: src/dialogs.c:1609
 msgid "Gaim - Set User Info"
 msgstr "Gaim - »ç¿ëÀÚ Á¤º¸ ¼³Á¤"
 
-#: src/dialogs.c:1817
+#: src/dialogs.c:1707
 msgid "Below are the results of your search: "
 msgstr "°Ë»öÀÇ °á°ú´Â ´ÙÀ½°ú °°½À´Ï´Ù: "
 
-#: src/dialogs.c:1943 src/dialogs.c:1950
+#: src/dialogs.c:1846 src/dialogs.c:1853
 msgid "Permit"
 msgstr "Çã¿ë"
 
-#: src/dialogs.c:1945 src/dialogs.c:1952
+#: src/dialogs.c:1848 src/dialogs.c:1855
 msgid "Deny"
 msgstr "°ÅºÎ"
 
-#: src/dialogs.c:1993
+#: src/dialogs.c:1896
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Çã¿ë/°ÅºÎ ¸ñ·Ï¿¡ ´õÇϱâ"
 
-#: src/dialogs.c:1995
+#: src/dialogs.c:1898
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Çã¿ë/°ÅºÎ ¸ñ·Ï¿¡ ´õÇϱâ"
 
-#: src/dialogs.c:2057
+#: src/dialogs.c:1960
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ´ëÈ­ ·Î±ë"
 
-#: src/dialogs.c:2266
+#: src/dialogs.c:2170
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Á¤º¸·Î Ä£±¸ ã±â"
 
-#: src/dialogs.c:2315
-msgid "Email"
-msgstr "¸ÞÀÏ"
-
-#: src/dialogs.c:2328
+#: src/dialogs.c:2200
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ¸ÞÀϷΠģ±¸ ã±â"
 
-#: src/dialogs.c:2410
+#: src/dialogs.c:2213
+msgid "Email"
+msgstr "¸ÞÀÏ"
+
+#: src/dialogs.c:2312
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2320
 msgid "Description"
 msgstr "¼³¸í"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2346
 msgid "GAIM - Add URL"
 msgstr "GAIM - URL ´õÇϱâ"
 
-#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
+#: src/dialogs.c:2487 src/dialogs.c:2500 src/dialogs.c:2537
 msgid "Select Text Color"
 msgstr "±Û¾¾ »ö±ò ¼±ÅÃ"
 
-#: src/dialogs.c:2624
+#: src/dialogs.c:2524
 #, fuzzy
 msgid "Select Background Color"
 msgstr "±Û¾¾ »ö±ò ¼±ÅÃ"
 
-#: src/dialogs.c:2847 src/rvous.c:265
+#: src/dialogs.c:2769
 #, c-format
 msgid "Error writing file %s"
 msgstr "%s ÆÄÀÏ¿¡ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
-#: src/rvous.c:548
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
+#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "¿À·ù"
 
-#: src/dialogs.c:2901
+#: src/dialogs.c:2823
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï ³»º¸³»±â"
 
-#: src/dialogs.c:2967 src/rvous.c:547
+#: src/dialogs.c:2891
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: src/dialogs.c:3045
+#: src/dialogs.c:2967
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï °¡Á®¿À±â"
 
-#: src/dialogs.c:3124
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3030
+msgid "You cannot create an away message with a blank title"
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3037
+msgid "You cannot create an empty away message"
+msgstr ""
+
+#: src/dialogs.c:3104
 msgid "Gaim - New away message"
 msgstr "Gaim - Àá¼ö ¸Þ½ÃÁö »õ·Î ¸¸µé±â"
 
-#. Put frame and button-box in the toplevel
-#: src/dialogs.c:3136
+#: src/dialogs.c:3114
 #, fuzzy
 msgid "New away message"
 msgstr "»õ·Î¿î Àá¼ö ¸Þ½ÃÁö"
 
-#: src/dialogs.c:3149
+#: src/dialogs.c:3127
 msgid "Away title: "
 msgstr "Á¦¸ñ: "
 
-#. Checkbox for showing away msg
-#: src/dialogs.c:3193
+#: src/dialogs.c:3167
 #, fuzzy
-msgid "Make Away Now"
-msgstr "Áö±Ý ¹Ù·Î Àá¼ö"
+msgid "Use"
+msgstr "GAIM À» »ç¿ë"
+
+#: src/dialogs.c:3171
+msgid "Save & Use"
+msgstr ""
 
 #. show everything
-#: src/dialogs.c:3370
+#: src/dialogs.c:3340
 #, fuzzy
 msgid "Smile!"
 msgstr "ÆÄÀÏ"
 
-#: src/dialogs.c:3441
+#: src/dialogs.c:3403 src/dialogs.c:3495
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:3478
+#: src/dialogs.c:3440 src/dialogs.c:3532
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Ä£±¸ ´õÇϱâ"
 
-#: src/gnome_applet_mgr.c:95
+#: src/dialogs.c:3604
+#, fuzzy
+msgid "Gaim - Save Log File"
+msgstr "Gaim - »õ À̸§À¸·Î ÀúÀå"
+
+#: src/dialogs.c:3635
+#, fuzzy, c-format
+msgid "Unable to remove file %s - %s"
+msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö°¡ ¾ø½À´Ï´Ù."
+
+#: src/dialogs.c:3666
+msgid "Really clear log?"
+msgstr ""
+
+#: src/dialogs.c:3684
+#, fuzzy
+msgid "Okay"
+msgstr "È®ÀÎ"
+
+#: src/dialogs.c:3781
+#, fuzzy
+msgid "Clear"
+msgstr "´Ý±â"
+
+#: src/gaimrc.c:870
 #, c-format
-msgid "file not found: %s\n"
-msgstr "ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù: %s\n"
-
-#: src/gnome_applet_mgr.c:121
-msgid "Offilne. Click to bring up login box."
-msgstr "Á¢¼ÓµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù. Ŭ¸¯ÇÏ¸é ·Î±×ÀÎ È­¸éÀÌ ³ª¿É´Ï´Ù."
-
-#: src/gnome_applet_mgr.c:128
-msgid "Attempting to sign on...."
-msgstr "Á¢¼ÓÀ» ½ÃµµÇÕ´Ï´Ù...."
-
-#: src/gnome_applet_mgr.c:254
-msgid "GAIM"
-msgstr "GAIM"
-
-#: src/gnome_applet_mgr.c:366
-msgid "Can't create GAIM applet!"
-msgstr "GAIM ¾ÖÇø´À» ¸¸µé ¼ö ¾ø½À´Ï´Ù!"
-
-#: src/gnome_applet_mgr.c:397
-msgid "Offline"
-msgstr "²÷±è"
-
-#: src/gnome_applet_mgr.c:411
-msgid "Font does not exist"
-msgstr "±Û²ÃÀÌ ¾ø½À´Ï´Ù"
-
-#: src/gnome_applet_mgr.c:427
-msgid "About..."
-msgstr "...¿¡ ´ëÇÏ¿©"
-
-#: src/gtkhtml.c:1383
-msgid "HTML Link:"
-msgstr "HTML ¿¬°á:"
-
-#: src/gtkhtml.c:1796
-msgid "Open URL in existing window"
-msgstr "ÇöÀç â¿¡¼­ URL ¿­±â"
-
-#: src/gtkhtml.c:1805
-msgid "Open URL in new window"
-msgstr "»õ â¿¡¼­ URL ¿­±â"
-
-#: src/gtkhtml.c:1813
-msgid "Add URL as bookmark"
-msgstr "Áñ°Üã±â¿¡ URL ´õÇϱâ"
-
-#: src/html.c:122 src/html.c:125
+msgid "Could not open config file %s."
+msgstr ""
+
+#: src/gaimrc.c:871
+#, fuzzy
+msgid "Preferences Error"
+msgstr "¼³Á¤"
+
+#: src/html.c:121 src/html.c:124
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ¿¬°á ¿À·ù.\n"
 
-#: src/html.c:158
+#: src/html.c:156
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "%d ¹ÙÀÌÆ®¸¦ %s ¿¡¼­ °¡Á®¿È"
 
-#: src/html.c:171
+#: src/html.c:169
 msgid "Getting Data"
 msgstr "µ¥ÀÌÅÍ °¡Á®¿À±â"
 
-#: src/html.c:204
+#: src/html.c:201
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "¹ÞÀº³»¿ë: '%s'\n"
 
-#: src/multi.c:367 src/prefs.c:112
+#: src/multi.c:345 src/prefs.c:114
 #, fuzzy
 msgid "General Options"
 msgstr "¿É¼Ç"
 
-#: src/multi.c:402
+#: src/multi.c:350
 #, fuzzy
 msgid "Screenname:"
 msgstr "È­¸éÀ̸§: "
 
-#: src/multi.c:414
+#: src/multi.c:359
 #, fuzzy
 msgid "Password:"
 msgstr "¾ÏÈ£: "
 
-#: src/multi.c:429
+#: src/multi.c:370
+msgid "Protocol:"
+msgstr ""
+
+#: src/multi.c:375
 msgid "Remember Password"
 msgstr "¾ÏÈ£ ÀúÀå"
 
-#: src/multi.c:430
+#: src/multi.c:376
 #, fuzzy
 msgid "Auto-Login"
 msgstr "ÀÚµ¿ ·Î±×ÀÎ"
 
-#: src/multi.c:431
+#: src/multi.c:377
 msgid "Send KeepAlive packet (6 bytes/second)"
 msgstr ""
 
-#: src/multi.c:473
+#: src/multi.c:442
 #, fuzzy
 msgid "Gaim - Modify Account"
 msgstr "Gaim - ·Î±×ÀÎ"
 
-#: src/multi.c:482
-msgid "Modify Account"
-msgstr ""
-
-#: src/multi.c:576
+#: src/multi.c:546
 #, fuzzy
 msgid "Enter Password"
 msgstr "»õ ¾ÏÈ£"
 
-#: src/multi.c:669
+#: src/multi.c:641
 #, fuzzy
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Ç÷¯±×ÀÎ ¸ñ·Ï"
 
-#: src/multi.c:678
-msgid "Account Editor"
-msgstr ""
-
-#: src/multi.c:697
+#: src/multi.c:662
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:701
+#: src/multi.c:666
 #, fuzzy
 msgid "Sign On/Off"
 msgstr "²÷±â"
 
-#: src/multi.c:705
+#: src/multi.c:670
 #, fuzzy
 msgid "Delete"
 msgstr "±Û²Ã ¼±ÅÃ"
 
-#: src/multi.c:851
+#: src/multi.c:837
 #, c-format
 msgid "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:300 src/oscar.c:317 src/toc.c:280 src/toc.c:290 src/toc.c:347
+#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "²÷¾îÁü."
 
-#: src/oscar.c:308
+#: src/oscar.c:302
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "Á¢¼Ó ¿À·ù!\n"
 
-#: src/oscar.c:316
+#: src/oscar.c:310
 #, fuzzy
 msgid "major connection error\n"
 msgstr "Á¢¼Ó ¿À·ù!\n"
 
-#: src/oscar.c:330 src/toc.c:500
+#: src/oscar.c:323 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:331
+#: src/oscar.c:324
 #, fuzzy
 msgid "Chat Error!"
 msgstr "¿À·ù"
 
-#: src/oscar.c:362
+#: src/oscar.c:334
+#, fuzzy
+msgid "Chat is currently unavailable"
+msgstr "%s ¿¡ äÆà Âü°¡¸¦ ÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/oscar.c:335
+#, fuzzy
+msgid "Gaim - Chat"
+msgstr "Gaim äÆÃ"
+
+#: src/oscar.c:382
 #, c-format
 msgid "Logging in %s\n"
 msgstr "%s ¿¡ Á¢¼Ó\n"
 
-#: src/oscar.c:399
+#: src/oscar.c:420
 msgid "internal connection error\n"
 msgstr "³»ºÎ Á¢¼Ó ¿À·ù\n"
 
-#: src/oscar.c:400
+#: src/oscar.c:421
 msgid "Unable to login to AIM"
 msgstr "AIM ¿¡ ·Î±×ÀÎÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/oscar.c:405
+#: src/oscar.c:426
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "È£½ºÆ®¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: src/oscar.c:409
+#: src/oscar.c:430
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "È£½ºÆ®¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: src/oscar.c:416
+#: src/oscar.c:437
 #, c-format
 msgid "Signon: %s"
 msgstr "Á¢¼Ó: %s"
 
-#: src/oscar.c:426
+#: src/oscar.c:447
 msgid "Password sent, waiting for response\n"
 msgstr "¾ÏÈ£¸¦ º¸³»°í ÀÀ´äÀ» ±â´Ù¸³´Ï´Ù\n"
 
-#: src/oscar.c:451
+#: src/oscar.c:474
 msgid "Signed off.\n"
 msgstr "Á¢¼Ó ²÷±â.\n"
 
 #. connecting too frequently
-#: src/oscar.c:466
+#: src/oscar.c:518
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1228,157 +1368,122 @@
 "½ÃµµÇϽʽÿä. °è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
 #. client too old
-#: src/oscar.c:476
+#: src/oscar.c:528
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:480 src/toc.c:303
+#: src/oscar.c:532 src/toc.c:341
 msgid "Authentication Failed"
 msgstr "ÀÎÁõ ½ÇÆÐ"
 
-#: src/oscar.c:513
+#: src/oscar.c:562
 msgid "Internal Error"
 msgstr "³»ºÎ ¿À·ù"
 
-#: src/oscar.c:520
+#: src/oscar.c:566
 msgid "Could Not Connect"
 msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/oscar.c:551
+#: src/oscar.c:600
 msgid "Connection established, cookie sent"
 msgstr "¿¬°áÇÏ°í ÄíÅ°¸¦ º¸³Â½À´Ï´Ù"
 
-#: src/oscar.c:787 src/oscar.c:1860
+#: src/oscar.c:843 src/oscar.c:2100
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
-#: src/oscar.c:862 src/rvous.c:333 src/rvous.c:470
-msgid "Gaim - File Transfer"
-msgstr "Gaim - ÆÄÀÏ Àü¼Û"
-
-#: src/oscar.c:866 src/rvous.c:454
-#, c-format
-msgid "Sending %s to %s"
-msgstr "%s ¸¦ %s ¿¡°Ô º¸³¿"
-
-#: src/oscar.c:898
-msgid "Error in transfer"
-msgstr ""
-
-#: src/oscar.c:959
-msgid "Transfer complete."
-msgstr ""
-
-#: src/oscar.c:1012
-#, fuzzy
-msgid "Error examining file"
-msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
-
-#: src/oscar.c:1012 src/oscar.c:1020 src/oscar.c:1043
-#, fuzzy
-msgid "GetFile Error"
-msgstr "Gaim - ¿À·ù %d"
-
-#: src/oscar.c:1020
-msgid "Could not open temporary file, aborting"
-msgstr ""
-
-#: src/oscar.c:1043
-#, fuzzy
-msgid "Error connecting for transfer"
-msgstr "¼ÒÄÏÀ» ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
-
-#: src/oscar.c:1065
-#, fuzzy
-msgid "Gaim - Send File..."
-msgstr "Gaim - »õ À̸§À¸·Î ÀúÀå"
-
 #. message too large
-#: src/oscar.c:1194
+#: src/oscar.c:1293
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« Ä¿¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/oscar.c:1195 src/oscar.c:1200 src/oscar.c:1222 src/oscar.c:1241
-#: src/oscar.c:1266
-#, fuzzy
-msgid "Gaim - Error"
-msgstr "Gaim - ¿À·ù %d"
-
-#: src/oscar.c:1199
+#: src/oscar.c:1298
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1220
+#: src/oscar.c:1333
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1221 src/oscar.c:1240
+#: src/oscar.c:1334 src/oscar.c:1353
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1239
+#: src/oscar.c:1352
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1265
+#: src/oscar.c:1388
 #, c-format
-msgid "%s has no info/away message."
+msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1271
+#: src/oscar.c:1395
 msgid ""
-"Username : <B>%s</B>\n"
-"<BR>Warning Level : <B>%d %%</B>\n"
-"<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
+"Username : <B>%s</B>  %s <BR>\n"
+"Warning Level : <B>%d %%</B><BR>\n"
+"Online Since : <B>%s</B><BR>\n"
+"Idle Minutes : <B>%d</B>\n"
+"<BR>\n"
+"<HR><BR>\n"
+"%s<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
-"»ç¿ëÀÚ À̸§ : <B>%s</B>\n"
-"<BR>ÁÖÀÇ ¼öÁØ : <B>%d %%</B>\n"
-"<BR>Á¢¼ÓÇÑ ¶§ : <B>%s</B><BR>¸îºÐ° ³î°íÀÖ³ª : <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
-
-#: src/oscar.c:1305
+
+#: src/oscar.c:1430
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1306
+#: src/oscar.c:1431
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:1913
+#: src/oscar.c:2157
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s closed</B>"
 msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
-#: src/oscar.c:1958
+#: src/oscar.c:2216
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "AIM ¿¡ ·Î±×ÀÎÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/oscar.c:1967 src/toc.c:970
-#, fuzzy
-msgid "Get Info"
-msgstr "»ç¿ëÀÚ Á¤º¸"
-
-#: src/oscar.c:1974
+#: src/oscar.c:2226
+#, c-format
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+
+#: src/oscar.c:2243
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Àá¼ö ¸Þ½ÃÁö"
 
-#: src/oscar.c:1982
+#: src/oscar.c:2251
 #, fuzzy
 msgid "Direct IM"
 msgstr "µð·ºÅ丮 Á¤º¸"
 
+#: src/oscar.c:2443
+msgid ""
+"Unfortunately, currently Oscar only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
 #. Below is basically stolen from plugins.c
-#: src/perl.c:639
+#: src/perl.c:638
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - »ç¿ëÀÚ Á¤º¸ ¼³Á¤"
@@ -1387,563 +1492,728 @@
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:104
+#: src/plugins.c:105
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Ç÷¯±×ÀÎ ¸ñ·Ï"
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
+#: src/plugins.c:185 src/plugins.c:191 src/plugins.c:215
 msgid "Plugin Error"
 msgstr "Ç÷¯±×ÀÎ ¿À·ù"
 
-#: src/plugins.c:262
+#: src/plugins.c:261
 msgid "Gaim - Plugins"
 msgstr "Gaim - Ç÷¯±×ÀÎ"
 
 #. Build the bottom button bar
-#: src/plugins.c:294
+#: src/plugins.c:290
 msgid "Load Plugin"
 msgstr "Ç÷¯±×ÀÎ ¿Ã¸®±â"
 
-#: src/plugins.c:301
+#: src/plugins.c:296
 msgid "Configure Plugin"
 msgstr "Ç÷¯±×ÀÎ ¼³Á¤"
 
-#: src/plugins.c:307
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr "Ç÷¯±×ÀÎ ³»¸®±â"
 
-#: src/prefs.c:120 src/prefs.c:180 src/prefs.c:227 src/prefs.c:339
-#: src/prefs.c:425 src/prefs.c:814 src/prefs.c:900 src/prefs.c:1043
-#: src/prefs.c:1408 src/prefs.c:1649
+#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
+#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
+#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1761
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#.
-#. prefrem = gaim_button(_("Remember password"), &general_options, OPT_GEN_REMEMBER_PASS, box);
-#. gtk_signal_connect(GTK_OBJECT(prefrem), "destroy", GTK_SIGNAL_FUNC(remdes), 0);
-#. gaim_button(_("Auto-login"), &general_options, OPT_GEN_AUTO_LOGIN, box);
-#.
-#. sep = gtk_hseparator_new();
-#. gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-#. gtk_widget_show(sep);
-#.
-#: src/prefs.c:134
+#: src/prefs.c:126
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:135
+#: src/prefs.c:128
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:138
+#: src/prefs.c:132
 msgid "Show Debug Window"
 msgstr ""
 
+#: src/prefs.c:144
+#, fuzzy
+msgid "Report Idle Times:"
+msgstr "³î°í ÀÖ´Â ½Ã°£ º¸¿©ÁÖ±â"
+
+#: src/prefs.c:147
+msgid "None"
+msgstr ""
+
+#: src/prefs.c:148
+msgid "GAIM Use"
+msgstr "GAIM À» »ç¿ë"
+
 #: src/prefs.c:150
 #, fuzzy
-msgid "Report Idle Times:"
-msgstr "³î°í ÀÖ´Â ½Ã°£ º¸¿©ÁÖ±â"
-
-#: src/prefs.c:153
-msgid "None"
-msgstr ""
-
-#: src/prefs.c:154
-msgid "GAIM Use"
-msgstr "GAIM À» »ç¿ë"
-
-#: src/prefs.c:156
-#, fuzzy
 msgid "X Use"
 msgstr "GAIM À» »ç¿ë"
 
-#: src/prefs.c:172
+#: src/prefs.c:224
+#, fuzzy
+msgid "Browser Options"
+msgstr "¿É¼Ç"
+
+#: src/prefs.c:236
+msgid "Netscape"
+msgstr "³Ý½ºÄÉÀÌÇÁ"
+
+#: src/prefs.c:237
+msgid "KFM"
+msgstr ""
+
+#: src/prefs.c:239
+msgid "GNOME URL Handler"
+msgstr ""
+
+#: src/prefs.c:241
+msgid "Manual"
+msgstr "¼öµ¿"
+
+#: src/prefs.c:252
+msgid "Pop up new window by default"
+msgstr "±âº»À¸·Î »õ â ¿­±â"
+
+#: src/prefs.c:279
+#, fuzzy
+msgid "Logging Options"
+msgstr "%s ¿¡ Á¢¼Ó\n"
+
+#: src/prefs.c:291
+#, fuzzy
+msgid "Log all conversations"
+msgstr "¸ðµç ´ëÈ­¸¦ ·Î±ë"
+
+#: src/prefs.c:292
+#, fuzzy
+msgid "Strip HTML from logs"
+msgstr "·Î±× ÆÄÀÏ¿¡ HTML Àº »©°í ´ã±â"
+
+#: src/prefs.c:298
+msgid "Log when buddies sign on/sign off"
+msgstr ""
+
+#: src/prefs.c:299
+msgid "Log when buddies become idle/un-idle"
+msgstr ""
+
+#: src/prefs.c:300
+msgid "Log when buddies go away/come back"
+msgstr ""
+
+#: src/prefs.c:301
+msgid "Log your own signons/idleness/awayness (as set by options above)"
+msgstr ""
+
+#: src/prefs.c:302
+msgid "Individual log file for each buddy's signons"
+msgstr ""
+
+#: src/prefs.c:317
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Ä£±¸ ¸ñ·Ï"
 
-#: src/prefs.c:184
-msgid "Show numbers in groups"
-msgstr "±×·ì¿¡ Àοø Ç¥½Ã"
-
-#: src/prefs.c:185
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:186
-msgid "Show idle times"
-msgstr "³î°í ÀÖ´Â ½Ã°£ º¸¿©ÁÖ±â"
-
-#: src/prefs.c:187
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "Ä£±¸ Á¾·ù ±×¸² º¸¿©ÁÖ±â"
-
-#: src/prefs.c:193
-msgid "Hide IM/Info/Chat buttons"
-msgstr ""
-
-#: src/prefs.c:194
-msgid "Show pictures on buttons"
-msgstr ""
-
-#: src/prefs.c:200
+#: src/prefs.c:329
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "ÀϺΠâÀÇ Å©±â/À§Ä¡ ÀúÀå"
 
-#: src/prefs.c:202
+#: src/prefs.c:331
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "Ä£±¸ ¸ñ·ÏÀ» ÀÚµ¿À¸·Î º¸¿©ÁÜ"
 
-#: src/prefs.c:203
+#: src/prefs.c:333
 #, fuzzy
 msgid "Display Buddy List near applet"
 msgstr "Ä£±¸ ¸ñ·ÏÀº ¾ÖÇø´ ºÎ±Ù¿¡ Ç¥½Ã"
 
-#: src/prefs.c:219
+#: src/prefs.c:340
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:341
+msgid "Show numbers in groups"
+msgstr "±×·ì¿¡ Àοø Ç¥½Ã"
+
+#: src/prefs.c:347
+#, fuzzy
+msgid "Show buddy type icons"
+msgstr "Ä£±¸ Á¾·ù ±×¸² º¸¿©ÁÖ±â"
+
+#: src/prefs.c:348
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:349
+msgid "Show idle times"
+msgstr "³î°í ÀÖ´Â ½Ã°£ º¸¿©ÁÖ±â"
+
+#: src/prefs.c:355
+msgid "Hide IM/Info/Chat buttons"
+msgstr ""
+
+#: src/prefs.c:356
+msgid "Show pictures on buttons"
+msgstr ""
+
+#: src/prefs.c:371
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:231
+#: src/prefs.c:383
 msgid "Enter sends message"
 msgstr "¿£ÅÍÅ°¸¦ ´©¸£¸é ¸Þ½ÃÁö º¸³»±â"
 
-#: src/prefs.c:232
+#: src/prefs.c:384
+#, fuzzy
+msgid "Control-Enter sends message"
+msgstr "¿£ÅÍÅ°¸¦ ´©¸£¸é ¸Þ½ÃÁö º¸³»±â"
+
+#: src/prefs.c:385
+msgid "Escape closes window"
+msgstr ""
+
+#: src/prefs.c:386
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:233
+#: src/prefs.c:387
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:239
+#: src/prefs.c:388
+msgid "F2 toggles timestamp display"
+msgstr ""
+
+#: src/prefs.c:394
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "±Û¾¾±×¸²À» ±×¸²À¸·Î º¸¿©ÁÖ±â (½ÇÇè¼öÁØ)"
 
-#: src/prefs.c:240
+#: src/prefs.c:395
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "¸Þ½ÃÁö¿¡ ½Ã°£ Ç¥½Ã"
 
-#: src/prefs.c:241
+#: src/prefs.c:396
 #, fuzzy
-msgid "Ignore incoming colors"
+msgid "Ignore colors"
 msgstr "º¸³»¿À´Â »ö±òÀº ¹«½Ã"
 
-#: src/prefs.c:242
-msgid "Ignore white backgrounds"
-msgstr ""
-
-#: src/prefs.c:248
+#: src/prefs.c:397
 #, fuzzy
-msgid "Log all conversations"
-msgstr "¸ðµç ´ëÈ­¸¦ ·Î±ë"
-
-#: src/prefs.c:249
+msgid "Ignore font faces"
+msgstr "±Û¾¾ Å©±â Å°¿ì±â"
+
+#: src/prefs.c:398
 #, fuzzy
-msgid "Strip HTML from logs"
-msgstr "·Î±× ÆÄÀÏ¿¡ HTML Àº »©°í ´ã±â"
-
-#: src/prefs.c:255
+msgid "Ignore font sizes"
+msgstr "±Û¾¾ Å©±â Å°¿ì±â"
+
+#: src/prefs.c:404
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Ʋ¸° öÀÚ ÀÚµ¿À¸·Î Ç¥½Ã"
 
-#: src/prefs.c:256
+#: src/prefs.c:405
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "URL À» ¸µÅ©·Î º¸³»±â"
 
-#: src/prefs.c:257
+#: src/prefs.c:406
 msgid "Sending messages removes away status"
 msgstr "¸Þ½ÃÁö¸¦ º¸³»¸é Àá¼ö¿¡¼­ ³ª¿À±â"
 
-#: src/prefs.c:298 src/prefs.c:386
+#: src/prefs.c:447 src/prefs.c:540
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:303 src/prefs.c:391
+#: src/prefs.c:453 src/prefs.c:546
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:308 src/prefs.c:396
+#: src/prefs.c:459 src/prefs.c:552
 #, fuzzy
 msgid "Text Only"
 msgstr "±Û¾¾ »ö±ò"
 
-#: src/prefs.c:331
+#: src/prefs.c:483
 #, fuzzy
 msgid "IM Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:343
+#: src/prefs.c:495
+#, fuzzy
+msgid "Show all conversations in one tabbed window"
+msgstr "´ëȭâ¿¡¼­ ·Î±×¿Â/¿ÀÇÁ º¸¿©ÁÖ±â"
+
+#: src/prefs.c:496
 #, fuzzy
 msgid "Show logins in window"
 msgstr "´ëȭâ¿¡¼­ ·Î±×¿Â/¿ÀÇÁ º¸¿©ÁÖ±â"
 
-#: src/prefs.c:349 src/prefs.c:435
+#: src/prefs.c:502 src/prefs.c:593
 #, fuzzy
 msgid "Show buttons as "
 msgstr "¹öÆ° ±×¸² º¸¿©ÁÖ±â"
 
-#: src/prefs.c:358 src/prefs.c:445
+#: src/prefs.c:511 src/prefs.c:603
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:359 src/prefs.c:446
+#: src/prefs.c:513 src/prefs.c:605
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é âÀ» ¾ÕÀ¸·Î"
 
-#: src/prefs.c:360
+#: src/prefs.c:514
 msgid "Ignore new conversations when away"
 msgstr "Àá¼öÁß¿¡´Â »õ·Î¿î ´ëÈ­ ¹«½Ã"
 
-#: src/prefs.c:361
+#: src/prefs.c:516
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "¸Þ½ÃÁö ¸¸µé±â"
 
-#: src/prefs.c:417 src/prefs.c:620
+#: src/prefs.c:574
 #, fuzzy
 msgid "Chat Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:429
+#: src/prefs.c:586
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
+#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
 msgid "Gaim Chat"
 msgstr "Gaim äÆÃ"
 
-#: src/prefs.c:638
+#: src/prefs.c:779 src/prefs.c:2234
+msgid "Chat Rooms"
+msgstr ""
+
+#: src/prefs.c:797
 msgid "Refresh"
 msgstr "°»½Å"
 
-#: src/prefs.c:666
+#: src/prefs.c:822
 msgid "List of available chats"
 msgstr "°¡´ÉÇÑ Ã¤ÆÃÀÇ ¸ñ·Ï"
 
-#: src/prefs.c:680
+#: src/prefs.c:832
 msgid "List of subscribed chats"
 msgstr "°¡ÀÔÇÑ Ã¤ÆÃÀÇ ¸ñ·Ï"
 
-#: src/prefs.c:806 src/prefs.c:2084
+#: src/prefs.c:962 src/prefs.c:2239
 #, fuzzy
 msgid "Font Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:820
+#: src/prefs.c:976
 msgid "Underlined Text"
 msgstr "¹ØÁÙÄ£ ±Û¾¾"
 
-#: src/prefs.c:821
+#: src/prefs.c:977
 msgid "Strike Text"
 msgstr "°¡¿îµ¥ ÁÙÄ£ ±Û¾¾"
 
-#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
+#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
 #, fuzzy
 msgid "Select"
 msgstr "±Û²Ã ¼±ÅÃ"
 
-#: src/prefs.c:869
+#: src/prefs.c:1027
 msgid "Font Face for Text"
 msgstr "±Û¾¾¿¡ »ç¿ëÇÒ ±Û²Ã"
 
-#: src/prefs.c:892
+#: src/prefs.c:1042
+#, fuzzy
+msgid "Font Size for Text"
+msgstr "±Û¾¾¿¡ »ç¿ëÇÒ ±Û²Ã"
+
+#: src/prefs.c:1067
 #, fuzzy
 msgid "Sound Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:904
+#: src/prefs.c:1079
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Ä£±¸°¡ µé¾î¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:905 src/prefs.c:1296
+#: src/prefs.c:1080 src/prefs.c:1511
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:906
+#: src/prefs.c:1081
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:968
+#: src/prefs.c:1146
 #, fuzzy
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - ´ëÈ­ ·Î±ë"
 
-#: src/prefs.c:1002
+#: src/prefs.c:1181
 #, fuzzy
 msgid "Reset"
 msgstr "µî·Ï"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1186
 #, fuzzy
-msgid "Choose"
+msgid "Choose..."
 msgstr "´Ý±â"
 
-#: src/prefs.c:1035
+#: src/prefs.c:1222
 #, fuzzy
 msgid "Sound Events"
 msgstr "¼Ò¸®"
 
-#: src/prefs.c:1047
+#: src/prefs.c:1234
 msgid "Sound when buddy logs in"
 msgstr "Ä£±¸°¡ µé¾î¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1048
+#: src/prefs.c:1235
 msgid "Sound when buddy logs out"
 msgstr "Ä£±¸°¡ ³ª°¡¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1054
+#: src/prefs.c:1241
 msgid "Sound when message is received"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1242
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1243
 msgid "Sound when message is sent"
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1249
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "äÆù濡 »ç¶÷µéÀÌ µå³ªµé ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1250
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "äÆù濡 »ç¶÷µéÀÌ µå³ªµé ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1064
+#: src/prefs.c:1251
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "»ç¶÷µéÀÌ Ã¤Æù濡¼­ ¾ê±âÇÒ ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1065
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "»ç¶÷µéÀÌ Ã¤Æù濡¼­ ¾ê±âÇÒ ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1197 src/prefs.c:2111
+#: src/prefs.c:1262
+#, c-format
+msgid "Command to play sound files (%s for filename; internal if empty)"
+msgstr ""
+
+#: src/prefs.c:1408 src/prefs.c:2266
 #, fuzzy
 msgid "Away Messages"
 msgstr "»õ·Î¿î Àá¼ö ¸Þ½ÃÁö"
 
-#: src/prefs.c:1209
+#: src/prefs.c:1420
 #, fuzzy
 msgid "Title"
 msgstr "ÆÄÀÏ"
 
-#: src/prefs.c:1213
+#: src/prefs.c:1424
 #, fuzzy
 msgid "Message"
 msgstr "¸Þ½ÃÁö ¸¸µé±â"
 
-#: src/prefs.c:1253
+#: src/prefs.c:1464
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1257
+#: src/prefs.c:1468
 #, fuzzy
 msgid "Make Away"
 msgstr "Áö±Ý ¹Ù·Î Àá¼ö"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1509
 #, fuzzy
 msgid "Ignore new conversations when away   "
 msgstr "Àá¼öÁß¿¡´Â »õ·Î¿î ´ëÈ­ ¹«½Ã"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1521
 msgid "Auto Away after"
 msgstr ""
 
-#: src/prefs.c:1318
+#: src/prefs.c:1534
 msgid "minutes using"
 msgstr ""
 
-#: src/prefs.c:1400
-#, fuzzy
-msgid "Browser Options"
-msgstr "¿É¼Ç"
-
-#: src/prefs.c:1412
-msgid "Netscape"
-msgstr "³Ý½ºÄÉÀÌÇÁ"
-
-#: src/prefs.c:1413
-msgid "KFM"
-msgstr ""
-
-#: src/prefs.c:1415
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:1417
-msgid "Manual"
-msgstr "¼öµ¿"
-
-#: src/prefs.c:1426
-msgid "Pop up new window by default"
-msgstr "±âº»À¸·Î »õ â ¿­±â"
-
-#: src/prefs.c:1641
+#: src/prefs.c:1753
 #, fuzzy
 msgid "Privacy Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1769
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1677
+#: src/prefs.c:1788
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1678
+#: src/prefs.c:1789
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1680
+#: src/prefs.c:1791
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1712
+#: src/prefs.c:1822
 #, fuzzy
 msgid "Deny all users"
 msgstr "¸î¸í¸¸ °ÅºÎ"
 
-#: src/prefs.c:1713
+#: src/prefs.c:1823
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1715
+#: src/prefs.c:1825
 #, fuzzy
 msgid "Block List"
 msgstr "Â÷´Ü"
 
-#: src/prefs.c:1791
+#: src/prefs.c:1920
 msgid "Gaim - Preferences"
 msgstr "Gaim - ¼³Á¤"
 
-#: src/prefs.c:1877
+#: src/prefs.c:2000
 msgid "GAIM debug output window"
 msgstr "GAIM µð¹ö±ë Ãâ·Ââ"
 
-#: src/prefs.c:2040
+#: src/prefs.c:2185
 msgid "General"
 msgstr "ÀϹÝ"
 
-#: src/prefs.c:2064
+#: src/prefs.c:2190
+msgid "Browser"
+msgstr "ºê¶ó¿ìÀú"
+
+#: src/prefs.c:2219
 #, fuzzy
 msgid "Conversations"
 msgstr "¸ðµç ´ëÈ­¸¦ ·Î±ë"
 
-#: src/prefs.c:2069
+#: src/prefs.c:2224
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2074
+#: src/prefs.c:2229
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2079
-msgid "Chat Rooms"
-msgstr ""
-
-#: src/prefs.c:2095
+#: src/prefs.c:2250
 msgid "Sounds"
 msgstr "¼Ò¸®"
 
-#: src/prefs.c:2122
-msgid "Browser"
-msgstr "ºê¶ó¿ìÀú"
-
-#: src/prefs.c:2133
+#: src/prefs.c:2255
+msgid "Events"
+msgstr ""
+
+#: src/prefs.c:2277
 msgid "Privacy"
 msgstr ""
 
-#: src/rvous.c:148
-msgid "Gaim - Save As..."
-msgstr "Gaim - »õ À̸§À¸·Î ÀúÀå"
-
-#: src/rvous.c:317
+#: src/prpl.c:73
+msgid ""
+"You have attempted to load a protocol which was not compiled from the same "
+"version of the source as this application was. Unfortunately, because it is "
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
+msgstr ""
+
+#: src/prpl.c:77
+#, fuzzy
+msgid "Protocol Error"
+msgstr "Ç÷¯±×ÀÎ ¿À·ù"
+
+#: src/prpl.c:97
 #, c-format
-msgid "Receiving %s from %s"
-msgstr "%s ¸¦ %s ¿¡¼­ ¹ÞÀ½"
-
-#: src/rvous.c:693
+msgid "%s was using %s, which got removed. %s is now offline."
+msgstr ""
+
+#: src/prpl.c:100
+#, fuzzy
+msgid "Disconnect"
+msgstr "²÷¾îÁü."
+
+#: src/prpl.c:140
+#, fuzzy
+msgid "Accept?"
+msgstr "Á¢¼ö"
+
+#: src/prpl.c:160 src/prpl.c:231
 msgid "Accept"
 msgstr "Á¢¼ö"
 
-#: src/rvous.c:720
-#, c-format
-msgid "%s requests you to accept the file: %s (%d bytes)"
-msgstr "%s °¡ ´ç½ÅÀÌ ÆÄÀÏÀ» Á¢¼öÇϱ⸦ ¿äûÇÏ¿´½À´Ï´Ù : %s (%d ¹ÙÀÌÆ®)"
-
-#: src/rvous.c:723
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s °¡ ´ç½Å¿¡°Ô ÆÄÀÏÀ» º¸³»´Þ¶ó°í ¿äûÇÏ¿´½À´Ï´Ù"
-
-#: src/rvous.c:733
-msgid "Gaim - File Transfer?"
-msgstr "Gaim - ÆÄÀÏÀ» Àü¼ÛÇÒ±î¿ä?"
-
-#: src/server.c:581
+#: src/prpl.c:204
+#, fuzzy
+msgid "Gaim - Prompt"
+msgstr "Gaim - Çã¿ë/°ÅºÎ ¸ñ·Ï¿¡ ´õÇϱâ"
+
+#: src/prpl.c:299
+#, fuzzy
+msgid "Gaim - New User Registration"
+msgstr "Gaim - ´ëÈ­ ·Î±ë"
+
+#: src/prpl.c:308
+msgid "New User Registration"
+msgstr ""
+
+#: src/prpl.c:320
+msgid "Register new user for"
+msgstr ""
+
+#: src/server.c:608
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:582
+#: src/server.c:609
 msgid "No"
 msgstr ""
 
-#: src/toc.c:253 src/toc.c:260
+#: src/toc.c:290 src/toc.c:297
 #, fuzzy
 msgid "Connection Closed"
 msgstr "¿¬°á"
 
-#: src/toc.c:295
+#: src/toc.c:332
 msgid "Waiting for reply..."
 msgstr ""
 
-#: src/toc.c:354
+#: src/toc.c:391
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/toc.c:355
+#: src/toc.c:392
 msgid "TOC Resume"
 msgstr ""
 
-#: src/toc.c:515
+#: src/toc.c:560
 #, fuzzy
 msgid "Password Change Successeful"
 msgstr "Gaim - ¾ÏÈ£ º¯°æ"
 
-#: src/toc.c:518
+#: src/toc.c:563
 msgid ""
 "TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
 
-#: src/toc.c:521
+#: src/toc.c:566
 msgid "TOC Pause"
 msgstr ""
 
-#: src/toc.c:977
+#: src/toc.c:923
 #, fuzzy
 msgid "Get Dir Info"
 msgstr "µð·ºÅ丮 Á¤º¸"
 
+#: src/toc.c:1190
+msgid ""
+"Unfortunately, currently TOC only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
+#: src/toc.c:1499 src/toc.c:1676
+#, fuzzy
+msgid "Could not connect for transfer!"
+msgstr "¼ÒÄÏÀ» ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+
+#: src/toc.c:1706
+msgid "Could not write file header!"
+msgstr ""
+
+#: src/toc.c:1741
+msgid "Gaim - Save As..."
+msgstr "Gaim - »õ À̸§À¸·Î ÀúÀå"
+
+#: src/toc.c:1780
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
+msgstr "%s °¡ ´ç½ÅÀÌ ÆÄÀÏÀ» Á¢¼öÇϱ⸦ ¿äûÇÏ¿´½À´Ï´Ù : %s (%d ¹ÙÀÌÆ®)"
+
+#: src/toc.c:1785
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr "%s °¡ ´ç½Å¿¡°Ô ÆÄÀÏÀ» º¸³»´Þ¶ó°í ¿äûÇÏ¿´½À´Ï´Ù"
+
+#, fuzzy
+#~ msgid "Change password for:"
+#~ msgstr "Æнº¿öµå ¹Ù²Ù±â"
+
+#, fuzzy
+#~ msgid "Make Away Now"
+#~ msgstr "Áö±Ý ¹Ù·Î Àá¼ö"
+
+#~ msgid "GAIM"
+#~ msgstr "GAIM"
+
+#~ msgid "HTML Link:"
+#~ msgstr "HTML ¿¬°á:"
+
+#~ msgid "Open URL in existing window"
+#~ msgstr "ÇöÀç â¿¡¼­ URL ¿­±â"
+
+#~ msgid "Open URL in new window"
+#~ msgstr "»õ â¿¡¼­ URL ¿­±â"
+
+#~ msgid "Add URL as bookmark"
+#~ msgstr "Áñ°Üã±â¿¡ URL ´õÇϱâ"
+
+#~ msgid "Gaim - File Transfer"
+#~ msgstr "Gaim - ÆÄÀÏ Àü¼Û"
+
+#~ msgid "Sending %s to %s"
+#~ msgstr "%s ¸¦ %s ¿¡°Ô º¸³¿"
+
+#, fuzzy
+#~ msgid "Error examining file"
+#~ msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#, fuzzy
+#~ msgid "GetFile Error"
+#~ msgstr "Gaim - ¿À·ù %d"
+
+#~ msgid ""
+#~ "Username : <B>%s</B>\n"
+#~ "<BR>Warning Level : <B>%d %%</B>\n"
+#~ "<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
+#~ "<BR><HR><BR>%s\n"
+#~ msgstr ""
+#~ "»ç¿ëÀÚ À̸§ : <B>%s</B>\n"
+#~ "<BR>ÁÖÀÇ ¼öÁØ : <B>%d %%</B>\n"
+#~ "<BR>Á¢¼ÓÇÑ ¶§ : <B>%s</B><BR>¸îºÐ° ³î°íÀÖ³ª : <B>%d</B>\n"
+#~ "<BR><HR><BR>%s\n"
+
+#~ msgid "Receiving %s from %s"
+#~ msgstr "%s ¸¦ %s ¿¡¼­ ¹ÞÀ½"
+
+#~ msgid "Gaim - File Transfer?"
+#~ msgstr "Gaim - ÆÄÀÏÀ» Àü¼ÛÇÒ±î¿ä?"
+
 #~ msgid "You must give your password"
 #~ msgstr "Æнº¿öµå¸¦ ÀÔ·ÂÇϼž߸¸ ÇÕ´Ï´Ù"
 
@@ -2051,9 +2321,6 @@
 #~ msgid "Remove buddy from permit/deny"
 #~ msgstr "¸ñ·Ï¿¡¼­ Ä£±¸ »©±â"
 
-#~ msgid "Ok"
-#~ msgstr "È®ÀÎ"
-
 #~ msgid "Idle"
 #~ msgstr "³î±â"
 
--- a/po/zh_CN.po	Fri Mar 23 17:34:03 2001 +0000
+++ b/po/zh_CN.po	Fri Mar 23 18:01:53 2001 +0000
@@ -3,11 +3,10 @@
 # Hashao <hashao@china.com>, 2000.
 # 
 # ÇëËæ±ãÐÞÕý£¬Ìí¼Ó£¬¸üУ¬Á칦¡£ÎÒûÓÐÒãÁ¦³¤ÆÚά»¤¡£¶àл
-#: src/gnome_applet_mgr.c:256
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2000-12-03 23:24-0800\n"
+"POT-Creation-Date: 2001-03-23 09:31-0800\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"
@@ -15,12 +14,61 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:72
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#, fuzzy
+msgid "Get Info"
+msgstr "Óû§Ïêϸ×ÊÁÏ"
+
+#: plugins/yay/yay.c:169
+#, fuzzy
+msgid "Your message did not get sent."
+msgstr "·¢³öÐÅÏ¢Éù"
+
+#: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
+#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
+#: src/oscar.c:1390
+#, fuzzy
+msgid "Gaim - Error"
+msgstr "Gaim - ´íÎó %d"
+
+#: plugins/yay/yay.c:187
+#, c-format
+msgid "%s has made %s their buddy%s%s"
+msgstr ""
+
+#: plugins/yay/yay.c:189
+#, fuzzy
+msgid "Gaim - Buddy"
+msgstr "Gaim - Ôö¼ÓÅóÓÑ"
+
+#: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
+#: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
+#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
+msgid "Close"
+msgstr "¹Ø±Õ"
+
+#: plugins/napster.c:1060
+msgid "Napster registration is currently under development"
+msgstr ""
+
+#: src/about.c:77
 #, c-format
 msgid "About GAIM v%s"
 msgstr "¹ØÓÚ GAIM µÚ %s °æ"
 
-#: src/aim.c:133 src/buddy.c:2100
+#: src/about.c:114
+msgid ""
+"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"written using Gtk+ and is licensed under the GPL.\n"
+"URL: http://www.marko.net/gaim/"
+msgstr ""
+
+#: src/about.c:189
+msgid "Web Site"
+msgstr ""
+
+#: src/aim.c:135 src/buddy.c:2295
 msgid "Signoff"
 msgstr "À뿪"
 
@@ -28,7 +76,7 @@
 msgid "Please enter your logon"
 msgstr "ÇëÊäÈëÄúµÄµÇ¼Ãû³Æ"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#: src/aim.c:147 src/aim.c:152 src/multi.c:838
 #, fuzzy
 msgid "Signon Error"
 msgstr "怬"
@@ -38,1186 +86,1278 @@
 msgid "Please enter your password"
 msgstr "ÇëÊäÈëÄúµÄµÇ¼Ãû³Æ"
 
-#: src/aim.c:254 src/multi.c:608
-msgid "Signon"
-msgstr "怬"
-
-#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+#: src/aim.c:246
+msgid "Gaim - Login"
+msgstr "Gaim - µÇÈë"
+
+#: src/aim.c:264
+msgid "Screen Name: "
+msgstr "ÏÔʾµÄÐÕÃû£º"
+
+#: src/aim.c:278
+msgid "Password: "
+msgstr "ÃÜÂ룺"
+
+#: src/aim.c:299 src/buddy.c:2299
+msgid "Quit"
+msgstr "Í˳ö"
+
+#: src/aim.c:304 src/aim.c:641 src/buddy.c:2358
 msgid "Accounts"
 msgstr ""
 
-#. Build OK Button
-#: src/aim.c:258 src/buddy_chat.c:202 src/buddy_chat.c:243 src/dialogs.c:347
-#: src/dialogs.c:666 src/dialogs.c:741 src/dialogs.c:892 src/dialogs.c:1029
-#: src/dialogs.c:1167 src/dialogs.c:1360 src/dialogs.c:1654 src/dialogs.c:1739
-#: src/dialogs.c:1953 src/dialogs.c:2141 src/dialogs.c:2305 src/dialogs.c:2397
-#: src/dialogs.c:3176 src/dialogs.c:3435 src/multi.c:494 src/multi.c:604
-#: src/multi.c:835 src/oscar.c:879 src/rvous.c:327 src/rvous.c:464
-#: src/rvous.c:696
-msgid "Cancel"
-msgstr "È¡Ïû"
-
-#: src/aim.c:259
+#: src/aim.c:306 src/multi.c:578
+msgid "Signon"
+msgstr "怬"
+
+#: src/aim.c:338 src/prpl.c:359
 msgid "Register"
 msgstr "×¢²á"
 
-#: src/aim.c:260
+#: src/aim.c:339
 msgid "Options"
 msgstr "Ñ¡Ïî"
 
-#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
+#: src/aim.c:341 src/aim.c:644 src/buddy.c:2375
 msgid "Plugins"
 msgstr "²å¼þ"
 
-#. Labels for selectors and text boxes
-#: src/aim.c:338
-msgid "Screen Name: "
-msgstr "ÏÔʾµÄÐÕÃû£º"
-
-#: src/aim.c:341
-msgid "Password: "
-msgstr "ÃÜÂ룺"
-
-#: src/aim.c:380
-msgid "Gaim - Login"
-msgstr "Gaim - µÇÈë"
-
-#: src/aim.c:599 src/buddy.c:2163
+#: src/aim.c:638 src/buddy.c:2367
 msgid "Preferences"
 msgstr "ÓÅÏÈÑ¡Ïî"
 
-#: src/away.c:110 src/away.c:227
-msgid "Back"
-msgstr "·µ»Ø"
-
-#: src/away.c:121
+#: src/applet.c:89
+#, c-format
+msgid "file not found: %s\n"
+msgstr "ÕÒ²»µ½Îļþ£º %s\n"
+
+#: src/applet.c:113
+msgid "Attempting to sign on...."
+msgstr "ÕýÔڵǼ¡­¡­"
+
+#: src/applet.c:119
+msgid "Offilne. Click to bring up login box."
+msgstr "ÀëÏß¡£µã»÷ÕâÀïÆô¶¯µÇ¼´°"
+
+#: src/applet.c:136 src/applet.c:174 src/buddy.c:2313
+msgid "Away"
+msgstr "ÔÝʱÀ뿪"
+
+#: src/applet.c:177 src/away.c:266
+msgid "New Away Message"
+msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
+
+#: src/applet.c:317
+msgid "Can't create GAIM applet!"
+msgstr "ÎÞ·¨½¨Á¢ GAIM applet!"
+
+#: src/applet.c:348
+msgid "Offline"
+msgstr "ÀëÏß"
+
+#: src/applet.c:362
+msgid "Font does not exist"
+msgstr "×ÖÐͲ»´æÔÚ"
+
+#: src/applet.c:377
+msgid "About..."
+msgstr "¹ØÓÚ¡­¡­"
+
+#: src/away.c:96
 msgid "I'm Back!"
 msgstr "ÎÒºúººÈýÓÖ»ØÀ´ÁË£¡"
 
-#: src/away.c:160
+#: src/away.c:133
 msgid "Gaim - Away!"
 msgstr "Gaim - ÔÝʱÀ뿪"
 
-#: src/away.c:266 src/gnome_applet_mgr.c:200
-msgid "New Away Message"
-msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
-
-#: src/away.c:284
+#: src/away.c:147 src/away.c:228 src/away.c:393
+msgid "Back"
+msgstr "·µ»Ø"
+
+#: src/away.c:286
 msgid "Remove Away Message"
 msgstr "ɾ³ýÀ뿪ÐÅÏ¢"
 
+#: src/away.c:462
+msgid "Set All Away"
+msgstr ""
+
 #. Put the buttons in the box
-#: src/buddy.c:239 src/buddy.c:2234 src/buddy_chat.c:845
-#: src/conversation.c:1641 src/conversation.c:1740 src/dialogs.c:890
-#: src/dialogs.c:1023 src/dialogs.c:1964 src/multi.c:693 src/prefs.c:639
-#: src/prefs.c:1249 src/prefs.c:1700 src/prefs.c:1735
+#: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
+#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
+#: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
 msgstr "Ôö¼Ó"
 
-#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
+#: src/buddy.c:246 src/buddy.c:2444 src/dialogs.c:878 src/dialogs.c:974
 msgid "Group"
 msgstr "×éȺ"
 
-#: src/buddy.c:241 src/buddy.c:2236 src/buddy_chat.c:847
-#: src/conversation.c:1639 src/conversation.c:1738 src/prefs.c:640
-#: src/prefs.c:1261 src/prefs.c:1704 src/prefs.c:1739
+#: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
+#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "ɾ³ý"
 
-#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
+#: src/buddy.c:250 src/buddy.c:1830 src/buddy.c:2186
 msgid "Chat"
 msgstr "ÁÄÌì"
 
-#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
+#: src/buddy.c:251 src/buddy.c:443 src/buddy.c:2184 src/buddy_chat.c:474
+#: src/buddy_chat.c:804
 msgid "IM"
 msgstr "¼´Ê±ÐÅÏ¢"
 
-#: src/buddy.c:246 src/buddy.c:2002 src/buddy_chat.c:564 src/buddy_chat.c:853
-#: src/conversation.c:1734 src/rvous.c:694
+#: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
+#: src/buddy_chat.c:1025 src/conversation.c:2073
 msgid "Info"
 msgstr "Ïêϸ×ÊÁÏ"
 
 #. Put the buttons in the box
-#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
+#: src/buddy.c:449 src/buddy.c:554 src/dialogs.c:968 src/dialogs.c:3395
+#: src/dialogs.c:3410 src/dialogs.c:3487 src/dialogs.c:3502
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:425
+#: src/buddy.c:455 src/buddy.c:568
 msgid "Add Buddy Pounce"
 msgstr "Ôö¼Ó¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1368
+#: src/buddy.c:461 src/buddy.c:574
+msgid "View Log"
+msgstr ""
+
+#: src/buddy.c:561
+msgid "Un-Alias"
+msgstr ""
+
+#: src/buddy.c:1512
 msgid "New Buddy Pounce"
 msgstr "ÐÂÔö¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1386
+#: src/buddy.c:1530
 msgid "Remove Buddy Pounce"
 msgstr "È¡Ïû¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1675
+#: src/buddy.c:1821
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1678
+#: src/buddy.c:1824
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1681
+#: src/buddy.c:1827
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1687
+#: src/buddy.c:1833
 #, fuzzy
 msgid "Get File"
 msgstr "Îļþ"
 
-#: src/buddy.c:1690
+#: src/buddy.c:1836
 #, fuzzy
 msgid "Send File"
 msgstr "Îļþ"
 
-#: src/buddy.c:1749
+#: src/buddy.c:1839
+msgid "Games"
+msgstr ""
+
+#: src/buddy.c:1842
+msgid "Stocks"
+msgstr ""
+
+#: src/buddy.c:1894
+#, fuzzy, c-format
+msgid "Logged in: %s\n"
+msgstr "Á¬½Óµ½£º %s\n"
+
+#: src/buddy.c:1905
 msgid "Warnings: %d%%\n"
 msgstr "¾¯¸æ£º%d%%\n"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1917
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1758
+#: src/buddy.c:1921
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
 "Screen Name: %s\n"
-"Logged in: %s\n"
-"%s%s%s%s%s"
+"%s%s%s%s%s%s"
 msgstr ""
 "ÐÕÃû£º%s                \n"
 "µÇÈëµ½£º%s\n"
 "%s%s%s"
 
-#: src/buddy.c:1761
+#: src/buddy.c:1925
 msgid "Idle: "
 msgstr "¿Õתʱ¼ä£º"
 
-#: src/buddy.c:1828
+#: src/buddy.c:1995
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
 
-#: src/buddy.c:1878
+#: src/buddy.c:2047
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s À뿪ÁË %s%s ¡£</B><BR><HR>"
 
-#: src/buddy.c:2028
+#: src/buddy.c:2211
 msgid "Information on selected Buddy"
 msgstr "Ñ¡ÖеÄÅóÓѵÄ×ÊÁÏ"
 
-#: src/buddy.c:2029 src/dialogs.c:657
+#: src/buddy.c:2212 src/dialogs.c:663
 msgid "Send Instant Message"
 msgstr "·¢³ö¼´Ê±ÐÅÏ¢"
 
-#: src/buddy.c:2030
+#: src/buddy.c:2213
 msgid "Start/join a Buddy Chat"
 msgstr "·¢Æ𣯼ÓÈëÒ»¸öÁÄÌìÊÒ"
 
-#: src/buddy.c:2088
+#: src/buddy.c:2277
 msgid "File"
 msgstr "Îļþ"
 
-#: src/buddy.c:2092 src/buddy.c:2093
+#: src/buddy.c:2281
 msgid "Add A Buddy"
 msgstr "¼ÓÈëÒ»¸ö¸çÃǶù"
 
-#: src/buddy.c:2094
+#: src/buddy.c:2283
 #, fuzzy
 msgid "Join A Chat"
 msgstr "¼ÓÈëÁÄÌì"
 
-#: src/buddy.c:2095
+#: src/buddy.c:2285
 #, fuzzy
 msgid "New Instant Message"
 msgstr "·¢³ö¼´Ê±ÐÅÏ¢"
 
-#: src/buddy.c:2097
+#: src/buddy.c:2290
 msgid "Import Buddy List"
 msgstr "µ¼ÈëÅóÓÑÁбí"
 
-#: src/buddy.c:2098
+#: src/buddy.c:2292
 msgid "Export Buddy List"
 msgstr "µ¼³öÅóÓÑÁбí"
 
-#: src/buddy.c:2103
-msgid "Quit"
-msgstr "Í˳ö"
-
-#: src/buddy.c:2105 src/buddy_chat.c:556 src/buddy_chat.c:818
-#: src/buddy_chat.c:841 src/conversation.c:1736 src/dialogs.c:425
-#: src/multi.c:709 src/plugins.c:314 src/prefs.c:1844
-msgid "Close"
-msgstr "¹Ø±Õ"
-
-#: src/buddy.c:2110
+#: src/buddy.c:2308
 msgid "Tools"
 msgstr "¹¤¾ß"
 
-#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
-msgid "Away"
-msgstr "ÔÝʱÀ뿪"
-
-#: src/buddy.c:2120
+#: src/buddy.c:2318
 msgid "Buddy Pounce"
 msgstr "¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
+#: src/buddy.c:2327 src/dialogs.c:2039 src/dialogs.c:2206
 msgid "Search for Buddy"
 msgstr "ËÑÑ°ÅóÓÑ"
 
-#: src/buddy.c:2131
+#: src/buddy.c:2330
 msgid "by Email"
 msgstr "ʹÓõçÓÊ"
 
-#: src/buddy.c:2135
+#: src/buddy.c:2334
 msgid "by Dir Info"
 msgstr "ʹÓÃÐÕÃûµØַ¼"
 
-#: src/buddy.c:2142 src/buddy.c:2143
+#: src/buddy.c:2341 src/buddy.c:2342
 msgid "Settings"
 msgstr "É趨"
 
-#: src/buddy.c:2146
+#: src/buddy.c:2345
 msgid "User Info"
 msgstr "Óû§Ïêϸ×ÊÁÏ"
 
-#: src/buddy.c:2150 src/dialogs.c:1353
+#: src/buddy.c:2349 src/dialogs.c:1326
 msgid "Directory Info"
 msgstr "ÐÕÃûµØַ¼"
 
-#: src/buddy.c:2154 src/dialogs.c:1592
+#: src/buddy.c:2353 src/dialogs.c:1517
 msgid "Change Password"
 msgstr "¸ü¸ÄÃÜÂë"
 
-#: src/buddy.c:2171
+#: src/buddy.c:2362
+#, fuzzy
+msgid "Protocol Actions"
+msgstr "Ñ¡Ïî"
+
+#: src/buddy.c:2369
+msgid "View System Log"
+msgstr ""
+
+#: src/buddy.c:2380
 #, fuzzy
 msgid "Perl"
 msgstr "ÔÊÐí"
 
-#: src/buddy.c:2174
+#: src/buddy.c:2383
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2178
+#: src/buddy.c:2387
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2182
+#: src/buddy.c:2391
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2190
+#: src/buddy.c:2399
 msgid "Help"
 msgstr "°ïÖú"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2404
 #, fuzzy
 msgid "About Gaim"
 msgstr "¹ØÓÚ"
 
-#: src/buddy.c:2214 src/prefs.c:2053
+#: src/buddy.c:2423 src/prefs.c:2208
 msgid "Buddy List"
 msgstr "ÅóÓÑÁбí"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2477
 msgid "Add a new Buddy"
 msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
 
-#: src/buddy.c:2267
+#: src/buddy.c:2478
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
 
-#: src/buddy.c:2268
+#: src/buddy.c:2479
 msgid "Remove selected Buddy"
 msgstr "ɾ³ýÑ¡ÖеÄÅóÓÑ"
 
-#: src/buddy.c:2293
+#: src/buddy.c:2504
 msgid "Online"
 msgstr "ÔÚÏß"
 
-#: src/buddy.c:2295
+#: src/buddy.c:2506
 msgid "Edit Buddies"
 msgstr "ÐÞ¸ÄÅóÓѱí"
 
-#: src/buddy.c:2332
+#: src/buddy.c:2543
 msgid "Gaim - Buddy List"
 msgstr "Gaim - ÅóÓÑÁбí"
 
-#: src/buddy_chat.c:135
+#: src/buddy_chat.c:156
 msgid "Join Chat"
 msgstr "¼ÓÈëÁÄÌì"
 
-#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
+#: src/buddy_chat.c:163 src/buddy_chat.c:917 src/buddy_chat.c:929
 msgid "Buddy Chat"
 msgstr "ÅóÓÑÁÄÌì"
 
-#: src/buddy_chat.c:151
+#: src/buddy_chat.c:173
 msgid "Join what group:"
 msgstr "Òª¼ÓÈëµÄ×飺"
 
-#: src/buddy_chat.c:167
+#: src/buddy_chat.c:186
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "¼ÓÈëÁÄÌì"
 
-#: src/buddy_chat.c:181
+#: src/buddy_chat.c:198
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:189
+#: src/buddy_chat.c:205
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:197
+#: src/buddy_chat.c:213 src/buddy_chat.c:258 src/dialogs.c:402
+#: src/dialogs.c:682 src/dialogs.c:742 src/dialogs.c:870 src/dialogs.c:987
+#: src/dialogs.c:1240 src/dialogs.c:1450 src/dialogs.c:1578 src/dialogs.c:1643
+#: src/dialogs.c:1856 src/dialogs.c:2045 src/dialogs.c:2225 src/dialogs.c:2299
+#: src/dialogs.c:3163 src/dialogs.c:3397 src/dialogs.c:3489 src/dialogs.c:3676
+#: src/multi.c:463 src/multi.c:574 src/multi.c:821 src/prpl.c:156
+#: src/prpl.c:227
+msgid "Cancel"
+msgstr "È¡Ïû"
+
+#: src/buddy_chat.c:218
 msgid "Join"
 msgstr "¼ÓÈë"
 
-#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
+#: src/buddy_chat.c:259 src/buddy_chat.c:855 src/buddy_chat.c:984
 msgid "Invite"
 msgstr "ÑûÇë"
 
-#: src/buddy_chat.c:261
+#: src/buddy_chat.c:275
 msgid "Invite who?"
 msgstr "ÏëÇëË­£¿"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:279
 msgid "With message:"
 msgstr "ÑûÇëÐÅÏ¢£º"
 
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:303
 msgid "Invite to Buddy Chat"
 msgstr "ÇëÈËÁÄÌì"
 
-#: src/buddy_chat.c:420
+#: src/buddy_chat.c:480 src/buddy_chat.c:808
+msgid "Ignore"
+msgstr "²»ÀíËû"
+
+#: src/buddy_chat.c:532 src/buddy_chat.c:638
+#, c-format
+msgid "%d %s in room"
+msgstr ""
+
+#: src/buddy_chat.c:539
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:459
+#: src/buddy_chat.c:602
+#, c-format
+msgid "<B>%s is now known as %s</B>"
+msgstr ""
+
+#: src/buddy_chat.c:645
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:559 src/buddy_chat.c:816
+#: src/buddy_chat.c:785
+msgid "0 people in room"
+msgstr ""
+
+#: src/buddy_chat.c:860 src/buddy_chat.c:983
 msgid "Whisper"
 msgstr "ÇÄÇÄ»°"
 
-#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
-#: src/conversation.c:1733
+#: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
+#: src/conversation.c:2084
 msgid "Send"
 msgstr "Ëͳö"
 
-#: src/buddy_chat.c:563
-msgid "Ignore"
-msgstr "²»ÀíËû"
-
-#: src/buddy_chat.c:849 src/conversation.c:1741
+#: src/buddy_chat.c:1021 src/conversation.c:2061
 msgid "Block"
 msgstr "¿é"
 
-#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
-#: src/dialogs.c:345 src/rvous.c:695
+#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/dialogs.c:397
 msgid "Warn"
 msgstr "¾¯¸æ"
 
-#: src/conversation.c:426
+#: src/conversation.c:352
+#, fuzzy
+msgid "Gaim - Save Conversation"
+msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
+
+#: src/conversation.c:484
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "°Ñ ¡°%s¡±´ÓÅóÓѱíÉÏɾȥ\n"
 
-#: src/conversation.c:902
+#: src/conversation.c:1044
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Ä¿Ç°ÔÚ %d\n"
 
-#: src/conversation.c:911
+#: src/conversation.c:1052
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "°ÑλÖÃÉ趨µ½ %d\n"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1574
 msgid "Bold"
 msgstr "´ÖÌå"
 
-#: src/conversation.c:1497 src/prefs.c:818
+#: src/conversation.c:1574 src/prefs.c:974
 msgid "Bold Text"
 msgstr "´ÖÌåÎÄ×Ö"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1578 src/conversation.c:1579
 msgid "Italics"
 msgstr "бÌå"
 
-#: src/conversation.c:1501 src/prefs.c:819
+#: src/conversation.c:1578 src/prefs.c:975
 msgid "Italics Text"
 msgstr "бÌåÎÄ×Ö"
 
-#: src/conversation.c:1505 src/conversation.c:1506
+#: src/conversation.c:1582 src/conversation.c:1583
 msgid "Underline"
 msgstr "ϼÓÏß"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1582
 msgid "Underline Text"
 msgstr "ϼÓÏßÎÄ×Ö"
 
-#: src/conversation.c:1509 src/conversation.c:1510
+#: src/conversation.c:1587
 msgid "Strike"
 msgstr "»®µô"
 
-#: src/conversation.c:1509
+#: src/conversation.c:1587
 msgid "Strike through Text"
 msgstr "»®µôµÄÎÄ×Ö"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Small"
 msgstr "С"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Decrease font size"
 msgstr "ËõС×ÖÌå"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal"
 msgstr "Õý³£"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal font size"
 msgstr "Õý³£×ÖÌå´óС"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Big"
 msgstr "´ó"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Increase font size"
 msgstr "Ôö´ó×ÖÌå"
 
-#: src/conversation.c:1526 src/conversation.c:1527
+#: src/conversation.c:1606 src/conversation.c:1607
 msgid "Font"
 msgstr "×ÖÐÍ"
 
-#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
+#: src/conversation.c:1606 src/dialogs.c:2648 src/dialogs.c:2664
 msgid "Select Font"
 msgstr "Ñ¡Ôñ×ÖÐÍ"
 
-#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
-#: src/conversation.c:1535
+#: src/conversation.c:1610 src/conversation.c:1611 src/conversation.c:1615
 msgid "Color"
 msgstr "ÑÕÉ«"
 
-#: src/conversation.c:1530 src/prefs.c:832
+#: src/conversation.c:1610 src/prefs.c:988
 msgid "Text Color"
 msgstr "ÎÄ×ÖÑÕÉ«"
 
-#: src/conversation.c:1534 src/prefs.c:849
+#: src/conversation.c:1615 src/prefs.c:1006
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1541 src/conversation.c:1542
+#: src/conversation.c:1622 src/conversation.c:1623
 msgid "Link"
 msgstr "Á¬½Ó"
 
-#: src/conversation.c:1541 src/dialogs.c:2391
+#: src/conversation.c:1622 src/dialogs.c:2293
 msgid "Insert Link"
 msgstr "²åÈëÁ¬½Ó"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 #, fuzzy
 msgid "Smiley"
 msgstr "Îļþ"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1552 src/conversation.c:1553
+#: src/conversation.c:1633 src/conversation.c:1634 src/prefs.c:2195
 msgid "Logging"
 msgstr "¼Ç¼"
 
-#: src/conversation.c:1552
+#: src/conversation.c:1633
 msgid "Enable logging"
 msgstr "´ò¿ª¼Ç¼"
 
-#: src/conversation.c:1556 src/conversation.c:1557
+#: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+msgid "Save"
+msgstr "´æÅÌ"
+
+#: src/conversation.c:1643
+#, fuzzy
+msgid "Save Conversation"
+msgstr "¼Ç¼ËùÓжԻ°ÄÚÈÝ"
+
+#: src/conversation.c:1648 src/conversation.c:1649
 msgid "Sound"
 msgstr "ÉùÒô"
 
-#: src/conversation.c:1556
+#: src/conversation.c:1648
 msgid "Enable sounds"
 msgstr "´ò¿ªÉùÒô"
 
-#: src/conversation.c:1768
+#: src/conversation.c:1928
+#, fuzzy
+msgid "Gaim - Conversations"
+msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
+
+#: src/conversation.c:2003
 #, fuzzy
 msgid "Send message as: "
 msgstr "·¢³öÐÅÏ¢Éù"
 
-#: src/dialogs.c:360
+#: src/dialogs.c:359
+msgid "Gaim - Warn user?"
+msgstr "Gaim - ¾¯¸æÓû§£¿"
+
+#: src/dialogs.c:380
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "ÄãÕæµÄÏ뾯¸æ%s£¿"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:385
 msgid "Warn anonymously?"
 msgstr "·¢ÄäÃû¾¯¸æ£¿"
 
-#: src/dialogs.c:367
+#: src/dialogs.c:389
 msgid "Anonymous warnings are less harsh."
 msgstr "ÄäÃû¾¯¸æ²»ÄÇôÑÏÀ÷¡£"
 
-#: src/dialogs.c:393
-msgid "Gaim - Warn user?"
-msgstr "Gaim - ¾¯¸æÓû§£¿"
-
-#: src/dialogs.c:458
+#: src/dialogs.c:465
 #, c-format
 msgid "Unable to write file %s."
 msgstr "²»ÄÜдÈëÎļþ %s¡£"
 
-#: src/dialogs.c:461
+#: src/dialogs.c:468
 #, c-format
 msgid "Unable to read file %s."
 msgstr "²»ÄܶÁÈëÎļþ %s¡£"
 
-#: src/dialogs.c:464
+#: src/dialogs.c:471
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "ÐÅϢ̫³¤£¬ºóÃæ %s ×ÖÔª±»¿³µôÁË¡£"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:474
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ÏÖÔÚûÓеÇÈë¡£"
 
-#: src/dialogs.c:470
+#: src/dialogs.c:477
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "²»ÔÊÐí¾¯¸æ %s ¡£"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:480
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "È¡ÏûÁËÒ»¸öÐÅÏ¢£¬Ä㳬³öÁË·þÊÌÆ÷µÄËÙ¶ÈÏÞÖÆ¡£"
 
-#: src/dialogs.c:476
+#: src/dialogs.c:483
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "ÔÚ %s ÖÐûÓÐÁÄÌì¡£"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:486
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Äã·¢Ë͸ø %s µÄËÙ¶ÈÌ«¿ìÁË¡£"
 
-#: src/dialogs.c:482
+#: src/dialogs.c:489
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
 
-#: src/dialogs.c:485
+#: src/dialogs.c:492
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅÏ¢·¢Ë͵ÄËÙ¶ÈÌ«¿ì¡£"
 
-#: src/dialogs.c:488
+#: src/dialogs.c:495
 msgid "Failure."
 msgstr "ʧ°ÜÁË¡£"
 
-#: src/dialogs.c:491
+#: src/dialogs.c:498
 msgid "Too many matches."
 msgstr "Æ¥ÅäÌ«¶à¡£"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:501
 msgid "Need more qualifiers."
 msgstr "ÐèÒª¸ü¶àµÄ²ÎÊý¡£"
 
-#: src/dialogs.c:497
+#: src/dialogs.c:504
 msgid "Dir service temporarily unavailable."
 msgstr "ÐÕÃûµØַ¼·þÎñÆ÷ÔÝʱÁ¬²»ÉÏ¡£"
 
-#: src/dialogs.c:500
+#: src/dialogs.c:507
 msgid "Email lookup restricted."
 msgstr "µçÓʲéÕÒÏÞÖÆ¡£"
 
-#: src/dialogs.c:503
+#: src/dialogs.c:510
 msgid "Keyword ignored."
 msgstr "¹Ø¼ü×Ö±»ºöÂÔ¡£"
 
-#: src/dialogs.c:506
+#: src/dialogs.c:513
 msgid "No keywords."
 msgstr "ûÓйؼü×Ö¡£"
 
-#: src/dialogs.c:509
+#: src/dialogs.c:516
 msgid "User has no directory information."
 msgstr "¸ÃÓû§Ã»ÓÐÐÕÃûµØַ¼"
 
-#: src/dialogs.c:513
+#: src/dialogs.c:520
 msgid "Country not supported."
 msgstr "²»Ö§³ÖÕâ¸ö¹ú¼Ò¡£"
 
-#: src/dialogs.c:516
+#: src/dialogs.c:523
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "²»Ã÷´íÎó£º %s ¡£"
 
 #. Incorrect nick/password
-#: src/dialogs.c:519 src/oscar.c:471
+#: src/dialogs.c:526 src/oscar.c:523
 msgid "Incorrect nickname or password."
 msgstr "êÇÃû»òÕßÃÜÂë´íÎó¡£"
 
-#: src/dialogs.c:522
+#: src/dialogs.c:529
 msgid "The service is temporarily unavailable."
 msgstr "ÔÝʱûÓи÷þÎñ¡£"
 
-#: src/dialogs.c:525
+#: src/dialogs.c:532
 msgid "Your warning level is currently too high to log in."
 msgstr "ÄãÄ¿Ç°µÄ¾¯¸æ¼¶±ðÌ«¸ß£¬ÎÞ·¨µÇÈë¡£"
 
-#: src/dialogs.c:528
+#: src/dialogs.c:535
 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:531
+#: src/dialogs.c:538
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "·¢Éú²»Ã÷µÄµÇ¼´íÎó£º %s¡£"
 
-#: src/dialogs.c:534
+#: src/dialogs.c:541
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "²»Ã÷´íÎó %d ·¢ÉúÁË¡£¾ßÌåѶϢ£º %s"
 
-#: src/dialogs.c:537
+#: src/dialogs.c:544
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - ´íÎó %d"
 
 #. Build OK Button
-#: src/dialogs.c:596 src/dialogs.c:661 src/dialogs.c:736 src/dialogs.c:1172
-#: src/dialogs.c:1659 src/dialogs.c:1806 src/dialogs.c:2140 src/dialogs.c:2310
-#: src/dialogs.c:2396 src/multi.c:499
+#: src/dialogs.c:603 src/dialogs.c:687 src/dialogs.c:747 src/dialogs.c:1245
+#: src/dialogs.c:1583 src/dialogs.c:1696 src/dialogs.c:2044 src/dialogs.c:2230
+#: src/dialogs.c:2298 src/multi.c:467
 msgid "OK"
 msgstr "È·ÈÏ"
 
-#: src/dialogs.c:671
+#: src/dialogs.c:653
+msgid "Gaim - IM user"
+msgstr "Gaim - ¼´Ê±ÐÅÏ¢Óû§"
+
+#: src/dialogs.c:670
 #, fuzzy
 msgid "IM who:"
 msgstr "¸øË­¼´Ê±ÐÅÏ¢£º"
 
-#: src/dialogs.c:695
-msgid "Gaim - IM user"
-msgstr "Gaim - ¼´Ê±ÐÅÏ¢Óû§"
-
-#: src/dialogs.c:732
+#: src/dialogs.c:718
 #, fuzzy
 msgid "Get User Info"
 msgstr "Óû§Ïêϸ×ÊÁÏ"
 
-#: src/dialogs.c:746
+#: src/dialogs.c:725
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:770
+#. Finish up
+#: src/dialogs.c:753
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - É趨Óû§×ÊÁÏ"
 
-#: src/dialogs.c:845
+#: src/dialogs.c:823
 msgid "Buddies"
 msgstr "¸çÃǶùÃÇ"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:876
 #, fuzzy
 msgid "Add Group"
 msgstr "×éȺ"
 
-#: src/dialogs.c:928
+#: src/dialogs.c:906
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:957
+#: src/dialogs.c:933
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:967
+#: src/dialogs.c:947
 msgid "Add Buddy"
 msgstr "Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:979 src/dialogs.c:3443
+#: src/dialogs.c:957 src/dialogs.c:3405 src/dialogs.c:3497
 msgid "Buddy"
 msgstr "ÅóÓÑ"
 
-#: src/dialogs.c:1109
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Please enter a buddy to pounce."
+msgstr "ÇëÊäÈëÄúµÄµÇ¼Ãû³Æ"
+
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Buddy Pounce Error"
+msgstr "¼àÊÓÅóÓÑ"
+
+#: src/dialogs.c:1076
 #, fuzzy
 msgid "Pounce buddy as:"
 msgstr "ÅóÓѵǼÉù"
 
-#: src/dialogs.c:1181
+#: src/dialogs.c:1126
+msgid "Gaim - New Buddy Pounce"
+msgstr "Gaim - ÐÂÔö¼àÊÓÅóÓÑ"
+
+#: src/dialogs.c:1143
 #, fuzzy
 msgid "Buddy:"
 msgstr "ÅóÓÑ"
 
+#: src/dialogs.c:1158
+msgid "Pounce on sign on"
+msgstr ""
+
+#: src/dialogs.c:1163
+msgid "Pounce on return from away"
+msgstr ""
+
+#: src/dialogs.c:1167
+msgid "Pounce on return from idle"
+msgstr ""
+
+#: src/dialogs.c:1175
+#, fuzzy
+msgid "Open IM window on pounce"
+msgstr "ÅóÓѵǼʱ´ò¿ª¼´Ê±ÐÅÏ¢´°¿Ú"
+
+#: src/dialogs.c:1180
+#, fuzzy
+msgid "Send IM on pounce"
+msgstr "ÅóÓѵǼʱ·¢Ëͼ´Ê±ÐÅÏ¢"
+
 #: src/dialogs.c:1189
 #, fuzzy
 msgid "Message:"
 msgstr "´´×÷ÐÅÏ¢"
 
-#: src/dialogs.c:1196 src/prefs.c:2100
-msgid "Events"
-msgstr ""
-
-#. Set up the different options
 #: src/dialogs.c:1201
-msgid "Pounce on sign on"
-msgstr ""
-
-#: src/dialogs.c:1203
-msgid "Pounce on return from away"
-msgstr ""
-
-#: src/dialogs.c:1204
-msgid "Pounce on return from idle"
-msgstr ""
-
-#: src/dialogs.c:1226
 #, fuzzy
-msgid "Actions"
-msgstr "Ñ¡Ïî"
-
-#. And now the other stuff
-#: src/dialogs.c:1231
-#, fuzzy
-msgid "Open IM window on pounce"
-msgstr "ÅóÓѵǼʱ´ò¿ª¼´Ê±ÐÅÏ¢´°¿Ú"
-
-#: src/dialogs.c:1234
-#, fuzzy
-msgid "Send IM on pounce"
+msgid "Execute command on pounce"
 msgstr "ÅóÓѵǼʱ·¢Ëͼ´Ê±ÐÅÏ¢"
 
-#: src/dialogs.c:1263
-msgid "Gaim - New Buddy Pounce"
-msgstr "Gaim - ÐÂÔö¼àÊÓÅóÓÑ"
-
-#. Build Save Button
-#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
-msgid "Save"
-msgstr "´æÅÌ"
-
-#: src/dialogs.c:1376
+#: src/dialogs.c:1210
+msgid "Command:"
+msgstr ""
+
+#: src/dialogs.c:1227
+msgid "Save this pounce after activation"
+msgstr ""
+
+#: src/dialogs.c:1316
+msgid "Gaim - Set Dir Info"
+msgstr "Gaim - É趨ÐÕÃûµØַ¼"
+
+#: src/dialogs.c:1348
 msgid "Allow Web Searches To Find Your Info"
 msgstr "ÔÊÐí´ÓÍøÒ³ËÑÑ°ÕÒµ½ÄãµÄ×ÊÁÏ"
 
 #. Line 1
-#: src/dialogs.c:1379 src/dialogs.c:2159
+#: src/dialogs.c:1351 src/dialogs.c:2063
 msgid "First Name"
 msgstr "Ãû"
 
 #. Line 2
-#: src/dialogs.c:1390 src/dialogs.c:2171
+#: src/dialogs.c:1362 src/dialogs.c:2075
 msgid "Middle Name"
 msgstr "×Ö"
 
 #. Line 3
-#: src/dialogs.c:1402 src/dialogs.c:2183
+#: src/dialogs.c:1374 src/dialogs.c:2087
 msgid "Last Name"
 msgstr "ÐÕ"
 
 #. Line 4
-#: src/dialogs.c:1413 src/dialogs.c:2195
+#: src/dialogs.c:1385 src/dialogs.c:2099
 msgid "Maiden Name"
 msgstr "Äï¼ÒÐÕ"
 
 #. Line 5
-#: src/dialogs.c:1424 src/dialogs.c:2207
+#: src/dialogs.c:1396 src/dialogs.c:2111
 msgid "City"
 msgstr "ÊÐ"
 
 #. Line 6
-#: src/dialogs.c:1435 src/dialogs.c:2218
+#: src/dialogs.c:1407 src/dialogs.c:2122
 msgid "State"
 msgstr "Ê¡"
 
 #. Line 7
-#: src/dialogs.c:1446 src/dialogs.c:2229
+#: src/dialogs.c:1418 src/dialogs.c:2133
 msgid "Country"
 msgstr "¹ú"
 
-#: src/dialogs.c:1490
-msgid "Gaim - Set Dir Info"
-msgstr "Gaim - É趨ÐÕÃûµØַ¼"
-
-#: src/dialogs.c:1507
+#: src/dialogs.c:1473
 msgid "New Passwords Do Not Match"
 msgstr "ÐÂÃÜÂë²»Ò»ÖÂ"
 
-#: src/dialogs.c:1507 src/dialogs.c:1512
+#: src/dialogs.c:1473 src/dialogs.c:1478
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ¸ü¸ÄÃÜÂë´íÎó"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1478
 msgid "Fill out all fields completely"
 msgstr "°ÑËùÓеıí¸ñ¶¼ÌíÁË"
 
-#: src/dialogs.c:1541
-#, fuzzy
-msgid "Change password for:"
-msgstr "¸ü¸ÄÃÜÂë"
-
-#: src/dialogs.c:1580 src/toc.c:515
+#: src/dialogs.c:1505 src/toc.c:560
 msgid "Gaim - Password Change"
 msgstr "Gaim - ¸ü¸ÄÃÜÂë"
 
-#: src/dialogs.c:1612
+#: src/dialogs.c:1536
 msgid "Original Password"
 msgstr "¾ÉÃÜÂë"
 
-#: src/dialogs.c:1626
+#: src/dialogs.c:1550
 msgid "New Password"
 msgstr "ÐÂÃÜÂë"
 
-#: src/dialogs.c:1640
+#: src/dialogs.c:1564
 msgid "New Password (again)"
 msgstr "ÐÂÃÜÂ루ȷ¶¨£©"
 
-#: src/dialogs.c:1693
-msgid "Set info for:"
-msgstr ""
-
-#: src/dialogs.c:1776
+#: src/dialogs.c:1609
 msgid "Gaim - Set User Info"
 msgstr "Gaim - É趨Óû§×ÊÁÏ"
 
-#: src/dialogs.c:1817
+#: src/dialogs.c:1707
 msgid "Below are the results of your search: "
 msgstr "ÒÔÏÂÊÇÄãËÑË÷µÄ½á¹û£º"
 
-#: src/dialogs.c:1943 src/dialogs.c:1950
+#: src/dialogs.c:1846 src/dialogs.c:1853
 msgid "Permit"
 msgstr "ÔÊÐí"
 
-#: src/dialogs.c:1945 src/dialogs.c:1952
+#: src/dialogs.c:1848 src/dialogs.c:1855
 msgid "Deny"
 msgstr "¾Ü¾ø"
 
-#: src/dialogs.c:1993
+#: src/dialogs.c:1896
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ôö¼Ó ÔÊÐí£¯½ûÖ¹"
 
-#: src/dialogs.c:1995
+#: src/dialogs.c:1898
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ôö¼Ó ÔÊÐí£¯½ûÖ¹"
 
-#: src/dialogs.c:2057
+#: src/dialogs.c:1960
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
 
-#: src/dialogs.c:2266
+#: src/dialogs.c:2170
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - ¸ù¾ÝÓû§×ÊÁϲéÑ°ÅóÓÑ"
 
-#: src/dialogs.c:2315
-msgid "Email"
-msgstr "µçÓÊ"
-
-#: src/dialogs.c:2328
+#: src/dialogs.c:2200
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ¸ù¾ÝµçÓʲéÑ°ÅóÓÑ"
 
-#: src/dialogs.c:2410
+#: src/dialogs.c:2213
+msgid "Email"
+msgstr "µçÓÊ"
+
+#: src/dialogs.c:2312
 msgid "URL"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2320
 msgid "Description"
 msgstr "ÃèÊö"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2346
 msgid "GAIM - Add URL"
 msgstr "GAIM - Ôö¼Ó URL"
 
-#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
+#: src/dialogs.c:2487 src/dialogs.c:2500 src/dialogs.c:2537
 msgid "Select Text Color"
 msgstr "É趨ÎÄ×ÖÑÕÉ«"
 
-#: src/dialogs.c:2624
+#: src/dialogs.c:2524
 #, fuzzy
 msgid "Select Background Color"
 msgstr "É趨ÎÄ×ÖÑÕÉ«"
 
-#: src/dialogs.c:2847 src/rvous.c:265
+#: src/dialogs.c:2769
 #, c-format
 msgid "Error writing file %s"
 msgstr "дÈëÎļþ %s ·¢Éú´íÎó"
 
-#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
-#: src/rvous.c:548
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
+#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "´íÎó"
 
-#: src/dialogs.c:2901
+#: src/dialogs.c:2823
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - µ¼³öÅóÓÑÁбí"
 
-#: src/dialogs.c:2967 src/rvous.c:547
+#: src/dialogs.c:2891
 #, c-format
 msgid "Error reading file %s"
 msgstr "¶ÁÈ¡Îļþ %s ·¢Éú´íÎó"
 
-#: src/dialogs.c:3045
+#: src/dialogs.c:2967
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - µ¼ÈëÅóÓÑÁбí"
 
-#: src/dialogs.c:3124
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3030
+msgid "You cannot create an away message with a blank title"
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3037
+msgid "You cannot create an empty away message"
+msgstr ""
+
+#: src/dialogs.c:3104
 msgid "Gaim - New away message"
 msgstr "Gaim - ¸üÐÂÔÝʱÀ뿪ÐÅÏ¢"
 
-#. Put frame and button-box in the toplevel
-#: src/dialogs.c:3136
+#: src/dialogs.c:3114
 #, fuzzy
 msgid "New away message"
 msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
 
-#: src/dialogs.c:3149
+#: src/dialogs.c:3127
 msgid "Away title: "
 msgstr "ÔÝʱÀ뿪±êÌ⣺"
 
-#. Checkbox for showing away msg
-#: src/dialogs.c:3193
+#: src/dialogs.c:3167
 #, fuzzy
-msgid "Make Away Now"
-msgstr "Á¢¼´É趨ΪÔÝʱÀ뿪"
+msgid "Use"
+msgstr "GAIM ʹÓÃ"
+
+#: src/dialogs.c:3171
+msgid "Save & Use"
+msgstr ""
 
 #. show everything
-#: src/dialogs.c:3370
+#: src/dialogs.c:3340
 #, fuzzy
 msgid "Smile!"
 msgstr "Îļþ"
 
-#: src/dialogs.c:3441
+#: src/dialogs.c:3403 src/dialogs.c:3495
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:3478
+#: src/dialogs.c:3440 src/dialogs.c:3532
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Ôö¼ÓÅóÓÑ"
 
-#: src/gnome_applet_mgr.c:95
-#, c-format
-msgid "file not found: %s\n"
-msgstr "ÕÒ²»µ½Îļþ£º %s\n"
-
-#: src/gnome_applet_mgr.c:121
-msgid "Offilne. Click to bring up login box."
-msgstr "ÀëÏß¡£µã»÷ÕâÀïÆô¶¯µÇ¼´°"
-
-#: src/gnome_applet_mgr.c:128
-msgid "Attempting to sign on...."
-msgstr "ÕýÔڵǼ¡­¡­"
-
-#: src/gnome_applet_mgr.c:254
-msgid "GAIM"
+#: src/dialogs.c:3604
+#, fuzzy
+msgid "Gaim - Save Log File"
+msgstr "Gaim - ´æÅÌΪ¡­¡­"
+
+#: src/dialogs.c:3635
+#, fuzzy, c-format
+msgid "Unable to remove file %s - %s"
+msgstr "²»ÄܶÁÈëÎļþ %s¡£"
+
+#: src/dialogs.c:3666
+msgid "Really clear log?"
 msgstr ""
 
-#: src/gnome_applet_mgr.c:366
-msgid "Can't create GAIM applet!"
-msgstr "ÎÞ·¨½¨Á¢ GAIM applet!"
-
-#: src/gnome_applet_mgr.c:397
-msgid "Offline"
-msgstr "ÀëÏß"
-
-#: src/gnome_applet_mgr.c:411
-msgid "Font does not exist"
-msgstr "×ÖÐͲ»´æÔÚ"
-
-#: src/gnome_applet_mgr.c:427
-msgid "About..."
-msgstr "¹ØÓÚ¡­¡­"
-
-#: src/gtkhtml.c:1383
-msgid "HTML Link:"
-msgstr "³¬Îı¾Á¬½Ó£º"
-
-#: src/gtkhtml.c:1796
-msgid "Open URL in existing window"
-msgstr "ÔÚÒÑÓеĴ°¿ÚÄÚ´ò¿ª URL"
-
-#: src/gtkhtml.c:1805
-msgid "Open URL in new window"
-msgstr "н¨´°¿Ú´ò¿ª URL"
-
-#: src/gtkhtml.c:1813
-msgid "Add URL as bookmark"
-msgstr "°Ñ URL ¼ÓÈëÊéÇ©"
-
-#: src/html.c:122 src/html.c:125
+#: src/dialogs.c:3684
+#, fuzzy
+msgid "Okay"
+msgstr "È·¶¨"
+
+#: src/dialogs.c:3781
+#, fuzzy
+msgid "Clear"
+msgstr "¹Ø±Õ"
+
+#: src/gaimrc.c:870
+#, c-format
+msgid "Could not open config file %s."
+msgstr ""
+
+#: src/gaimrc.c:871
+#, fuzzy
+msgid "Preferences Error"
+msgstr "ÓÅÏÈÑ¡Ïî"
+
+#: src/html.c:121 src/html.c:124
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ´ò¿ªÁ¬½Ó´íÎó\n"
 
-#: src/html.c:158
+#: src/html.c:156
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "½ÓÊÕµ½ %d ×ÖÔª£¬À´Ô´£º %s"
 
-#: src/html.c:171
+#: src/html.c:169
 msgid "Getting Data"
 msgstr "½ÓÊÕÊý¾Ý"
 
-#: src/html.c:204
+#: src/html.c:201
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "ÊÕµ½ÁË£º¡°%s¡±\n"
 
-#: src/multi.c:367 src/prefs.c:112
+#: src/multi.c:345 src/prefs.c:114
 #, fuzzy
 msgid "General Options"
 msgstr "Ñ¡Ïî"
 
-#: src/multi.c:402
+#: src/multi.c:350
 #, fuzzy
 msgid "Screenname:"
 msgstr "ÏÔʾµÄÐÕÃû£º"
 
-#: src/multi.c:414
+#: src/multi.c:359
 #, fuzzy
 msgid "Password:"
 msgstr "ÃÜÂ룺"
 
-#: src/multi.c:429
+#: src/multi.c:370
+msgid "Protocol:"
+msgstr ""
+
+#: src/multi.c:375
 msgid "Remember Password"
 msgstr "¼ÇסÃÜÂë"
 
-#: src/multi.c:430
+#: src/multi.c:376
 #, fuzzy
 msgid "Auto-Login"
 msgstr "×Ô¶¯µÇ¼"
 
-#: src/multi.c:431
+#: src/multi.c:377
 msgid "Send KeepAlive packet (6 bytes/second)"
 msgstr ""
 
-#: src/multi.c:473
+#: src/multi.c:442
 #, fuzzy
 msgid "Gaim - Modify Account"
 msgstr "Gaim - µÇÈë"
 
-#: src/multi.c:482
-msgid "Modify Account"
-msgstr ""
-
-#: src/multi.c:576
+#: src/multi.c:546
 #, fuzzy
 msgid "Enter Password"
 msgstr "ÐÂÃÜÂë"
 
-#: src/multi.c:669
+#: src/multi.c:641
 #, fuzzy
 msgid "Gaim - Account Editor"
 msgstr "Gaim - ²å¼þÁбí"
 
-#: src/multi.c:678
-msgid "Account Editor"
-msgstr ""
-
-#: src/multi.c:697
+#: src/multi.c:662
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:701
+#: src/multi.c:666
 #, fuzzy
 msgid "Sign On/Off"
 msgstr "À뿪"
 
-#: src/multi.c:705
+#: src/multi.c:670
 #, fuzzy
 msgid "Delete"
 msgstr "Ñ¡Ôñ×ÖÐÍ"
 
-#: src/multi.c:851
+#: src/multi.c:837
 #, c-format
 msgid "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:300 src/oscar.c:317 src/toc.c:280 src/toc.c:290 src/toc.c:347
+#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "ÒѶϿª¡£"
 
-#: src/oscar.c:308
+#: src/oscar.c:302
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "Á¬½Ó´íÎó£¡\n"
 
-#: src/oscar.c:316
+#: src/oscar.c:310
 #, fuzzy
 msgid "major connection error\n"
 msgstr "Á¬½Ó´íÎó£¡\n"
 
-#: src/oscar.c:330 src/toc.c:500
+#: src/oscar.c:323 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:331
+#: src/oscar.c:324
 #, fuzzy
 msgid "Chat Error!"
 msgstr "´íÎó"
 
-#: src/oscar.c:362
+#: src/oscar.c:334
+#, fuzzy
+msgid "Chat is currently unavailable"
+msgstr "ÔÚ %s ÖÐûÓÐÁÄÌì¡£"
+
+#: src/oscar.c:335
+#, fuzzy
+msgid "Gaim - Chat"
+msgstr "Gaim ÁÄÌì"
+
+#: src/oscar.c:382
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Á¬½Óµ½£º %s\n"
 
-#: src/oscar.c:399
+#: src/oscar.c:420
 msgid "internal connection error\n"
 msgstr "ÄÚ²¿Á¬½Ó´íÎó\n"
 
-#: src/oscar.c:400
+#: src/oscar.c:421
 msgid "Unable to login to AIM"
 msgstr "²»ÄܵǼµ½ AIM"
 
-#: src/oscar.c:405
+#: src/oscar.c:426
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "²»ÄܽâÎöÖ÷»ú\n"
 
-#: src/oscar.c:409
+#: src/oscar.c:430
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "²»ÄÜÁ¬½Óµ½Ö÷»ú\n"
 
-#: src/oscar.c:416
+#: src/oscar.c:437
 #, c-format
 msgid "Signon: %s"
 msgstr "µÇ¼£º %s"
 
-#: src/oscar.c:426
+#: src/oscar.c:447
 msgid "Password sent, waiting for response\n"
 msgstr "ÃÜÂëÒÑËͳö£¬µÈºò»ØÓ¦\n"
 
-#: src/oscar.c:451
+#: src/oscar.c:474
 msgid "Signed off.\n"
 msgstr "µÇ³ö¡£\n"
 
 #. connecting too frequently
-#: src/oscar.c:466
+#: src/oscar.c:518
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1226,157 +1366,122 @@
 "ÄãÁ¬½Ó£¬¶Ï¿ªµÄƵÂÊÌ«¸ßÁË£¬µÈÊ®·ÖÖÓÔÙÊÔ¡£Èç¹ûÄã·ÇÒª½Ó×ÅÊÔ£¬µÈµÄʱ¼ä»á¸ü³¤¡£"
 
 #. client too old
-#: src/oscar.c:476
+#: src/oscar.c:528
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:480 src/toc.c:303
+#: src/oscar.c:532 src/toc.c:341
 msgid "Authentication Failed"
 msgstr "Ñé֤ʧ°Ü"
 
-#: src/oscar.c:513
+#: src/oscar.c:562
 msgid "Internal Error"
 msgstr "ÄÚ²¿´íÎó"
 
-#: src/oscar.c:520
+#: src/oscar.c:566
 msgid "Could Not Connect"
 msgstr "ÎÞ·¨Á¬½Ó"
 
-#: src/oscar.c:551
+#: src/oscar.c:600
 msgid "Connection established, cookie sent"
 msgstr "Á¬½Ó³É¹¦£¬Ëͳö±ý¸É¡£¡£°¡£¡±ý¸É£¿£¡"
 
-#: src/oscar.c:787 src/oscar.c:1860
+#: src/oscar.c:843 src/oscar.c:2100
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
 
-#: src/oscar.c:862 src/rvous.c:333 src/rvous.c:470
-msgid "Gaim - File Transfer"
-msgstr "Gaim - ´«ÊäÎļþ"
-
-#: src/oscar.c:866 src/rvous.c:454
-#, c-format
-msgid "Sending %s to %s"
-msgstr "ËÍ %s ¸ø %s"
-
-#: src/oscar.c:898
-msgid "Error in transfer"
-msgstr ""
-
-#: src/oscar.c:959
-msgid "Transfer complete."
-msgstr ""
-
-#: src/oscar.c:1012
-#, fuzzy
-msgid "Error examining file"
-msgstr "¶ÁÈ¡Îļþ %s ·¢Éú´íÎó"
-
-#: src/oscar.c:1012 src/oscar.c:1020 src/oscar.c:1043
-#, fuzzy
-msgid "GetFile Error"
-msgstr "Gaim - ´íÎó %d"
-
-#: src/oscar.c:1020
-msgid "Could not open temporary file, aborting"
-msgstr ""
-
-#: src/oscar.c:1043
-#, fuzzy
-msgid "Error connecting for transfer"
-msgstr "Á¬½Ó¶Ë¿Úʱ³ö´í¡£\n"
-
-#: src/oscar.c:1065
-#, fuzzy
-msgid "Gaim - Send File..."
-msgstr "Gaim - ´æÅÌΪ¡­¡­"
-
 #. message too large
-#: src/oscar.c:1194
+#: src/oscar.c:1293
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
 
-#: src/oscar.c:1195 src/oscar.c:1200 src/oscar.c:1222 src/oscar.c:1241
-#: src/oscar.c:1266
-#, fuzzy
-msgid "Gaim - Error"
-msgstr "Gaim - ´íÎó %d"
-
-#: src/oscar.c:1199
+#: src/oscar.c:1298
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1220
+#: src/oscar.c:1333
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1221 src/oscar.c:1240
+#: src/oscar.c:1334 src/oscar.c:1353
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1239
+#: src/oscar.c:1352
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1265
+#: src/oscar.c:1388
 #, c-format
-msgid "%s has no info/away message."
+msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1271
+#: src/oscar.c:1395
 msgid ""
-"Username : <B>%s</B>\n"
-"<BR>Warning Level : <B>%d %%</B>\n"
-"<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
+"Username : <B>%s</B>  %s <BR>\n"
+"Warning Level : <B>%d %%</B><BR>\n"
+"Online Since : <B>%s</B><BR>\n"
+"Idle Minutes : <B>%d</B>\n"
+"<BR>\n"
+"<HR><BR>\n"
+"%s<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
-"Óû§Ãû³Æ£º <B>%s</B>\n"
-"<BR>¾¯¸æ¼¶±ð£º <B>%d %%</B>\n"
-"<BR>Á¬Ïßʱ¿Ì£º <B>%s</B><BR>¿Õתʱ¼ä£¨·ÖÖÓ£©£º <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
-
-#: src/oscar.c:1305
+
+#: src/oscar.c:1430
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1306
+#: src/oscar.c:1431
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:1913
+#: src/oscar.c:2157
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s closed</B>"
 msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
 
-#: src/oscar.c:1958
+#: src/oscar.c:2216
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "²»ÄܵǼµ½ AIM"
 
-#: src/oscar.c:1967 src/toc.c:970
-#, fuzzy
-msgid "Get Info"
-msgstr "Óû§Ïêϸ×ÊÁÏ"
-
-#: src/oscar.c:1974
+#: src/oscar.c:2226
+#, c-format
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+
+#: src/oscar.c:2243
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "ÔÝʱÀ뿪ÐÅÏ¢"
 
-#: src/oscar.c:1982
+#: src/oscar.c:2251
 #, fuzzy
 msgid "Direct IM"
 msgstr "ÐÕÃûµØַ¼"
 
+#: src/oscar.c:2443
+msgid ""
+"Unfortunately, currently Oscar only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
 #. Below is basically stolen from plugins.c
-#: src/perl.c:639
+#: src/perl.c:638
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - É趨Óû§×ÊÁÏ"
@@ -1385,563 +1490,725 @@
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:104
+#: src/plugins.c:105
 msgid "Gaim - Plugin List"
 msgstr "Gaim - ²å¼þÁбí"
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
+#: src/plugins.c:185 src/plugins.c:191 src/plugins.c:215
 msgid "Plugin Error"
 msgstr "²å¼þ´íÎó"
 
-#: src/plugins.c:262
+#: src/plugins.c:261
 msgid "Gaim - Plugins"
 msgstr "Gaim - ²å¼þ"
 
 #. Build the bottom button bar
-#: src/plugins.c:294
+#: src/plugins.c:290
 msgid "Load Plugin"
 msgstr "ÔØÈë²å¼þ"
 
-#: src/plugins.c:301
+#: src/plugins.c:296
 msgid "Configure Plugin"
 msgstr "É趨²å¼þ"
 
-#: src/plugins.c:307
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr "жÔزå¼þ"
 
-#: src/prefs.c:120 src/prefs.c:180 src/prefs.c:227 src/prefs.c:339
-#: src/prefs.c:425 src/prefs.c:814 src/prefs.c:900 src/prefs.c:1043
-#: src/prefs.c:1408 src/prefs.c:1649
+#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
+#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
+#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1761
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#.
-#. prefrem = gaim_button(_("Remember password"), &general_options, OPT_GEN_REMEMBER_PASS, box);
-#. gtk_signal_connect(GTK_OBJECT(prefrem), "destroy", GTK_SIGNAL_FUNC(remdes), 0);
-#. gaim_button(_("Auto-login"), &general_options, OPT_GEN_AUTO_LOGIN, box);
-#.
-#. sep = gtk_hseparator_new();
-#. gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-#. gtk_widget_show(sep);
-#.
-#: src/prefs.c:134
+#: src/prefs.c:126
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:135
+#: src/prefs.c:128
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:138
+#: src/prefs.c:132
 msgid "Show Debug Window"
 msgstr ""
 
+#: src/prefs.c:144
+#, fuzzy
+msgid "Report Idle Times:"
+msgstr "ÏÔʾ¿Õתʱ¼ä"
+
+#: src/prefs.c:147
+msgid "None"
+msgstr ""
+
+#: src/prefs.c:148
+msgid "GAIM Use"
+msgstr "GAIM ʹÓÃ"
+
 #: src/prefs.c:150
 #, fuzzy
-msgid "Report Idle Times:"
-msgstr "ÏÔʾ¿Õתʱ¼ä"
-
-#: src/prefs.c:153
-msgid "None"
-msgstr ""
-
-#: src/prefs.c:154
-msgid "GAIM Use"
-msgstr "GAIM ʹÓÃ"
-
-#: src/prefs.c:156
-#, fuzzy
 msgid "X Use"
 msgstr "GAIM ʹÓÃ"
 
-#: src/prefs.c:172
+#: src/prefs.c:224
+#, fuzzy
+msgid "Browser Options"
+msgstr "Ñ¡Ïî"
+
+#: src/prefs.c:236
+msgid "Netscape"
+msgstr ""
+
+#: src/prefs.c:237
+msgid "KFM"
+msgstr ""
+
+#: src/prefs.c:239
+msgid "GNOME URL Handler"
+msgstr ""
+
+#: src/prefs.c:241
+msgid "Manual"
+msgstr "Óû§ÊÖ²á"
+
+#: src/prefs.c:252
+msgid "Pop up new window by default"
+msgstr "ȱʡµ¯³öд°¿Ú"
+
+#: src/prefs.c:279
+#, fuzzy
+msgid "Logging Options"
+msgstr "Á¬½Óµ½£º %s\n"
+
+#: src/prefs.c:291
+#, fuzzy
+msgid "Log all conversations"
+msgstr "¼Ç¼ËùÓжԻ°ÄÚÈÝ"
+
+#: src/prefs.c:292
+#, fuzzy
+msgid "Strip HTML from logs"
+msgstr "Çå³ý¼Ç¼ÎļþÄÚµÄ HTML ±ê¼Ç"
+
+#: src/prefs.c:298
+msgid "Log when buddies sign on/sign off"
+msgstr ""
+
+#: src/prefs.c:299
+msgid "Log when buddies become idle/un-idle"
+msgstr ""
+
+#: src/prefs.c:300
+msgid "Log when buddies go away/come back"
+msgstr ""
+
+#: src/prefs.c:301
+msgid "Log your own signons/idleness/awayness (as set by options above)"
+msgstr ""
+
+#: src/prefs.c:302
+msgid "Individual log file for each buddy's signons"
+msgstr ""
+
+#: src/prefs.c:317
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "ÅóÓÑÁбí"
 
-#: src/prefs.c:184
-msgid "Show numbers in groups"
-msgstr "ÔÚ×éÀïÏÔʾºÅÂë"
-
-#: src/prefs.c:185
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:186
-msgid "Show idle times"
-msgstr "ÏÔʾ¿Õתʱ¼ä"
-
-#: src/prefs.c:187
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "ÏÔʾÅóÓÑÀà±ðͼÐÎ"
-
-#: src/prefs.c:193
-msgid "Hide IM/Info/Chat buttons"
-msgstr ""
-
-#: src/prefs.c:194
-msgid "Show pictures on buttons"
-msgstr ""
-
-#: src/prefs.c:200
+#: src/prefs.c:329
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "±£´æijЩ´°¿Ú´óСºÍλÖÃ"
 
-#: src/prefs.c:202
+#: src/prefs.c:331
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "×Ô¶¯ÏÔʾÅóÓÑÁбí"
 
-#: src/prefs.c:203
+#: src/prefs.c:333
 #, fuzzy
 msgid "Display Buddy List near applet"
 msgstr "ÔÚ applet ¸½½üÏÔʾÅóÓÑÁбí"
 
-#: src/prefs.c:219
+#: src/prefs.c:340
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:341
+msgid "Show numbers in groups"
+msgstr "ÔÚ×éÀïÏÔʾºÅÂë"
+
+#: src/prefs.c:347
+#, fuzzy
+msgid "Show buddy type icons"
+msgstr "ÏÔʾÅóÓÑÀà±ðͼÐÎ"
+
+#: src/prefs.c:348
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:349
+msgid "Show idle times"
+msgstr "ÏÔʾ¿Õתʱ¼ä"
+
+#: src/prefs.c:355
+msgid "Hide IM/Info/Chat buttons"
+msgstr ""
+
+#: src/prefs.c:356
+msgid "Show pictures on buttons"
+msgstr ""
+
+#: src/prefs.c:371
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:231
+#: src/prefs.c:383
 msgid "Enter sends message"
 msgstr "ÊäÈë·¢ËÍÐÅÏ¢"
 
-#: src/prefs.c:232
+#: src/prefs.c:384
+#, fuzzy
+msgid "Control-Enter sends message"
+msgstr "ÊäÈë·¢ËÍÐÅÏ¢"
+
+#: src/prefs.c:385
+msgid "Escape closes window"
+msgstr ""
+
+#: src/prefs.c:386
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:233
+#: src/prefs.c:387
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:239
+#: src/prefs.c:388
+msgid "F2 toggles timestamp display"
+msgstr ""
+
+#: src/prefs.c:394
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "ÏÔʾͼÐÎЦÁ³ £¨ÊÔÑé½×¶Î£©"
 
-#: src/prefs.c:240
+#: src/prefs.c:395
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "ÔÚÐÅÏ¢ÀïÏÔʾʱ¼ä"
 
-#: src/prefs.c:241
+#: src/prefs.c:396
 #, fuzzy
-msgid "Ignore incoming colors"
+msgid "Ignore colors"
 msgstr "²»Àí½øÀ´µÄÑÕÉ«"
 
-#: src/prefs.c:242
-msgid "Ignore white backgrounds"
-msgstr ""
-
-#: src/prefs.c:248
+#: src/prefs.c:397
 #, fuzzy
-msgid "Log all conversations"
-msgstr "¼Ç¼ËùÓжԻ°ÄÚÈÝ"
-
-#: src/prefs.c:249
+msgid "Ignore font faces"
+msgstr "Ôö´ó×ÖÌå"
+
+#: src/prefs.c:398
 #, fuzzy
-msgid "Strip HTML from logs"
-msgstr "Çå³ý¼Ç¼ÎļþÄÚµÄ HTML ±ê¼Ç"
-
-#: src/prefs.c:255
+msgid "Ignore font sizes"
+msgstr "Ôö´ó×ÖÌå"
+
+#: src/prefs.c:404
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "×Ô¶¯Í»³öÆ´´íµÄµ¥´Ê"
 
-#: src/prefs.c:256
+#: src/prefs.c:405
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "°Ñ URL ÒÔÁ¬½Ó·½Ê½Ëͳö"
 
-#: src/prefs.c:257
+#: src/prefs.c:406
 msgid "Sending messages removes away status"
 msgstr "·¢³öÐÅϢʱ×Ô¶¯È¡ÏûÔÝʱÀ뿪״̬"
 
-#: src/prefs.c:298 src/prefs.c:386
+#: src/prefs.c:447 src/prefs.c:540
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:303 src/prefs.c:391
+#: src/prefs.c:453 src/prefs.c:546
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:308 src/prefs.c:396
+#: src/prefs.c:459 src/prefs.c:552
 #, fuzzy
 msgid "Text Only"
 msgstr "ÎÄ×ÖÑÕÉ«"
 
-#: src/prefs.c:331
+#: src/prefs.c:483
 #, fuzzy
 msgid "IM Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:343
+#: src/prefs.c:495
+#, fuzzy
+msgid "Show all conversations in one tabbed window"
+msgstr "ÔÚ½»Ì¸´°¿ÚÏÔʾµÇ¼£¯µÇ³öÐÅÏ¢"
+
+#: src/prefs.c:496
 #, fuzzy
 msgid "Show logins in window"
 msgstr "ÔÚ½»Ì¸´°¿ÚÏÔʾµÇ¼£¯µÇ³öÐÅÏ¢"
 
-#: src/prefs.c:349 src/prefs.c:435
+#: src/prefs.c:502 src/prefs.c:593
 #, fuzzy
 msgid "Show buttons as "
 msgstr "ÏÔʾͼÐΰ´Å¥"
 
-#: src/prefs.c:358 src/prefs.c:445
+#: src/prefs.c:511 src/prefs.c:603
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:359 src/prefs.c:446
+#: src/prefs.c:513 src/prefs.c:605
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "ÊÕµ½ÐÅϢʱÉýÆð´°¿Ú"
 
-#: src/prefs.c:360
+#: src/prefs.c:514
 msgid "Ignore new conversations when away"
 msgstr "ÔÝʱÀ뿪ʱ£¬ºöÂÔеĶԻ°"
 
-#: src/prefs.c:361
+#: src/prefs.c:516
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "´´×÷ÐÅÏ¢"
 
-#: src/prefs.c:417 src/prefs.c:620
+#: src/prefs.c:574
 #, fuzzy
 msgid "Chat Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:429
+#: src/prefs.c:586
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
+#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
 msgid "Gaim Chat"
 msgstr "Gaim ÁÄÌì"
 
-#: src/prefs.c:638
+#: src/prefs.c:779 src/prefs.c:2234
+msgid "Chat Rooms"
+msgstr ""
+
+#: src/prefs.c:797
 msgid "Refresh"
 msgstr "Ë¢ÐÂ"
 
-#: src/prefs.c:666
+#: src/prefs.c:822
 msgid "List of available chats"
 msgstr "ÏÖÓÐÁÄÌìÁбí"
 
-#: src/prefs.c:680
+#: src/prefs.c:832
 msgid "List of subscribed chats"
 msgstr "¶©ÔĵÄÁÄÌìÁбí"
 
-#: src/prefs.c:806 src/prefs.c:2084
+#: src/prefs.c:962 src/prefs.c:2239
 #, fuzzy
 msgid "Font Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:820
+#: src/prefs.c:976
 msgid "Underlined Text"
 msgstr "ϼÓÏßÎÄ×Ö"
 
-#: src/prefs.c:821
+#: src/prefs.c:977
 msgid "Strike Text"
 msgstr "»®µôµÄÎÄ×Ö"
 
-#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
+#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
 #, fuzzy
 msgid "Select"
 msgstr "Ñ¡Ôñ×ÖÐÍ"
 
-#: src/prefs.c:869
+#: src/prefs.c:1027
 msgid "Font Face for Text"
 msgstr "ÎÄ×ÖµÄ×ÖÐÍ"
 
-#: src/prefs.c:892
+#: src/prefs.c:1042
+#, fuzzy
+msgid "Font Size for Text"
+msgstr "ÎÄ×ÖµÄ×ÖÐÍ"
+
+#: src/prefs.c:1067
 #, fuzzy
 msgid "Sound Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:904
+#: src/prefs.c:1079
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "ÅóÓѵǼÉù"
 
-#: src/prefs.c:905 src/prefs.c:1296
+#: src/prefs.c:1080 src/prefs.c:1511
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:906
+#: src/prefs.c:1081
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:968
+#: src/prefs.c:1146
 #, fuzzy
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
 
-#: src/prefs.c:1002
+#: src/prefs.c:1181
 #, fuzzy
 msgid "Reset"
 msgstr "×¢²á"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1186
 #, fuzzy
-msgid "Choose"
+msgid "Choose..."
 msgstr "¹Ø±Õ"
 
-#: src/prefs.c:1035
+#: src/prefs.c:1222
 #, fuzzy
 msgid "Sound Events"
 msgstr "ÉùÒô"
 
-#: src/prefs.c:1047
+#: src/prefs.c:1234
 msgid "Sound when buddy logs in"
 msgstr "ÅóÓѵǼÉù"
 
-#: src/prefs.c:1048
+#: src/prefs.c:1235
 msgid "Sound when buddy logs out"
 msgstr "ÅóÓѵdzöÉù"
 
-#: src/prefs.c:1054
+#: src/prefs.c:1241
 msgid "Sound when message is received"
 msgstr "ÊÕµ½ÐÅÏ¢Éù"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1242
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "ÊÕµ½ÐÅÏ¢Éù"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1243
 msgid "Sound when message is sent"
 msgstr "·¢³öÐÅÏ¢Éù"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1249
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "ÁÄÌìÊÒÀÅóÓѽøÈ룯À뿪Éù"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1250
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "ÁÄÌìÊÒÀÅóÓѽøÈ룯À뿪Éù"
 
-#: src/prefs.c:1064
+#: src/prefs.c:1251
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "ÁÄÌìÊÒÓÐÈË˵»°Éù"
 
-#: src/prefs.c:1065
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "ÁÄÌìÊÒÓÐÈË˵»°Éù"
 
-#: src/prefs.c:1197 src/prefs.c:2111
+#: src/prefs.c:1262
+#, c-format
+msgid "Command to play sound files (%s for filename; internal if empty)"
+msgstr ""
+
+#: src/prefs.c:1408 src/prefs.c:2266
 #, fuzzy
 msgid "Away Messages"
 msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
 
-#: src/prefs.c:1209
+#: src/prefs.c:1420
 #, fuzzy
 msgid "Title"
 msgstr "Îļþ"
 
-#: src/prefs.c:1213
+#: src/prefs.c:1424
 #, fuzzy
 msgid "Message"
 msgstr "´´×÷ÐÅÏ¢"
 
-#: src/prefs.c:1253
+#: src/prefs.c:1464
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1257
+#: src/prefs.c:1468
 #, fuzzy
 msgid "Make Away"
 msgstr "Á¢¼´É趨ΪÔÝʱÀ뿪"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1509
 #, fuzzy
 msgid "Ignore new conversations when away   "
 msgstr "ÔÝʱÀ뿪ʱ£¬ºöÂÔеĶԻ°"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1521
 msgid "Auto Away after"
 msgstr ""
 
-#: src/prefs.c:1318
+#: src/prefs.c:1534
 msgid "minutes using"
 msgstr ""
 
-#: src/prefs.c:1400
-#, fuzzy
-msgid "Browser Options"
-msgstr "Ñ¡Ïî"
-
-#: src/prefs.c:1412
-msgid "Netscape"
-msgstr ""
-
-#: src/prefs.c:1413
-msgid "KFM"
-msgstr ""
-
-#: src/prefs.c:1415
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:1417
-msgid "Manual"
-msgstr "Óû§ÊÖ²á"
-
-#: src/prefs.c:1426
-msgid "Pop up new window by default"
-msgstr "ȱʡµ¯³öд°¿Ú"
-
-#: src/prefs.c:1641
+#: src/prefs.c:1753
 #, fuzzy
 msgid "Privacy Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1769
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1677
+#: src/prefs.c:1788
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1678
+#: src/prefs.c:1789
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1680
+#: src/prefs.c:1791
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1712
+#: src/prefs.c:1822
 #, fuzzy
 msgid "Deny all users"
 msgstr "¾Ü¾øijЩÈË"
 
-#: src/prefs.c:1713
+#: src/prefs.c:1823
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1715
+#: src/prefs.c:1825
 #, fuzzy
 msgid "Block List"
 msgstr "¿é"
 
-#: src/prefs.c:1791
+#: src/prefs.c:1920
 msgid "Gaim - Preferences"
 msgstr "Gaim - ÓÅÏÈÉ趨"
 
-#: src/prefs.c:1877
+#: src/prefs.c:2000
 msgid "GAIM debug output window"
 msgstr "GAIM ³ý³æÊä³ö´°¿Ú"
 
-#: src/prefs.c:2040
+#: src/prefs.c:2185
 msgid "General"
 msgstr "Ò»°ãÉ趨"
 
-#: src/prefs.c:2064
+#: src/prefs.c:2190
+msgid "Browser"
+msgstr "ä¯ÀÀÆ÷"
+
+#: src/prefs.c:2219
 #, fuzzy
 msgid "Conversations"
 msgstr "¼Ç¼ËùÓжԻ°ÄÚÈÝ"
 
-#: src/prefs.c:2069
+#: src/prefs.c:2224
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2074
+#: src/prefs.c:2229
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2079
-msgid "Chat Rooms"
-msgstr ""
-
-#: src/prefs.c:2095
+#: src/prefs.c:2250
 msgid "Sounds"
 msgstr "ÉùÒô"
 
-#: src/prefs.c:2122
-msgid "Browser"
-msgstr "ä¯ÀÀÆ÷"
-
-#: src/prefs.c:2133
+#: src/prefs.c:2255
+msgid "Events"
+msgstr ""
+
+#: src/prefs.c:2277
 msgid "Privacy"
 msgstr ""
 
-#: src/rvous.c:148
-msgid "Gaim - Save As..."
-msgstr "Gaim - ´æÅÌΪ¡­¡­"
-
-#: src/rvous.c:317
+#: src/prpl.c:73
+msgid ""
+"You have attempted to load a protocol which was not compiled from the same "
+"version of the source as this application was. Unfortunately, because it is "
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
+msgstr ""
+
+#: src/prpl.c:77
+#, fuzzy
+msgid "Protocol Error"
+msgstr "²å¼þ´íÎó"
+
+#: src/prpl.c:97
 #, c-format
-msgid "Receiving %s from %s"
-msgstr "ÊÕµ½ %s £¬À´Ô´£º %s"
-
-#: src/rvous.c:693
+msgid "%s was using %s, which got removed. %s is now offline."
+msgstr ""
+
+#: src/prpl.c:100
+#, fuzzy
+msgid "Disconnect"
+msgstr "ÒѶϿª¡£"
+
+#: src/prpl.c:140
+#, fuzzy
+msgid "Accept?"
+msgstr "½ÓÊÜ"
+
+#: src/prpl.c:160 src/prpl.c:231
 msgid "Accept"
 msgstr "½ÓÊÜ"
 
-#: src/rvous.c:720
-#, c-format
-msgid "%s requests you to accept the file: %s (%d bytes)"
-msgstr "%s ÇëÇóÄã½ÓÊÜÎļþ£º %s (%d ×ÖÔª )"
-
-#: src/rvous.c:723
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ÇëÇóÄã¸øËûÃÇ·¢ËÍÒ»¸öÎļþ"
-
-#: src/rvous.c:733
-msgid "Gaim - File Transfer?"
-msgstr "Gaim - ´«ËÍÎļþ£¿"
-
-#: src/server.c:581
+#: src/prpl.c:204
+#, fuzzy
+msgid "Gaim - Prompt"
+msgstr "Gaim - Ôö¼Ó ÔÊÐí£¯½ûÖ¹"
+
+#: src/prpl.c:299
+#, fuzzy
+msgid "Gaim - New User Registration"
+msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
+
+#: src/prpl.c:308
+msgid "New User Registration"
+msgstr ""
+
+#: src/prpl.c:320
+msgid "Register new user for"
+msgstr ""
+
+#: src/server.c:608
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:582
+#: src/server.c:609
 msgid "No"
 msgstr ""
 
-#: src/toc.c:253 src/toc.c:260
+#: src/toc.c:290 src/toc.c:297
 #, fuzzy
 msgid "Connection Closed"
 msgstr "Á¬½Ó"
 
-#: src/toc.c:295
+#: src/toc.c:332
 msgid "Waiting for reply..."
 msgstr ""
 
-#: src/toc.c:354
+#: src/toc.c:391
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/toc.c:355
+#: src/toc.c:392
 msgid "TOC Resume"
 msgstr ""
 
-#: src/toc.c:515
+#: src/toc.c:560
 #, fuzzy
 msgid "Password Change Successeful"
 msgstr "Gaim - ¸ü¸ÄÃÜÂë"
 
-#: src/toc.c:518
+#: src/toc.c:563
 msgid ""
 "TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
 
-#: src/toc.c:521
+#: src/toc.c:566
 msgid "TOC Pause"
 msgstr ""
 
-#: src/toc.c:977
+#: src/toc.c:923
 #, fuzzy
 msgid "Get Dir Info"
 msgstr "ÐÕÃûµØַ¼"
 
+#: src/toc.c:1190
+msgid ""
+"Unfortunately, currently TOC only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
+#: src/toc.c:1499 src/toc.c:1676
+#, fuzzy
+msgid "Could not connect for transfer!"
+msgstr "Á¬½Ó¶Ë¿Úʱ³ö´í¡£\n"
+
+#: src/toc.c:1706
+msgid "Could not write file header!"
+msgstr ""
+
+#: src/toc.c:1741
+msgid "Gaim - Save As..."
+msgstr "Gaim - ´æÅÌΪ¡­¡­"
+
+#: src/toc.c:1780
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
+msgstr "%s ÇëÇóÄã½ÓÊÜÎļþ£º %s (%d ×ÖÔª )"
+
+#: src/toc.c:1785
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr "%s ÇëÇóÄã¸øËûÃÇ·¢ËÍÒ»¸öÎļþ"
+
+#, fuzzy
+#~ msgid "Change password for:"
+#~ msgstr "¸ü¸ÄÃÜÂë"
+
+#, fuzzy
+#~ msgid "Make Away Now"
+#~ msgstr "Á¢¼´É趨ΪÔÝʱÀ뿪"
+
+#~ msgid "HTML Link:"
+#~ msgstr "³¬Îı¾Á¬½Ó£º"
+
+#~ msgid "Open URL in existing window"
+#~ msgstr "ÔÚÒÑÓеĴ°¿ÚÄÚ´ò¿ª URL"
+
+#~ msgid "Open URL in new window"
+#~ msgstr "н¨´°¿Ú´ò¿ª URL"
+
+#~ msgid "Add URL as bookmark"
+#~ msgstr "°Ñ URL ¼ÓÈëÊéÇ©"
+
+#~ msgid "Gaim - File Transfer"
+#~ msgstr "Gaim - ´«ÊäÎļþ"
+
+#~ msgid "Sending %s to %s"
+#~ msgstr "ËÍ %s ¸ø %s"
+
+#, fuzzy
+#~ msgid "Error examining file"
+#~ msgstr "¶ÁÈ¡Îļþ %s ·¢Éú´íÎó"
+
+#, fuzzy
+#~ msgid "GetFile Error"
+#~ msgstr "Gaim - ´íÎó %d"
+
+#~ msgid ""
+#~ "Username : <B>%s</B>\n"
+#~ "<BR>Warning Level : <B>%d %%</B>\n"
+#~ "<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
+#~ "<BR><HR><BR>%s\n"
+#~ msgstr ""
+#~ "Óû§Ãû³Æ£º <B>%s</B>\n"
+#~ "<BR>¾¯¸æ¼¶±ð£º <B>%d %%</B>\n"
+#~ "<BR>Á¬Ïßʱ¿Ì£º <B>%s</B><BR>¿Õתʱ¼ä£¨·ÖÖÓ£©£º <B>%d</B>\n"
+#~ "<BR><HR><BR>%s\n"
+
+#~ msgid "Receiving %s from %s"
+#~ msgstr "ÊÕµ½ %s £¬À´Ô´£º %s"
+
+#~ msgid "Gaim - File Transfer?"
+#~ msgstr "Gaim - ´«ËÍÎļþ£¿"
+
 #~ msgid "You must give your password"
 #~ msgstr "ÄãÐèÒªÊäÈëÃÜÂë"
 
@@ -2046,9 +2313,6 @@
 #~ msgid "Remove buddy from permit/deny"
 #~ msgstr "°ÑijÈË´ÓÔÊÐí£¯¾Ü¾ø±íɾ³ý"
 
-#~ msgid "Ok"
-#~ msgstr "È·¶¨"
-
 #~ msgid "Idle"
 #~ msgstr "¿Õת"