changeset 1195:0af0a11af61e

[gaim-migrate @ 1205] Fixes Fixes fixes :) committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Mon, 04 Dec 2000 07:58:38 +0000
parents 099b233e7da6
children 21a26b44a3fc
files Makefile.am NEWS configure.in doc/gaim.1 gaim.spec.in po/de.po po/es.po po/fr.po po/ko.po po/zh_CN.po src/util.c
diffstat 11 files changed, 4549 insertions(+), 3558 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Mon Dec 04 07:13:31 2000 +0000
+++ b/Makefile.am	Mon Dec 04 07:58:38 2000 +0000
@@ -15,9 +15,10 @@
 gaimdesktopdir = $(gnomedata)/applets/Network
 gaimdesktop_DATA = $(gaim_DESKTOP)
 
-gaim_SOUND = gaim.soundlist
-gaimsounddir = $(gnomesysconf)/sound/events
-gaimsound_DATA = $(gaim_SOUND)
+# We dont need this no more :) I got good english =)
+#gaim_SOUND = gaim.soundlist
+#gaimsounddir = $(gnomesysconf)/sound/events
+#gaimsound_DATA = $(gaim_SOUND)
 
 endif
 
@@ -29,8 +30,9 @@
 distribdesktopdir = $(datadir)/applets/Network
 distribdesktop_DATA = gaim_applet.desktop
 
-distribsounddir = $(sysconfdir)/sound/events
-distribsound_DATA = gaim.soundlist
+#Get outta here
+#distribsounddir = $(sysconfdir)/sound/events
+#distribsound_DATA = gaim.soundlist
 
 endif
 
--- a/NEWS	Mon Dec 04 07:13:31 2000 +0000
+++ b/NEWS	Mon Dec 04 07:58:38 2000 +0000
@@ -1,30 +1,36 @@
 -=[ GAIM ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
-0.11.0-pre1 (12/03/2000):
-	Rob: Hey guys!  Guess what!?  Yup, you're correct!  It's the pre1 release of 0.11.0.
-	We have all sorts of goodies in this release!  Check out the ChangeLog file.  As always
-	if you find any bugs, please report them on www.sourceforge.net/projects/gaim/
-	You may find several as this is still a prerelease.  
+0.11.0pre1 (12/03/2000):
+	Rob: Hey guys!  Guess what!?  Yup, you're correct!  It's the pre1 release 
+	of 0.11.0. We have all sorts of goodies in this release!  Check out the 
+	ChangeLog file.  As always if you find any bugs, please report them on 
+	www.sourceforge.net/projects/gaim/
+	
+	You may find several small bugs as this is still a prerelease.  
 
-	You may want to note that my IRC plugin does not have full functionality as of yet.  All
-	of the important / commands will be added before the final release. Also, if someone could
-	send me some good buddylist pixmaps for the irc plugin then I'd much appreciate it.  Thanks
-	to everyone who made this new release possible!
+	You may want to note that my IRC plugin does not have full functionality 
+	as of yet.  All of the important / commands will be added before the final 
+	release. Also, if someone could send me some good buddylist pixmaps for 
+	the irc plugin then I'd much appreciate it.  Thanks to everyone who made 
+	this new release possible!
 
-	If you have any ideas, comments, or suggestions, please let us know either by e-mail or via
-	the source forge message board at the URL above. :)
+	If you have any ideas, comments, or suggestions, please let us know 
+	either by e-mail or via the source forge message board at the URL above. :)
 
 
-	Eric: So what was Yay! For Gaim!? Yay was the codename for the Yahoo plugin. The whole
-	point of all of these changes was I wanted to make a proof-of-concept plugin that would
-	let Gaim sign into Yahoo. It turned out to be pretty much impossible with the old code. So,
-	Rob and I hacked gaim so we could do just that. There's now a whole new class of plugins,
-	Protocol Plugins, that let users dynamically add new protocols to Gaim. Just load the
-	plugin, and create a new account that uses that protocol, and you're set! Yay! (Oscar and
-	TOC are both still static. Gaim is, after all, primarily an AIM client.)
+	Eric: So what was Yay! For Gaim!? Yay was the codename for the 
+	Yahoo plugin. The whole point of all of these changes was I wanted to 
+	make a proof-of-concept plugin that would let Gaim sign into Yahoo. It 
+	turned out to be pretty much impossible with the old code. So,
+	Rob and I hacked gaim so we could do just that. There's now a whole new 
+	class of plugins, Protocol Plugins, that let users dynamically add new 
+	protocols to Gaim. Just load the plugin, and create a new account that 
+	uses that protocol, and you're set! Yay! (Oscar and TOC are both still 
+	static. Gaim is, after all, primarily an AIM client.)
 
-	Lots of people have been very generous and contributed a lot of time and effort to writing
-	some really nice patches for gaim since the last release. To all of you, a big thanks.
+	Lots of people have been very generous and contributed a lot of time and 
+	effort to writing some really nice patches for gaim since the last 
+	release. To all of you, a big thanks.
 
 0.10.3 (10/09/2000):
 	Rob: I am dumb.
--- a/configure.in	Mon Dec 04 07:13:31 2000 +0000
+++ b/configure.in	Mon Dec 04 07:58:38 2000 +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.0-pre1])
+AM_INIT_AUTOMAKE([gaim], [0.11.0pre1])
 
 dnl Checks for programs.
 AM_PROG_LIBTOOL
--- a/doc/gaim.1	Mon Dec 04 07:13:31 2000 +0000
+++ b/doc/gaim.1	Mon Dec 04 07:58:38 2000 +0000
@@ -21,7 +21,7 @@
 .\" USA.
 .TH GAIM 1
 .SH NAME
-gaim v0.11.0-pre1 \- Instant Messaging client
+gaim v0.11.0pre1 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
 \fBgaim\fR
--- a/gaim.spec.in	Mon Dec 04 07:13:31 2000 +0000
+++ b/gaim.spec.in	Mon Dec 04 07:58:38 2000 +0000
@@ -15,6 +15,7 @@
 Vendor:		Pimpin' Penguins
 Url:		http://www.marko.net/gaim/
 Source:		%{name}-%{version}.tar.gz
+Packager:	Rob Flynn <rob@tgflinux.com>
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 Requires:	gtk+ >= 1.2.3
 
@@ -28,6 +29,10 @@
 It contains many of the same features as AOL's IM client while at
 the same time incorporating many new features.
 
+Gaim also contains a multiple connection feature which consists of 
+protocol plugins.  These plugins allow you to use gaim to connect 
+to other chat services such as Yahoo!, ICQ, and IRC.
+
 %package applet
 Summary:	A Gnome client compatible with AOL's 'Instant Messenger'
 Group:		Applications/Internet
@@ -43,6 +48,10 @@
 It contains many of the same features as AOL's IM client while at
 the same time incorporating many new features.
 
+Gaim also contains a multiple connection feature which consists of 
+protocol plugins.  These plugins allow you to use gaim to connect 
+to other chat services such as Yahoo!, ICQ, and IRC.
+
 The applet sits in your Gnome panel. It has all the same functionality
 as the regular application but takes less desktop space.
 
--- a/po/de.po	Mon Dec 04 07:13:31 2000 +0000
+++ b/po/de.po	Mon Dec 04 07:58:38 2000 +0000
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/gnome_applet_mgr.c:254
+#: src/gnome_applet_mgr.c:256
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2000-10-09 11:11-0700\n"
+"POT-Creation-Date: 2000-12-03 23:24-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,197 +15,178 @@
 "Content-Type: text/plain; charset=iso-8859\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:73
+#: src/about.c:72
 #, c-format
 msgid "About GAIM v%s"
 msgstr "Über GAIM v%s"
 
-#: src/aim.c:168
+#: src/aim.c:133 src/buddy.c:2100
+msgid "Signoff"
+msgstr "Abmelden"
+
+#: src/aim.c:147
 msgid "Please enter your logon"
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:172
-msgid "You must give your password"
-msgstr "Bitte geben Sie ein Passwort ein"
+#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#, fuzzy
+msgid "Signon Error"
+msgstr "Los"
 
-#: src/aim.c:222 src/buddy.c:1873
-msgid "Signoff"
-msgstr "Abmelden"
+#: src/aim.c:152
+#, fuzzy
+msgid "Please enter your password"
+msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:325 src/aim.c:570 src/buddy.c:319
+#: src/aim.c:254 src/multi.c:608
 msgid "Signon"
 msgstr "Los"
 
-#: src/aim.c:326 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:428
-#: src/dialogs.c:747 src/dialogs.c:822 src/dialogs.c:979 src/dialogs.c:1056
-#: src/dialogs.c:1173 src/dialogs.c:1305 src/dialogs.c:1492 src/dialogs.c:1597
-#: src/dialogs.c:1678 src/dialogs.c:1923 src/dialogs.c:2111 src/dialogs.c:2277
-#: src/dialogs.c:2372 src/dialogs.c:3098 src/dialogs.c:3360 src/oscar.c:655
-#: src/rvous.c:279 src/rvous.c:416 src/rvous.c:638
+#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+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:327 src/buddy.c:1870
+#: src/aim.c:259
 msgid "Register"
 msgstr "Neu"
 
-#: src/aim.c:328
+#: src/aim.c:260
 msgid "Options"
 msgstr "Einstellungen"
 
-#: src/aim.c:330 src/aim.c:576 src/buddy.c:1936
+#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:404
+#. Labels for selectors and text boxes
+#: src/aim.c:338
 msgid "Screen Name: "
 msgstr "Benutzername: "
 
-#: src/aim.c:407
+#: src/aim.c:341
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/aim.c:410
-msgid "Remember Password"
-msgstr "Passwort Speichern"
-
-#: src/aim.c:457
+#: src/aim.c:380
 msgid "Gaim - Login"
 msgstr "Gaim - Anmeldung"
 
-#: src/aim.c:565 src/buddy.c:1933
+#: src/aim.c:599 src/buddy.c:2163
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/away.c:88 src/away.c:203
+#: src/away.c:110 src/away.c:227
 msgid "Back"
 msgstr "Zurück"
 
-#: src/away.c:99
+#: src/away.c:121
 msgid "I'm Back!"
 msgstr "Ich bin zurück"
 
-#: src/away.c:141
+#: src/away.c:160
 msgid "Gaim - Away!"
 msgstr "Gaim - Abwesenheit!"
 
-#: src/away.c:242 src/gnome_applet_mgr.c:198
+#: src/away.c:266 src/gnome_applet_mgr.c:200
 msgid "New Away Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/away.c:260
+#: src/away.c:284
 msgid "Remove Away Message"
 msgstr "Abwesenheits-Mitteilung löschen"
 
-#: src/buddy.c:161
-#, c-format
-msgid "%d/%d Buddies Online"
-msgstr "%d/%d Buddies Online"
-
 #. Put the buttons in the box
-#: src/buddy.c:260 src/buddy.c:2005 src/buddy_chat.c:816
-#: src/conversation.c:440 src/conversation.c:1658 src/dialogs.c:977
-#: src/dialogs.c:1055 src/dialogs.c:1922 src/dialogs.c:1944 src/dialogs.c:3358
-#: src/prefs.c:667 src/prefs.c:1108 src/prefs.c:1565
+#: 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
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/buddy.c:261 src/buddy.c:2006 src/dialogs.c:987 src/dialogs.c:1071
+#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:262 src/buddy.c:2007 src/buddy_chat.c:818
-#: src/conversation.c:1656 src/dialogs.c:885 src/prefs.c:671 src/prefs.c:1109
-#: src/prefs.c:1577
+#: 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
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/buddy.c:265 src/buddy.c:1777
+#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:266 src/buddy.c:406 src/buddy.c:1775 src/buddy_chat.c:543
+#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
 msgid "IM"
 msgstr "Telegramm"
 
-#: src/buddy.c:267 src/buddy.c:412 src/buddy.c:1776 src/buddy_chat.c:545
-#: src/buddy_chat.c:824 src/conversation.c:1652 src/rvous.c:636
+#: 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
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:418 src/dialogs.c:3372
+#. Put the buttons in the box
+#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
 msgid "Alias"
 msgstr ""
 
 #: src/buddy.c:425
-msgid "Dir Info"
-msgstr "Profil"
-
-#: src/buddy.c:432
-#, fuzzy
-msgid "Direct IM"
-msgstr "Profil"
-
-#: src/buddy.c:438
-msgid "Away Msg"
-msgstr "Abwesenht."
-
-#: src/buddy.c:445
-msgid "Toggle Logging"
-msgstr "Mitschnitt ein"
-
-#: src/buddy.c:451
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alert Hinzufügen"
 
-#: src/buddy.c:1270
+#: src/buddy.c:1368
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alert"
 
-#: src/buddy.c:1288
+#: src/buddy.c:1386
 msgid "Remove Buddy Pounce"
 msgstr "Lösche Buddy-Alert"
 
-#: src/buddy.c:1376
-#, fuzzy, c-format
-msgid "%sBuddy Icon"
+#: src/buddy.c:1675
+#, fuzzy
+msgid "Buddy Icon"
 msgstr "Buddy-Alert"
 
-#: src/buddy.c:1379
-#, c-format
-msgid "%sVoice"
-msgstr ""
-
-#: src/buddy.c:1382
-#, c-format
-msgid "%sIM Image"
+#: src/buddy.c:1678
+msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1385
-#, c-format
-msgid "%sChat"
+#: src/buddy.c:1681
+msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1388
-#, c-format
-msgid "%sGet File"
-msgstr ""
+#: src/buddy.c:1687
+#, fuzzy
+msgid "Get File"
+msgstr "Datei"
 
-#: src/buddy.c:1391
-#, c-format
-msgid "%sSend File"
-msgstr ""
+#: src/buddy.c:1690
+#, fuzzy
+msgid "Send File"
+msgstr "Datei"
 
-#: src/buddy.c:1446
+#: src/buddy.c:1749
 msgid "Warnings: %d%%\n"
 msgstr "Warnungen: %d%%\n"
 
-#: src/buddy.c:1452
+#: src/buddy.c:1754
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1456
+#: src/buddy.c:1758
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -217,506 +198,494 @@
 "Angemeldet seit: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1456
+#: src/buddy.c:1761
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-#: src/buddy.c:1501
+#: src/buddy.c:1828
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr ""
 
-#: src/buddy.c:1644
+#: src/buddy.c:1878
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr ""
 
-#: src/buddy.c:1802
+#: src/buddy.c:2028
 msgid "Information on selected Buddy"
 msgstr "Info über gewählten Buddy"
 
-#: src/buddy.c:1803 src/dialogs.c:738
+#: src/buddy.c:2029 src/dialogs.c:657
 msgid "Send Instant Message"
 msgstr "Telegramm"
 
-#: src/buddy.c:1804
+#: src/buddy.c:2030
 msgid "Start/join a Buddy Chat"
 msgstr "Chat starten"
 
-#: src/buddy.c:1857
+#: src/buddy.c:2088
 msgid "File"
 msgstr "Datei"
 
-#: src/buddy.c:1861 src/buddy.c:1862
+#: src/buddy.c:2092 src/buddy.c:2093
 msgid "Add A Buddy"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:1863
+#: src/buddy.c:2094
 msgid "Join A Chat"
 msgstr ""
 
-#: src/buddy.c:1865
+#: src/buddy.c:2095
+#, fuzzy
+msgid "New Instant Message"
+msgstr "Telegramm"
+
+#: src/buddy.c:2097
 msgid "Import Buddy List"
 msgstr "Buddy-Liste importieren"
 
-#: src/buddy.c:1866
+#: src/buddy.c:2098
 msgid "Export Buddy List"
 msgstr "Buddy-Liste exportieren"
 
-#: src/buddy.c:1876
+#: src/buddy.c:2103
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/buddy.c:1878 src/buddy_chat.c:537 src/buddy_chat.c:791
-#: src/buddy_chat.c:812 src/conversation.c:1654 src/dialogs.c:505
-#: src/plugins.c:317 src/prefs.c:1810
+#: 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:1883
+#: src/buddy.c:2110
 msgid "Tools"
 msgstr "Tools"
 
-#: src/buddy.c:1888 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
 msgid "Away"
 msgstr "Abwesenheit"
 
-#: src/buddy.c:1893
+#: src/buddy.c:2120
 msgid "Buddy Pounce"
 msgstr "Buddy-Alert"
 
-#: src/buddy.c:1901 src/dialogs.c:2105 src/dialogs.c:2262
+#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
 msgid "Search for Buddy"
 msgstr "Buddies suchen"
 
-#: src/buddy.c:1904
+#: src/buddy.c:2131
 msgid "by Email"
 msgstr "nach Email"
 
-#: src/buddy.c:1908
+#: src/buddy.c:2135
 msgid "by Dir Info"
 msgstr "nach Profil"
 
-#: src/buddy.c:1915 src/buddy.c:1916
+#: src/buddy.c:2142 src/buddy.c:2143
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/buddy.c:1919
+#: src/buddy.c:2146
 msgid "User Info"
 msgstr "Benutzer-Info"
 
-#: src/buddy.c:1923 src/dialogs.c:1299
+#: src/buddy.c:2150 src/dialogs.c:1353
 msgid "Directory Info"
 msgstr "Profil"
 
-#: src/buddy.c:1927 src/dialogs.c:1486
+#: src/buddy.c:2154 src/dialogs.c:1592
 msgid "Change Password"
 msgstr ""
 
-#: src/buddy.c:1941
+#: src/buddy.c:2171
 #, fuzzy
 msgid "Perl"
 msgstr "Zulassen"
 
-#: src/buddy.c:1944
+#: src/buddy.c:2174
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1948
+#: src/buddy.c:2178
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1952
+#: src/buddy.c:2182
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1960
+#: src/buddy.c:2190
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/buddy.c:1965
+#: src/buddy.c:2195
 #, fuzzy
 msgid "About Gaim"
 msgstr "Info Über"
 
-#: src/buddy.c:1984 src/prefs.c:2045
+#: src/buddy.c:2214 src/prefs.c:2053
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: src/buddy.c:2036
+#: src/buddy.c:2266
 msgid "Add a new Buddy"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:2037
+#: src/buddy.c:2267
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Buddy Hinzufügen"
 
-#: src/buddy.c:2038
+#: src/buddy.c:2268
 msgid "Remove selected Buddy"
 msgstr "Gewählten Buddy entfernen"
 
-#: src/buddy.c:2063
+#: src/buddy.c:2293
 msgid "Online"
 msgstr "Online"
 
-#: src/buddy.c:2065
+#: src/buddy.c:2295
 msgid "Edit Buddies"
 msgstr "Budies bearbeiten"
 
-#: src/buddy.c:2102
+#: src/buddy.c:2332
 msgid "Gaim - Buddy List"
 msgstr "gAIM - Buddy-Liste"
 
-#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
+#: src/buddy_chat.c:135
+msgid "Join Chat"
+msgstr ""
+
+#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
 msgid "Buddy Chat"
 msgstr "Buddy-Chat"
 
-#: src/buddy_chat.c:123
-msgid "Join"
-msgstr "Teilnehmen"
-
-#: src/buddy_chat.c:129
+#: src/buddy_chat.c:151
 msgid "Join what group:"
 msgstr "An wlecher Gruppe teinlnehmen:"
 
-#: src/buddy_chat.c:135
+#: src/buddy_chat.c:167
+#, fuzzy
+msgid "Join Chat As:"
+msgstr "An wlecher Gruppe teinlnehmen:"
+
+#: src/buddy_chat.c:181
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:143
+#: src/buddy_chat.c:189
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:172
-msgid "Join Chat"
-msgstr ""
+#: src/buddy_chat.c:197
+msgid "Join"
+msgstr "Teilnehmen"
 
-#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
+#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/buddy_chat.c:234
+#: src/buddy_chat.c:261
 msgid "Invite who?"
 msgstr "Wen einladen"
 
-#: src/buddy_chat.c:238
+#: src/buddy_chat.c:265
 msgid "With message:"
 msgstr "Mit Nachricht:"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:292
 msgid "Invite to Buddy Chat"
 msgstr "Zum Buddy-Chat einladen"
 
-#: src/buddy_chat.c:424
+#: src/buddy_chat.c:420
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:452
+#: src/buddy_chat.c:459
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:540 src/buddy_chat.c:789
+#: src/buddy_chat.c:559 src/buddy_chat.c:816
 msgid "Whisper"
 msgstr "Flüstern"
 
-#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
-#: src/conversation.c:1651 src/dialogs.c:1679
+#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
+#: src/conversation.c:1733
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:544
+#: src/buddy_chat.c:563
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: src/buddy_chat.c:820 src/conversation.c:1659
+#: src/buddy_chat.c:849 src/conversation.c:1741
 msgid "Block"
 msgstr "Sperren"
 
-#: src/buddy_chat.c:822 src/conversation.c:1653 src/dialogs.c:424
-#: src/dialogs.c:426 src/rvous.c:637
+#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
+#: src/dialogs.c:345 src/rvous.c:695
 msgid "Warn"
 msgstr "Warnen"
 
-#: src/conversation.c:171
-#, c-format
-msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
-msgstr ""
-
-#: src/conversation.c:178
-#, c-format
-msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
-msgstr ""
-
-#: src/conversation.c:435
+#: src/conversation.c:426
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr ""
 
-#: src/conversation.c:688
-msgid "Message too long, some data truncated."
-msgstr "Nachricht zu lange. Sie wurde gekürzt."
-
-#: src/conversation.c:688 src/dialogs.c:2825 src/dialogs.c:2895
-#: src/rvous.c:221 src/rvous.c:492
-msgid "Error"
-msgstr "Fehler"
-
-#: src/conversation.c:875
+#: src/conversation.c:902
 #, c-format
 msgid "Currently at %d, "
 msgstr ""
 
-#: src/conversation.c:884
+#: src/conversation.c:911
 #, c-format
 msgid "Setting position to %d\n"
 msgstr ""
 
-#: src/conversation.c:1489
+#: src/conversation.c:1497
 msgid "Bold"
 msgstr "Fetter"
 
-#: src/conversation.c:1489 src/prefs.c:1292
+#: src/conversation.c:1497 src/prefs.c:818
 msgid "Bold Text"
 msgstr "Fetter Text"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1501 src/conversation.c:1502
 msgid "Italics"
 msgstr "Kursiver"
 
-#: src/conversation.c:1493 src/prefs.c:1293
+#: src/conversation.c:1501 src/prefs.c:819
 msgid "Italics Text"
 msgstr "Kursiver Text"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1505 src/conversation.c:1506
 msgid "Underline"
 msgstr "Unterstrichener"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1505
 msgid "Underline Text"
 msgstr "Unterstrichener Text"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1509 src/conversation.c:1510
 msgid "Strike"
 msgstr "Durchgestrichener through"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1509
 msgid "Strike through Text"
 msgstr "Durchgestrichener through Text"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Decrease font size"
 msgstr "Schrift kleiner"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal font size"
 msgstr "Schrift normal"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Big"
 msgstr "Groß"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Increase font size"
 msgstr "Schrift größer"
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1526 src/conversation.c:1527
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/conversation.c:1518 src/dialogs.c:2724 src/dialogs.c:2740
+#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
 msgid "Select Font"
 msgstr "Schriftart wählen "
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
+#: src/conversation.c:1535
 msgid "Color"
 msgstr "Farbe"
 
-#: src/conversation.c:1522 src/prefs.c:1306
+#: src/conversation.c:1530 src/prefs.c:832
 msgid "Text Color"
 msgstr "Text-Farbe"
 
-#: src/conversation.c:1526 src/prefs.c:1323
+#: src/conversation.c:1534 src/prefs.c:849
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1541 src/conversation.c:1542
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:1533 src/dialogs.c:2366
+#: src/conversation.c:1541 src/dialogs.c:2391
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 #, fuzzy
 msgid "Smiley"
 msgstr "Datei"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1552 src/conversation.c:1553
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1552
 msgid "Enable logging"
 msgstr "Mitschnitt ein"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1556 src/conversation.c:1557
 msgid "Sound"
 msgstr "Klänge"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1556
 msgid "Enable sounds"
 msgstr "Klänge aktivieren"
 
-#: src/dialogs.c:225
-msgid "Error Resolving Mail Server.\n"
-msgstr "Konnte Mail-Server nicht finden.\n"
+#: src/conversation.c:1768
+#, fuzzy
+msgid "Send message as: "
+msgstr "Enter verschickt Nachricht"
 
-#: src/dialogs.c:231
-msgid "Error Connecting to Socket.\n"
-msgstr "Fehler beim Verbinden mit Socket.\n"
-
-#: src/dialogs.c:441
+#: src/dialogs.c:360
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Wollen Sie %s wirklich verwarnen?"
 
-#: src/dialogs.c:445
+#: src/dialogs.c:364
 msgid "Warn anonymously?"
 msgstr "Anonym warnen?"
 
-#: src/dialogs.c:448
+#: src/dialogs.c:367
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyme Warnungen sind weniger wirkungsvoll"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:393
 msgid "Gaim - Warn user?"
 msgstr "gAIM - Benutzer warnen?"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:458
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Konnte Datei %s nicht schrieben."
 
-#: src/dialogs.c:544
+#: src/dialogs.c:461
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Konnte Datei %s nicht lesen."
 
-#: src/dialogs.c:547
+#: src/dialogs.c:464
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Nachricht zu lange, letzten %s Bytes abgeschnitten."
 
-#: src/dialogs.c:550
+#: src/dialogs.c:467
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ist zur Zeit nicht online."
 
-#: src/dialogs.c:553
+#: src/dialogs.c:470
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Verwarnung von %s nicht erlaubt."
 
-#: src/dialogs.c:556
+#: src/dialogs.c:473
 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:559
+#: src/dialogs.c:476
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s ist nicht verfügbar."
 
-#: src/dialogs.c:562
+#: src/dialogs.c:479
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: src/dialogs.c:565
+#: src/dialogs.c:482
 #, 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:568
+#: src/dialogs.c:485
 #, 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:571
+#: src/dialogs.c:488
 msgid "Failure."
 msgstr "Fehler."
 
-#: src/dialogs.c:574
+#: src/dialogs.c:491
 msgid "Too many matches."
 msgstr "Zu viele Übereinstimmungen."
 
-#: src/dialogs.c:577
+#: src/dialogs.c:494
 msgid "Need more qualifiers."
 msgstr "Benötige mehr Angaben."
 
-#: src/dialogs.c:580
+#: src/dialogs.c:497
 msgid "Dir service temporarily unavailable."
 msgstr "Profil-Service ist zur Zeit nicht verfügbar."
 
-#: src/dialogs.c:583
+#: src/dialogs.c:500
 msgid "Email lookup restricted."
 msgstr "eMail-Suche eingeschränkt."
 
-#: src/dialogs.c:586
+#: src/dialogs.c:503
 msgid "Keyword ignored."
 msgstr "Stichwort ignoriert."
 
-#: src/dialogs.c:589
+#: src/dialogs.c:506
 msgid "No keywords."
 msgstr "Keine Stichwörter."
 
-#: src/dialogs.c:592
+#: src/dialogs.c:509
 msgid "User has no directory information."
 msgstr "Der Benutzer hat kein Profil."
 
-#: src/dialogs.c:596
+#: src/dialogs.c:513
 msgid "Country not supported."
 msgstr "Land nicht unterstützt."
 
-#: src/dialogs.c:599
+#: src/dialogs.c:516
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Unbekannter Fehler: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:602 src/oscar.c:318
+#: src/dialogs.c:519 src/oscar.c:471
 msgid "Incorrect nickname or password."
 msgstr "Ungülter Benutzername oder Passwort."
 
-#: src/dialogs.c:605
+#: src/dialogs.c:522
 msgid "The service is temporarily unavailable."
 msgstr "Der Service ist zur Zeit nicht erreichbar."
 
-#: src/dialogs.c:608
+#: src/dialogs.c:525
 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:611
+#: src/dialogs.c:528
 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."
@@ -724,287 +693,331 @@
 "Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
 "versuchen Sie es noch einmal."
 
-#: src/dialogs.c:614
+#: src/dialogs.c:531
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Unbekannter Anmeldungsfehler: %s."
 
-#: src/dialogs.c:617
+#: src/dialogs.c:534
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Unbekannter Fehler: %d. Info: %s"
 
-#: src/dialogs.c:620
+#: src/dialogs.c:537
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "gAIM - Fehler %d"
 
 #. Build OK Button
-#: src/dialogs.c:677 src/dialogs.c:742 src/dialogs.c:817 src/dialogs.c:1168
-#: src/dialogs.c:1491 src/dialogs.c:1777 src/dialogs.c:2110 src/dialogs.c:2272
-#: src/dialogs.c:2371
+#: 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
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:671
 #, fuzzy
 msgid "IM who:"
 msgstr "Telegramm an:"
 
-#: src/dialogs.c:776
+#: src/dialogs.c:695
 msgid "Gaim - IM user"
 msgstr "gAIM - Telegramm"
 
-#: src/dialogs.c:813
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "Benutzer-Info"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:746
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:851
+#: src/dialogs.c:770
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "gAIM - Mitgliederinfo"
 
-#: src/dialogs.c:933
+#: src/dialogs.c:845
 msgid "Buddies"
 msgstr "Buddies"
 
-#: src/dialogs.c:985
+#: src/dialogs.c:898
 #, fuzzy
 msgid "Add Group"
 msgstr "Gruppe"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:928
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "gAIM - Buddy hinzufügen"
 
-#: src/dialogs.c:1062
-msgid "Add Buddy"
-msgstr "Buddy hinzufügen"
-
-#: src/dialogs.c:1064 src/dialogs.c:3368
-msgid "Buddy"
-msgstr "Buddy"
-
-#: src/dialogs.c:1103
+#: src/dialogs.c:957
 msgid "Gaim - Add Buddy"
 msgstr "gAIM - Buddy hinzufügen"
 
-#. Put the buttons in the box
-#: src/dialogs.c:1179
-msgid "Buddy To Pounce:"
-msgstr "Buddy-Alert für:"
+#: src/dialogs.c:967
+msgid "Add Buddy"
+msgstr "Buddy hinzufügen"
+
+#: src/dialogs.c:979 src/dialogs.c:3443
+msgid "Buddy"
+msgstr "Buddy"
+
+#: src/dialogs.c:1109
+msgid "Pounce buddy as:"
+msgstr ""
+
+#: src/dialogs.c:1181
+#, fuzzy
+msgid "Buddy:"
+msgstr "Buddy"
+
+#: src/dialogs.c:1189
+#, fuzzy
+msgid "Message:"
+msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:1184
-msgid "Open IM Window on Buddy Logon"
+#: 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:1187
-msgid "Send IM on Buddy Logon"
+#: src/dialogs.c:1234
+#, fuzzy
+msgid "Send IM on pounce"
 msgstr "Schicke Telegramm wenn Buddy sich anmeldet"
 
-#: src/dialogs.c:1195
-msgid "Message to send:"
-msgstr "Nachricht:"
-
-#: src/dialogs.c:1216
+#: src/dialogs.c:1263
 msgid "Gaim - New Buddy Pounce"
 msgstr "gAIM - Neuer Buddy-Alert"
 
 #. Build Save Button
-#: src/dialogs.c:1303 src/dialogs.c:1596 src/dialogs.c:3093
+#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
 msgid "Save"
 msgstr "Speichern"
 
-#: src/dialogs.c:1321
+#: src/dialogs.c:1376
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Ermöglicht Personen Ihr Profil im Web zu finden"
 
 #. Line 1
-#: src/dialogs.c:1324 src/dialogs.c:2128
+#: src/dialogs.c:1379 src/dialogs.c:2159
 msgid "First Name"
 msgstr "Vorname"
 
 #. Line 2
-#: src/dialogs.c:1335 src/dialogs.c:2140
+#: src/dialogs.c:1390 src/dialogs.c:2171
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
 #. Line 3
-#: src/dialogs.c:1347 src/dialogs.c:2152
+#: src/dialogs.c:1402 src/dialogs.c:2183
 msgid "Last Name"
 msgstr "Nachname"
 
 #. Line 4
-#: src/dialogs.c:1358 src/dialogs.c:2164
+#: src/dialogs.c:1413 src/dialogs.c:2195
 msgid "Maiden Name"
 msgstr "Mädchenname"
 
 #. Line 5
-#: src/dialogs.c:1369 src/dialogs.c:2176
+#: src/dialogs.c:1424 src/dialogs.c:2207
 msgid "City"
 msgstr "Stadt"
 
 #. Line 6
-#: src/dialogs.c:1380 src/dialogs.c:2187
+#: src/dialogs.c:1435 src/dialogs.c:2218
 msgid "State"
 msgstr "Provinz/Bundesland"
 
 #. Line 7
-#: src/dialogs.c:1391 src/dialogs.c:2198
+#: src/dialogs.c:1446 src/dialogs.c:2229
 msgid "Country"
 msgstr "Land"
 
-#: src/dialogs.c:1436
+#: src/dialogs.c:1490
 msgid "Gaim - Set Dir Info"
 msgstr "gAIM - Profil anlegen"
 
-#: src/dialogs.c:1453
+#: src/dialogs.c:1507
 msgid "New Passwords Do Not Match"
 msgstr "Die neuen Passwörter stimmen nicht überein"
 
-#: src/dialogs.c:1453 src/dialogs.c:1458
+#: src/dialogs.c:1507 src/dialogs.c:1512
 msgid "Gaim - Change Password Error"
 msgstr "gAIM - Fehler Passwort ändern"
 
-#: src/dialogs.c:1458
+#: src/dialogs.c:1512
 msgid "Fill out all fields completely"
 msgstr "Bitte alle Felder komplett ausfüllen"
 
-#: src/dialogs.c:1500
+#: src/dialogs.c:1541
+#, fuzzy
+msgid "Change password for:"
+msgstr "gAIM - Fehler Passwort ändern"
+
+#: src/dialogs.c:1580 src/toc.c:515
+msgid "Gaim - Password Change"
+msgstr "gAIM - Password Änderung"
+
+#: src/dialogs.c:1612
 msgid "Original Password"
 msgstr "Altes Passwort"
 
-#: src/dialogs.c:1516
+#: src/dialogs.c:1626
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: src/dialogs.c:1530
+#: src/dialogs.c:1640
 msgid "New Password (again)"
 msgstr "Neues Passwort (Wiederholen)"
 
-#: src/dialogs.c:1567
-msgid "Gaim - Password Change"
-msgstr "gAIM - Password Änderung"
+#: src/dialogs.c:1693
+msgid "Set info for:"
+msgstr ""
 
-#: src/dialogs.c:1630
+#: src/dialogs.c:1776
 msgid "Gaim - Set User Info"
 msgstr "gAIM - Mitgliederinfo"
 
-#: src/dialogs.c:1786
+#: src/dialogs.c:1817
 msgid "Below are the results of your search: "
 msgstr "Das Resultat Ihrer Suche:"
 
-#: src/dialogs.c:1918
-#, fuzzy
-msgid "Permit / Deny"
-msgstr "Bestimmte zulassen"
+#: src/dialogs.c:1943 src/dialogs.c:1950
+msgid "Permit"
+msgstr "Zulassen"
 
-#: src/dialogs.c:1929 src/prefs.c:471
+#: src/dialogs.c:1945 src/dialogs.c:1952
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: src/dialogs.c:1934 src/prefs.c:455 src/prefs.c:512
-msgid "Permit"
-msgstr "Zulassen"
-
-#: src/dialogs.c:1975
-msgid "Gaim - Add Permit/Deny"
+#: src/dialogs.c:1993
+#, fuzzy
+msgid "Gaim - Add Permit"
 msgstr "gAIM - Sperren/Zulassen hinzufügen"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:1995
+#, fuzzy
+msgid "Gaim - Add Deny"
+msgstr "gAIM - Sperren/Zulassen hinzufügen"
+
+#: src/dialogs.c:2057
 msgid "Gaim - Log Conversation"
 msgstr "gAIM - Telegramm-Mitschnitt"
 
-#: src/dialogs.c:2235
+#: src/dialogs.c:2266
 msgid "Gaim - Find Buddy By Info"
 msgstr "gAIM - Buddy nach Profil finden"
 
-#: src/dialogs.c:2282
+#: src/dialogs.c:2315
 msgid "Email"
 msgstr "eMail"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2328
 msgid "Gaim - Find Buddy By Email"
 msgstr "gAIM - Buddy nach eMail-Adresse suchen"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2410
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2393
+#: src/dialogs.c:2418
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/dialogs.c:2419
+#: src/dialogs.c:2444
 msgid "GAIM - Add URL"
 msgstr "gAIM - Url hinzufügen"
 
-#: src/dialogs.c:2562 src/dialogs.c:2575 src/dialogs.c:2612
+#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
 msgid "Select Text Color"
 msgstr "Textfarbe wählen"
 
-#: src/dialogs.c:2599
+#: src/dialogs.c:2624
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Textfarbe wählen"
 
-#: src/dialogs.c:2824 src/rvous.c:220
+#: src/dialogs.c:2847 src/rvous.c:265
 #, c-format
 msgid "Error writing file %s"
 msgstr "Fehler beim Schreiben von %s"
 
-#: src/dialogs.c:2841
+#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
+#: src/rvous.c:548
+msgid "Error"
+msgstr "Fehler"
+
+#: src/dialogs.c:2901
 msgid "Gaim - Export Buddy List"
 msgstr "gAIM - Buddy-Liste speichern"
 
-#: src/dialogs.c:2894 src/rvous.c:491
+#: src/dialogs.c:2967 src/rvous.c:547
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: src/dialogs.c:2973
+#: src/dialogs.c:3045
 msgid "Gaim - Import Buddy List"
 msgstr "gAIM - Buddy-Liste laden"
 
-#: src/dialogs.c:3054
+#: src/dialogs.c:3124
 msgid "Gaim - New away message"
 msgstr "gAIM - Neue Abwesenheits-Mitteilung"
 
-#. Set up our frame
-#: src/dialogs.c:3061
+#. Put frame and button-box in the toplevel
+#: src/dialogs.c:3136
 #, fuzzy
 msgid "New away message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#. Make a label for away entry
-#: src/dialogs.c:3071
+#: src/dialogs.c:3149
 msgid "Away title: "
 msgstr "Abwesenheits-Titel:"
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3121
+#: src/dialogs.c:3193
 #, fuzzy
 msgid "Make Away Now"
 msgstr "Jetzt abwesend"
 
 #. show everything
-#: src/dialogs.c:3299
+#: src/dialogs.c:3370
 #, fuzzy
 msgid "Smile!"
 msgstr "Datei"
 
-#: src/dialogs.c:3366
+#: src/dialogs.c:3441
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Buddy hinzufügen"
 
-#: src/dialogs.c:3404
+#: src/dialogs.c:3478
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "gAIM - Buddy hinzufügen"
@@ -1014,19 +1027,19 @@
 msgid "file not found: %s\n"
 msgstr "Datei nicht gefunden: %s\n"
 
-#: src/gnome_applet_mgr.c:122
+#: 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:129
+#: src/gnome_applet_mgr.c:128
 msgid "Attempting to sign on...."
 msgstr "Anmeldung..."
 
-#: src/gnome_applet_mgr.c:252
+#: src/gnome_applet_mgr.c:254
 msgid "GAIM"
 msgstr "gAIM"
 
-#: src/gnome_applet_mgr.c:364
+#: src/gnome_applet_mgr.c:366
 msgid "Can't create GAIM applet!"
 msgstr "Kann gAIM-Applet nicht erstellen"
 
@@ -1034,117 +1047,179 @@
 msgid "Offline"
 msgstr "Offline"
 
-#: src/gnome_applet_mgr.c:408
+#: src/gnome_applet_mgr.c:411
 msgid "Font does not exist"
 msgstr "Schriftart existiert nicht"
 
-#: src/gnome_applet_mgr.c:424
+#: src/gnome_applet_mgr.c:427
 msgid "About..."
 msgstr "Über..."
 
-#: src/gtkhtml.c:1385
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "HTML-Link"
 
-#: src/gtkhtml.c:1798
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "URL in bestehendem Fenster öffnen."
 
-#: src/gtkhtml.c:1807
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "URL in neuem Fenstern öffnen."
 
-#: src/gtkhtml.c:1815
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "URL als Bookmark hinzufügen"
 
-#: src/html.c:120
-msgid "g001: Error resolving host\n"
-msgstr "g001: Fehler: Kann Host nicht finden\n"
-
-#: src/html.c:122
+#: src/html.c:122 src/html.c:125
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fehler: Kann keine Verbindung herstellen.\n"
 
-#: src/html.c:154
+#: src/html.c:158
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "Empfange %d bytes von %s"
 
-#: src/html.c:167
+#: src/html.c:171
 msgid "Getting Data"
 msgstr "Empfange Daten"
 
-#: src/html.c:200
+#: src/html.c:204
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "Empfangen: '%s'\n"
 
-#: src/oscar.c:157 src/oscar.c:184
+#: src/multi.c:367 src/prefs.c:112
+#, fuzzy
+msgid "General Options"
+msgstr "Einstellungen"
+
+#: src/multi.c:402
+#, fuzzy
+msgid "Screenname:"
+msgstr "Benutzername: "
+
+#: src/multi.c:414
+#, fuzzy
+msgid "Password:"
+msgstr "Passwort: "
+
+#: src/multi.c:429
+msgid "Remember Password"
+msgstr "Passwort Speichern"
+
+#: src/multi.c:430
+msgid "Auto-Login"
+msgstr ""
+
+#: src/multi.c:431
+msgid "Send KeepAlive packet (6 bytes/second)"
+msgstr ""
+
+#: src/multi.c:473
+#, fuzzy
+msgid "Gaim - Modify Account"
+msgstr "Gaim - Anmeldung"
+
+#: src/multi.c:482
+msgid "Modify Account"
+msgstr ""
+
+#: src/multi.c:576
+#, fuzzy
+msgid "Enter Password"
+msgstr "Neues Passwort"
+
+#: src/multi.c:669
+#, fuzzy
+msgid "Gaim - Account Editor"
+msgstr "gAIM - Fehler"
+
+#: src/multi.c:678
+msgid "Account Editor"
+msgstr ""
+
+#: src/multi.c:697
+msgid "Modify"
+msgstr ""
+
+#: src/multi.c:701
+#, fuzzy
+msgid "Sign On/Off"
+msgstr "Abmelden"
+
+#: src/multi.c:705
+#, fuzzy
+msgid "Delete"
+msgstr "Schriftart wählen "
+
+#: src/multi.c:851
+#, 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
 msgid "Disconnected."
 msgstr "Verbindung unterbrochen"
 
-#: src/oscar.c:165
+#: src/oscar.c:308
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/oscar.c:182
+#: src/oscar.c:316
 #, fuzzy
 msgid "major connection error\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/oscar.c:196
+#: src/oscar.c:330 src/toc.c:500
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:197
+#: src/oscar.c:331
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Fehler"
 
-#: src/oscar.c:220
+#: src/oscar.c:362
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Melde an %s\n"
 
-#: src/oscar.c:230
-#, c-format
-msgid "Looking up %s"
-msgstr "Suche %s"
-
-#: src/oscar.c:235
+#: src/oscar.c:399
 msgid "internal connection error\n"
 msgstr "Interner Verbindungsfehler\n"
 
-#: src/oscar.c:240
+#: src/oscar.c:400
 msgid "Unable to login to AIM"
 msgstr "Anmeldung nicht möglich"
 
-#: src/oscar.c:248
-msgid "couldn't resolve host\n"
+#: src/oscar.c:405
+#, fuzzy
+msgid "couldn't resolve host"
 msgstr "Konnte Server nicht finden\n"
 
-#: src/oscar.c:252
-msgid "couldn't connect to host\n"
+#: src/oscar.c:409
+#, fuzzy
+msgid "couldn't connect to host"
 msgstr "Keine Verbindung zum Server\n"
 
-#: src/oscar.c:258
+#: src/oscar.c:416
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: src/oscar.c:283
+#: src/oscar.c:426
 msgid "Password sent, waiting for response\n"
 msgstr "Passwort übertragen, warte auf Antwort\n"
 
-#: src/oscar.c:299
+#: src/oscar.c:451
 msgid "Signed off.\n"
 msgstr "Abgemeldet.\n"
 
 #. connecting too frequently
-#: src/oscar.c:313
+#: src/oscar.c:466
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1153,13 +1228,8 @@
 "Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
 "versuchen Sie es noch einmal."
 
-#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:761
-#: src/oscar.c:766 src/oscar.c:788 src/oscar.c:807 src/oscar.c:831
-msgid "Gaim - Error"
-msgstr "gAIM - Fehler"
-
 #. client too old
-#: src/oscar.c:323
+#: src/oscar.c:476
 #, fuzzy
 msgid ""
 "The client version you are using is too old. Please upgrade at "
@@ -1168,66 +1238,103 @@
 "Ihre AIM-Software ist zu alt. Aktuelle Software finden Sie auf "
 "http://www.aim.de"
 
-#: src/oscar.c:338
+#: src/oscar.c:480 src/toc.c:303
 msgid "Authentication Failed"
 msgstr ""
 
-#: src/oscar.c:362
+#: src/oscar.c:513
 msgid "Internal Error"
 msgstr ""
 
-#: src/oscar.c:370
+#: src/oscar.c:520
 msgid "Could Not Connect"
 msgstr ""
 
-#: src/oscar.c:401
+#: src/oscar.c:551
 msgid "Connection established, cookie sent"
 msgstr ""
 
-#: src/oscar.c:632
-msgid "Accept Direct IM?"
+#: src/oscar.c:787 src/oscar.c:1860
+#, 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:642
-#, c-format
-msgid "%s has requested to directly connect to your computer. Do you accept?"
+#: 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:652 src/rvous.c:635
-msgid "Accept"
+#: 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:760
+#: src/oscar.c:1194
 #, 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:765
+#: 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
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:786
+#: src/oscar.c:1220
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:787 src/oscar.c:806
+#: src/oscar.c:1221 src/oscar.c:1240
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:805
+#: src/oscar.c:1239
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:830
+#: src/oscar.c:1265
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:836
+#: src/oscar.c:1271
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1235,595 +1342,651 @@
 "<BR><HR><BR>%s\n"
 msgstr ""
 
-#: src/oscar.c:869
+#: src/oscar.c:1305
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:870
+#: src/oscar.c:1306
 msgid "AOL error"
 msgstr ""
 
-#: src/plugins.c:103
+#: src/oscar.c:1913
+#, c-format
+msgid "<B>Direct IM with %s closed</B>"
+msgstr ""
+
+#: src/oscar.c:1958
+#, 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
+#, fuzzy
+msgid "Get Away Msg"
+msgstr "Abwesenht."
+
+#: src/oscar.c:1982
+#, fuzzy
+msgid "Direct IM"
+msgstr "Profil"
+
+#. Below is basically stolen from plugins.c
+#: src/perl.c:639
+#, fuzzy
+msgid "Gaim - Select Perl Script"
+msgstr "gAIM - Mitgliederinfo"
+
+#: src/perl.c:686
+msgid "Perl Scripts"
+msgstr ""
+
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr ""
 
-#: src/plugins.c:155
-#, c-format
-msgid "Already loaded %s, not reloading.\n"
-msgstr ""
-
-#: src/plugins.c:177 src/plugins.c:185 src/plugins.c:217
+#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
 msgid "Plugin Error"
 msgstr ""
 
-#: src/plugins.c:265
+#: src/plugins.c:262
 msgid "Gaim - Plugins"
 msgstr ""
 
 #. Build the bottom button bar
-#: src/plugins.c:297
+#: src/plugins.c:294
 msgid "Load Plugin"
 msgstr ""
 
-#: src/plugins.c:304
+#: src/plugins.c:301
 msgid "Configure Plugin"
 msgstr ""
 
-#: src/plugins.c:310
+#: src/plugins.c:307
 msgid "Unload Plugin"
 msgstr ""
 
-#: src/prefs.c:93
-#, fuzzy
-msgid "General Options"
-msgstr "Einstellungen"
-
-#: src/prefs.c:100 src/prefs.c:358 src/prefs.c:387 src/prefs.c:414
-#: src/prefs.c:614 src/prefs.c:701 src/prefs.c:810 src/prefs.c:895
-#: src/prefs.c:1288 src/prefs.c:1373 src/prefs.c:1404 src/prefs.c:1691
+#: 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
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:104
-#, fuzzy
-msgid "Remember password"
-msgstr "Passwort Speichern"
-
-#: src/prefs.c:106
-msgid "Auto-login"
-msgstr ""
-
-#: src/prefs.c:112
+#.
+#. 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
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:113
+#: src/prefs.c:135
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:116
+#: src/prefs.c:138
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:124
-msgid "Report Idle Times"
+#: src/prefs.c:150
+msgid "Report Idle Times:"
 msgstr ""
 
-#: src/prefs.c:202
-#, fuzzy
-msgid "Connection Options"
-msgstr "Verbindungsfehler!\n"
-
-#: src/prefs.c:210
-msgid ""
-"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
-"other is TOC.\n"
-"\n"
-"TOC is a published protocol; AOL allows people to use the TOC protocol in "
-"their clients to connect. It is a simplified version of Oscar; it is capable "
-"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
-"is published, using TOC in gaim tends to be more stable and reliable.\n"
-"\n"
-"Oscar is a proprietary protocol. AOL has not published any information about "
-"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
-"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
-"or implemented all of the functions of Oscar, it is still able to perform "
-"most functions TOC provides as well as several others. However, using Oscar "
-"in gaim tends to be less reliable, though more usable.\n"
-"\n"
-"Changing this option takes effect at signon time."
-msgstr ""
-
-#: src/prefs.c:216
-msgid "Use Oscar Protocol"
-msgstr ""
-
-#: src/prefs.c:222
-msgid "Send Keep-Alive Packet (6 bytes/minute)"
-msgstr ""
-
-#: src/prefs.c:239 src/prefs.c:2016
-#, fuzzy
-msgid "TOC Options"
-msgstr "Einstellungen"
-
-#: src/prefs.c:251
-msgid "TOC Host:"
+#: src/prefs.c:153
+msgid "None"
 msgstr ""
 
-#: src/prefs.c:261 src/prefs.c:286 src/prefs.c:320
-msgid "Port:"
-msgstr ""
-
-#: src/prefs.c:276
-msgid "Login Host:"
-msgstr ""
+#: src/prefs.c:154
+#, fuzzy
+msgid "GAIM Use"
+msgstr "gAIM"
 
-#: src/prefs.c:297
-msgid "No Proxy"
-msgstr ""
-
-#: src/prefs.c:298
-msgid "HTTP Proxy"
-msgstr ""
-
-#: src/prefs.c:299
-msgid "Socks 4 Proxy"
-msgstr ""
-
-#: src/prefs.c:300
-msgid "Socks 5 Proxy"
+#: src/prefs.c:156
+msgid "X Use"
 msgstr ""
 
-#: src/prefs.c:306
-msgid "Proxy Host:"
-msgstr ""
-
-#: src/prefs.c:351 src/prefs.c:2021
-#, fuzzy
-msgid "Oscar Options"
-msgstr "Einstellungen"
-
-#: src/prefs.c:362
-msgid "No options currently (Isn't that sad)"
-msgstr ""
-
-#: src/prefs.c:380
-#, fuzzy
-msgid "Applet Options"
-msgstr "Einstellungen"
-
-#: src/prefs.c:391
-msgid "Display Buddy List near applet"
-msgstr ""
-
-#: src/prefs.c:407
+#: src/prefs.c:172
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Buddy-Liste"
 
-#: src/prefs.c:418
+#: src/prefs.c:184
 msgid "Show numbers in groups"
 msgstr ""
 
-#: src/prefs.c:419
+#: src/prefs.c:185
 msgid "Hide groups with no online buddies"
 msgstr ""
 
-#: src/prefs.c:420
+#: src/prefs.c:186
 msgid "Show idle times"
 msgstr ""
 
-#: src/prefs.c:421
+#: src/prefs.c:187
 msgid "Show buddy type icons"
 msgstr ""
 
-#: src/prefs.c:427
+#: src/prefs.c:193
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
-#: src/prefs.c:428
+#: src/prefs.c:194
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:434
+#: src/prefs.c:200
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "Fensterposition und -größe speichern"
 
-#: src/prefs.c:436
+#: src/prefs.c:202
 msgid "Automatically show buddy list on sign on"
 msgstr ""
 
-#: src/prefs.c:586
-msgid "Please sign on before editing the permit/deny lists."
-msgstr ""
-
-#: src/prefs.c:587
-msgid "Please sign on"
-msgstr ""
-
-#: src/prefs.c:607
-msgid "Permit/Deny List Options"
-msgstr ""
-
-#: src/prefs.c:622
-msgid ""
-"The permit/deny configuration will change between users,\n"
-"and changes while you are signed off will not be saved."
+#: src/prefs.c:203
+msgid "Display Buddy List near applet"
 msgstr ""
 
-#: src/prefs.c:635
-#, fuzzy
-msgid "Allow Anyone"
-msgstr "Jeden zulassen"
-
-#. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
-#. * and merging the two would be very difficult at best, most likely
-#. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:640
-msgid "Allow only users on Buddy List"
-msgstr ""
-
-#: src/prefs.c:642
-msgid "Allow only the users in \"Permit\""
-msgstr ""
-
-#: src/prefs.c:648
-msgid "Block all users"
-msgstr ""
-
-#: src/prefs.c:649
-msgid "Block the users in \"Deny\""
-msgstr ""
-
-#: src/prefs.c:694
+#: src/prefs.c:219
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:705
+#: src/prefs.c:231
 msgid "Enter sends message"
 msgstr "Enter verschickt Nachricht"
 
-#: src/prefs.c:706
+#: src/prefs.c:232
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:707
+#: src/prefs.c:233
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:713
+#: src/prefs.c:239
 msgid "Show graphical smileys"
 msgstr ""
 
-#: src/prefs.c:714
+#: src/prefs.c:240
 msgid "Show timestamp on messages"
 msgstr ""
 
-#: src/prefs.c:715
+#: src/prefs.c:241
 msgid "Ignore incoming colors"
 msgstr ""
 
-#: src/prefs.c:716
+#: src/prefs.c:242
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:722
+#: src/prefs.c:248
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Alles Mitschneiten"
 
-#: src/prefs.c:723
+#: src/prefs.c:249
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "HTML aus Mitschnitt entfernen"
 
-#: src/prefs.c:729
+#: src/prefs.c:255
 msgid "Highlight misspelled words"
 msgstr ""
 
-#: src/prefs.c:730
+#: src/prefs.c:256
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "URLs als Link verschicken"
 
-#: src/prefs.c:731
+#: src/prefs.c:257
 #, fuzzy
 msgid "Sending messages removes away status"
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: src/prefs.c:772 src/prefs.c:857
+#: src/prefs.c:298 src/prefs.c:386
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:777 src/prefs.c:862
+#: src/prefs.c:303 src/prefs.c:391
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:782 src/prefs.c:867
+#: src/prefs.c:308 src/prefs.c:396
 #, fuzzy
 msgid "Text Only"
 msgstr "Text-Farbe"
 
-#: src/prefs.c:803
+#: src/prefs.c:331
 #, fuzzy
 msgid "IM Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:814
+#: src/prefs.c:343
 msgid "Show logins in window"
 msgstr ""
 
-#: src/prefs.c:820 src/prefs.c:905
+#: src/prefs.c:349 src/prefs.c:435
 msgid "Show buttons as "
 msgstr ""
 
-#: src/prefs.c:829 src/prefs.c:915
+#: src/prefs.c:358 src/prefs.c:445
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:830 src/prefs.c:916
+#: src/prefs.c:359 src/prefs.c:446
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:831 src/prefs.c:1611
+#: src/prefs.c:360
 msgid "Ignore new conversations when away"
 msgstr "Neue Telegramme bei Abwesenheit ignorieren"
 
-#: src/prefs.c:832
+#: src/prefs.c:361
 msgid "Ignore TiK Automated Messages"
 msgstr ""
 
-#: src/prefs.c:888 src/prefs.c:1090
+#: src/prefs.c:417 src/prefs.c:620
 #, fuzzy
 msgid "Chat Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:899
+#: src/prefs.c:429
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:947 src/prefs.c:949 src/prefs.c:1161 src/prefs.c:1163
+#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
 msgid "Gaim Chat"
 msgstr ""
 
-#: src/prefs.c:1107
+#: src/prefs.c:638
 msgid "Refresh"
 msgstr ""
 
-#: src/prefs.c:1135
+#: src/prefs.c:666
 msgid "List of available chats"
 msgstr ""
 
-#: src/prefs.c:1149
+#: src/prefs.c:680
 msgid "List of subscribed chats"
 msgstr ""
 
-#: src/prefs.c:1281 src/prefs.c:2082
+#: src/prefs.c:806 src/prefs.c:2084
 #, fuzzy
 msgid "Font Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:1294
+#: src/prefs.c:820
 msgid "Underlined Text"
 msgstr ""
 
-#: src/prefs.c:1295
+#: src/prefs.c:821
 msgid "Strike Text"
 msgstr ""
 
-#: src/prefs.c:1308 src/prefs.c:1325 src/prefs.c:1345
+#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
 #, fuzzy
 msgid "Select"
 msgstr "Schriftart wählen "
 
-#: src/prefs.c:1343
+#: src/prefs.c:869
 msgid "Font Face for Text"
 msgstr ""
 
-#: src/prefs.c:1366
+#: src/prefs.c:892
 #, fuzzy
 msgid "Sound Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:1378
-msgid "Sounds go through GNOME"
-msgstr ""
-
-#: src/prefs.c:1380
+#: src/prefs.c:904
 msgid "No sounds when you log in"
 msgstr ""
 
-#: src/prefs.c:1381 src/prefs.c:1612
+#: src/prefs.c:905 src/prefs.c:1296
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1382
+#: src/prefs.c:906
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1397
+#: src/prefs.c:968
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "gAIM - Telegramm-Mitschnitt"
+
+#: src/prefs.c:1002
+#, fuzzy
+msgid "Reset"
+msgstr "Neu"
+
+#: src/prefs.c:1007
+#, fuzzy
+msgid "Choose"
+msgstr "Schließen"
+
+#: src/prefs.c:1035
 msgid "Sound Events"
 msgstr ""
 
-#: src/prefs.c:1408
+#: src/prefs.c:1047
 msgid "Sound when buddy logs in"
 msgstr ""
 
-#: src/prefs.c:1409
+#: src/prefs.c:1048
 msgid "Sound when buddy logs out"
 msgstr ""
 
-#: src/prefs.c:1415
+#: src/prefs.c:1054
 msgid "Sound when message is received"
 msgstr ""
 
-#: src/prefs.c:1416
+#: src/prefs.c:1055
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1417
+#: src/prefs.c:1056
 msgid "Sound when message is sent"
 msgstr ""
 
-#: src/prefs.c:1423
+#: src/prefs.c:1062
 #, fuzzy
-msgid "Sound in chat rooms when people enter/leave"
+msgid "Sound in chat rooms when people enter"
+msgstr "Fenster nach Oben, bei neuer Nachricht"
+
+#: src/prefs.c:1063
+#, fuzzy
+msgid "Sound in chat rooms when people leave"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1064
 #, fuzzy
-msgid "Sound in chat rooms when people talk"
+msgid "Sound in chat rooms when you talk"
 msgstr "Fenster nach Oben, bei neuer Nachricht"
 
-#: src/prefs.c:1509 src/prefs.c:2109
+#: src/prefs.c:1065
+#, fuzzy
+msgid "Sound in chat rooms when others talk"
+msgstr "Fenster nach Oben, bei neuer Nachricht"
+
+#: src/prefs.c:1197 src/prefs.c:2111
 #, fuzzy
 msgid "Away Messages"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/prefs.c:1525
+#: src/prefs.c:1209
 #, fuzzy
 msgid "Title"
 msgstr "Datei"
 
-#: src/prefs.c:1529
+#: src/prefs.c:1213
 #, fuzzy
 msgid "Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/prefs.c:1569
+#: src/prefs.c:1253
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1573
+#: src/prefs.c:1257
 #, fuzzy
 msgid "Make Away"
 msgstr "Jetzt abwesend"
 
-#: src/prefs.c:1684
+#: src/prefs.c:1295
+#, fuzzy
+msgid "Ignore new conversations when away   "
+msgstr "Neue Telegramme bei Abwesenheit ignorieren"
+
+#: src/prefs.c:1306
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1318
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1400
 #, fuzzy
 msgid "Browser Options"
 msgstr "Einstellungen"
 
-#: src/prefs.c:1695
+#: src/prefs.c:1412
 msgid "Netscape"
 msgstr ""
 
-#: src/prefs.c:1696
+#: src/prefs.c:1413
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1698
+#: src/prefs.c:1415
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1700
-msgid "Internal HTML Widget (Quite likely a bad idea!)"
-msgstr ""
-
-#: src/prefs.c:1701
+#: src/prefs.c:1417
 msgid "Manual"
 msgstr ""
 
-#: src/prefs.c:1710
+#: src/prefs.c:1426
 msgid "Pop up new window by default"
 msgstr ""
 
-#: src/prefs.c:1755
+#: src/prefs.c:1641
+#, fuzzy
+msgid "Privacy Options"
+msgstr "Einstellungen"
+
+#: src/prefs.c:1657
+msgid "Set privacy for:"
+msgstr ""
+
+#: src/prefs.c:1677
+msgid "Allow all users to contact me"
+msgstr ""
+
+#: src/prefs.c:1678
+msgid "Allow only the users below"
+msgstr ""
+
+#: src/prefs.c:1680
+msgid "Allow List"
+msgstr ""
+
+#: src/prefs.c:1712
+#, fuzzy
+msgid "Deny all users"
+msgstr "Bestimmte sperren"
+
+#: src/prefs.c:1713
+msgid "Block the users below"
+msgstr ""
+
+#: src/prefs.c:1715
+#, fuzzy
+msgid "Block List"
+msgstr "Sperren"
+
+#: src/prefs.c:1791
 msgid "Gaim - Preferences"
 msgstr ""
 
-#: src/prefs.c:1843
+#: src/prefs.c:1877
 msgid "GAIM debug output window"
 msgstr ""
 
-#: src/prefs.c:1998
+#: src/prefs.c:2040
 msgid "General"
 msgstr ""
 
-#: src/prefs.c:2011
-msgid "Connection"
-msgstr ""
-
-#: src/prefs.c:2033
-msgid "Applet"
-msgstr ""
-
-#. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:2051
-#, fuzzy
-msgid "Permit/Deny"
-msgstr "Bestimmte zulassen"
-
-#: src/prefs.c:2062
+#: src/prefs.c:2064
 #, fuzzy
 msgid "Conversations"
 msgstr "Alles Mitschneiten"
 
-#: src/prefs.c:2067
+#: src/prefs.c:2069
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2072
+#: src/prefs.c:2074
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2077
+#: src/prefs.c:2079
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:2093
+#: src/prefs.c:2095
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:2098
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2120
+#: src/prefs.c:2122
 msgid "Browser"
 msgstr ""
 
-#: src/rvous.c:108
+#: src/prefs.c:2133
+msgid "Privacy"
+msgstr ""
+
+#: src/rvous.c:148
 msgid "Gaim - Save As..."
 msgstr ""
 
-#: src/rvous.c:269
+#: src/rvous.c:317
 #, c-format
 msgid "Receiving %s from %s"
 msgstr ""
 
-#: src/rvous.c:285 src/rvous.c:422
-msgid "Gaim - File Transfer"
+#: src/rvous.c:693
+msgid "Accept"
 msgstr ""
 
-#: src/rvous.c:406
-#, c-format
-msgid "Sending %s to %s"
-msgstr ""
-
-#: src/rvous.c:662
+#: src/rvous.c:720
 #, c-format
 msgid "%s requests you to accept the file: %s (%d bytes)"
 msgstr ""
 
-#: src/rvous.c:665
+#: src/rvous.c:723
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
 
-#: src/rvous.c:675
+#: src/rvous.c:733
 msgid "Gaim - File Transfer?"
 msgstr ""
 
-#~ msgid "Permit some"
+#: src/server.c:581
+msgid "Yes"
+msgstr ""
+
+#: src/server.c:582
+msgid "No"
+msgstr ""
+
+#: src/toc.c:253 src/toc.c:260
+#, fuzzy
+msgid "Connection Closed"
+msgstr "Verbindungsfehler!\n"
+
+#: src/toc.c:295
+msgid "Waiting for reply..."
+msgstr ""
+
+#: src/toc.c:354
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr ""
+
+#: src/toc.c:355
+msgid "TOC Resume"
+msgstr ""
+
+#: src/toc.c:515
+#, fuzzy
+msgid "Password Change Successeful"
+msgstr "gAIM - Password Änderung"
+
+#: src/toc.c:518
+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
+msgid "TOC Pause"
+msgstr ""
+
+#: src/toc.c:977
+#, fuzzy
+msgid "Get Dir Info"
+msgstr "Profil"
+
+#~ msgid "You must give your password"
+#~ msgstr "Bitte geben Sie ein Passwort ein"
+
+#~ msgid "%d/%d Buddies Online"
+#~ msgstr "%d/%d Buddies Online"
+
+#~ msgid "Toggle Logging"
+#~ msgstr "Mitschnitt ein"
+
+#~ msgid "Message too long, some data truncated."
+#~ msgstr "Nachricht zu lange. Sie wurde gekürzt."
+
+#~ msgid "Error Resolving Mail Server.\n"
+#~ msgstr "Konnte Mail-Server nicht finden.\n"
+
+#~ msgid "Buddy To Pounce:"
+#~ msgstr "Buddy-Alert für:"
+
+#~ msgid "Message to send:"
+#~ msgstr "Nachricht:"
+
+#, fuzzy
+#~ msgid "Permit / Deny"
 #~ msgstr "Bestimmte zulassen"
 
-#~ msgid "Deny some"
-#~ msgstr "Bestimmte sperren"
+#~ msgid "g001: Error resolving host\n"
+#~ msgstr "g001: Fehler: Kann Host nicht finden\n"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Suche %s"
+
+#, fuzzy
+#~ msgid "Remember password"
+#~ msgstr "Passwort Speichern"
+
+#, fuzzy
+#~ msgid "TOC Options"
+#~ msgstr "Einstellungen"
+
+#, fuzzy
+#~ msgid "Oscar Options"
+#~ msgstr "Einstellungen"
+
+#, fuzzy
+#~ msgid "Applet Options"
+#~ msgstr "Einstellungen"
+
+#, fuzzy
+#~ msgid "Allow Anyone"
+#~ msgstr "Jeden zulassen"
+
+#, fuzzy
+#~ msgid "Permit/Deny"
+#~ msgstr "Bestimmte zulassen"
+
+#~ msgid "Permit some"
+#~ msgstr "Bestimmte zulassen"
 
 #~ msgid "Add buddy to permit/deny"
 #~ msgstr "Buddy zu Sperren/Zulassen hinzufügen"
--- a/po/es.po	Mon Dec 04 07:13:31 2000 +0000
+++ b/po/es.po	Mon Dec 04 07:58:38 2000 +0000
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/gnome_applet_mgr.c:254
+#: src/gnome_applet_mgr.c:256
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-10-09 11:11-0700\n"
+"POT-Creation-Date: 2000-12-03 23:24-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,197 +15,178 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: src/about.c:73
+#: src/about.c:72
 #, c-format
 msgid "About GAIM v%s"
 msgstr "Sobre GAIM v%s"
 
-#: src/aim.c:168
-msgid "Please enter your logon"
-msgstr "Porfavor introduzca su nombre de cuenta"
-
-#: src/aim.c:172
-msgid "You must give your password"
-msgstr "Tiene que introduzir su contraseña"
-
-#: src/aim.c:222 src/buddy.c:1873
+#: src/aim.c:133 src/buddy.c:2100
 msgid "Signoff"
 msgstr "Desconectar"
 
-#: src/aim.c:325 src/aim.c:570 src/buddy.c:319
+#: src/aim.c:147
+msgid "Please enter your logon"
+msgstr "Porfavor introduzca su nombre de cuenta"
+
+#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#, fuzzy
+msgid "Signon Error"
+msgstr "Conectar"
+
+#: src/aim.c:152
+#, fuzzy
+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:326 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:428
-#: src/dialogs.c:747 src/dialogs.c:822 src/dialogs.c:979 src/dialogs.c:1056
-#: src/dialogs.c:1173 src/dialogs.c:1305 src/dialogs.c:1492 src/dialogs.c:1597
-#: src/dialogs.c:1678 src/dialogs.c:1923 src/dialogs.c:2111 src/dialogs.c:2277
-#: src/dialogs.c:2372 src/dialogs.c:3098 src/dialogs.c:3360 src/oscar.c:655
-#: src/rvous.c:279 src/rvous.c:416 src/rvous.c:638
+#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+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:327 src/buddy.c:1870
+#: src/aim.c:259
 msgid "Register"
 msgstr "Registrar"
 
-#: src/aim.c:328
+#: src/aim.c:260
 msgid "Options"
 msgstr "Opciones"
 
-#: src/aim.c:330 src/aim.c:576 src/buddy.c:1936
+#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
 msgid "Plugins"
 msgstr "Aditivos"
 
-#: src/aim.c:404
+#. Labels for selectors and text boxes
+#: src/aim.c:338
 msgid "Screen Name: "
 msgstr "Nomre de Usuario:"
 
-#: src/aim.c:407
+#: src/aim.c:341
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: src/aim.c:410
-msgid "Remember Password"
-msgstr "Acordarse de la Constraseña"
-
-#: src/aim.c:457
+#: src/aim.c:380
 msgid "Gaim - Login"
 msgstr "Conectación - Gaim"
 
-#: src/aim.c:565 src/buddy.c:1933
+#: src/aim.c:599 src/buddy.c:2163
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/away.c:88 src/away.c:203
+#: src/away.c:110 src/away.c:227
 msgid "Back"
 msgstr "Retroceder"
 
-#: src/away.c:99
+#: src/away.c:121
 msgid "I'm Back!"
 msgstr "Ya regrese"
 
-#: src/away.c:141
+#: src/away.c:160
 msgid "Gaim - Away!"
 msgstr "Gaim - Ausente!"
 
-#: src/away.c:242 src/gnome_applet_mgr.c:198
+#: src/away.c:266 src/gnome_applet_mgr.c:200
 msgid "New Away Message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/away.c:260
+#: src/away.c:284
 msgid "Remove Away Message"
 msgstr "Quitar Mensaje de Ausencia"
 
-#: src/buddy.c:161
-#, c-format
-msgid "%d/%d Buddies Online"
-msgstr "%d/%d Amigos en línea"
-
 #. Put the buttons in the box
-#: src/buddy.c:260 src/buddy.c:2005 src/buddy_chat.c:816
-#: src/conversation.c:440 src/conversation.c:1658 src/dialogs.c:977
-#: src/dialogs.c:1055 src/dialogs.c:1922 src/dialogs.c:1944 src/dialogs.c:3358
-#: src/prefs.c:667 src/prefs.c:1108 src/prefs.c:1565
+#: 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
 msgid "Add"
 msgstr "Agregar"
 
-#: src/buddy.c:261 src/buddy.c:2006 src/dialogs.c:987 src/dialogs.c:1071
+#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
 msgid "Group"
 msgstr "Grupo"
 
-#: src/buddy.c:262 src/buddy.c:2007 src/buddy_chat.c:818
-#: src/conversation.c:1656 src/dialogs.c:885 src/prefs.c:671 src/prefs.c:1109
-#: src/prefs.c:1577
+#: 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
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/buddy.c:265 src/buddy.c:1777
+#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
 msgid "Chat"
 msgstr "Hablar"
 
-#: src/buddy.c:266 src/buddy.c:406 src/buddy.c:1775 src/buddy_chat.c:543
+#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
 msgid "IM"
 msgstr "Mensaje"
 
-#: src/buddy.c:267 src/buddy.c:412 src/buddy.c:1776 src/buddy_chat.c:545
-#: src/buddy_chat.c:824 src/conversation.c:1652 src/rvous.c:636
+#: 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
 msgid "Info"
 msgstr "Información"
 
-#: src/buddy.c:418 src/dialogs.c:3372
+#. Put the buttons in the box
+#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
 msgid "Alias"
 msgstr ""
 
 #: src/buddy.c:425
-msgid "Dir Info"
-msgstr "Información del Directorio"
-
-#: src/buddy.c:432
-#, fuzzy
-msgid "Direct IM"
-msgstr "Información del Directorio"
-
-#: src/buddy.c:438
-msgid "Away Msg"
-msgstr "Mensaje de ausencia"
-
-#: src/buddy.c:445
-msgid "Toggle Logging"
-msgstr "Prender/Apagar Diario"
-
-#: src/buddy.c:451
 msgid "Add Buddy Pounce"
 msgstr "Agregar Calada de Amigo"
 
-#: src/buddy.c:1270
+#: src/buddy.c:1368
 msgid "New Buddy Pounce"
 msgstr "Nueva Calada de Amigo"
 
-#: src/buddy.c:1288
+#: src/buddy.c:1386
 msgid "Remove Buddy Pounce"
 msgstr "Quitar Calada de Amigo"
 
-#: src/buddy.c:1376
-#, fuzzy, c-format
-msgid "%sBuddy Icon"
+#: src/buddy.c:1675
+#, fuzzy
+msgid "Buddy Icon"
 msgstr "Calada de Amigo"
 
-#: src/buddy.c:1379
-#, c-format
-msgid "%sVoice"
+#: src/buddy.c:1678
+msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1382
-#, c-format
-msgid "%sIM Image"
+#: src/buddy.c:1681
+msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1385
-#, fuzzy, c-format
-msgid "%sChat"
-msgstr "Hablar"
-
-#: src/buddy.c:1388
-#, c-format
-msgid "%sGet File"
-msgstr ""
-
-#: src/buddy.c:1391
-#, c-format
-msgid "%sSend File"
-msgstr ""
-
-#: src/buddy.c:1446
+#: src/buddy.c:1687
+#, fuzzy
+msgid "Get File"
+msgstr "Archivo"
+
+#: src/buddy.c:1690
+#, fuzzy
+msgid "Send File"
+msgstr "Archivo"
+
+#: src/buddy.c:1749
 msgid "Warnings: %d%%\n"
 msgstr "Advertencias: %d%%\n"
 
-#: src/buddy.c:1452
+#: src/buddy.c:1754
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1456
+#: src/buddy.c:1758
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -217,505 +198,493 @@
 "Connectado en: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1456
+#: src/buddy.c:1761
 msgid "Idle: "
 msgstr "Inactivo: "
 
-#: src/buddy.c:1501
+#: src/buddy.c:1828
 #, 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:1644
+#: src/buddy.c:1878
 #, 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:1802
+#: src/buddy.c:2028
 msgid "Information on selected Buddy"
 msgstr "Informacion sobre Amigo Escogido"
 
-#: src/buddy.c:1803 src/dialogs.c:738
+#: src/buddy.c:2029 src/dialogs.c:657
 msgid "Send Instant Message"
 msgstr "Mandar Mensaje Instantaneo"
 
-#: src/buddy.c:1804
+#: src/buddy.c:2030
 msgid "Start/join a Buddy Chat"
 msgstr "Empezar/Unirse a Conversación de Amigos"
 
-#: src/buddy.c:1857
+#: src/buddy.c:2088
 msgid "File"
 msgstr "Archivo"
 
-#: src/buddy.c:1861 src/buddy.c:1862
+#: src/buddy.c:2092 src/buddy.c:2093
 msgid "Add A Buddy"
 msgstr "Agregar Amigo"
 
-#: src/buddy.c:1863
+#: src/buddy.c:2094
 #, fuzzy
 msgid "Join A Chat"
 msgstr "Unirse a conversación"
 
-#: src/buddy.c:1865
+#: src/buddy.c:2095
+#, fuzzy
+msgid "New Instant Message"
+msgstr "Mandar Mensaje Instantaneo"
+
+#: src/buddy.c:2097
 msgid "Import Buddy List"
 msgstr "Importar Lista de Amigos"
 
-#: src/buddy.c:1866
+#: src/buddy.c:2098
 msgid "Export Buddy List"
 msgstr "Exportar Lista de Amigos"
 
-#: src/buddy.c:1876
+#: src/buddy.c:2103
 msgid "Quit"
 msgstr "Salir"
 
-#: src/buddy.c:1878 src/buddy_chat.c:537 src/buddy_chat.c:791
-#: src/buddy_chat.c:812 src/conversation.c:1654 src/dialogs.c:505
-#: src/plugins.c:317 src/prefs.c:1810
+#: 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:1883
+#: src/buddy.c:2110
 msgid "Tools"
 msgstr "Herramientas"
 
-#: src/buddy.c:1888 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
 msgid "Away"
 msgstr "Ausente"
 
-#: src/buddy.c:1893
+#: src/buddy.c:2120
 msgid "Buddy Pounce"
 msgstr "Calada de Amigo"
 
-#: src/buddy.c:1901 src/dialogs.c:2105 src/dialogs.c:2262
+#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
 msgid "Search for Buddy"
 msgstr "Buscar un Amigo"
 
-#: src/buddy.c:1904
+#: src/buddy.c:2131
 msgid "by Email"
 msgstr "por Correo Electronico"
 
-#: src/buddy.c:1908
+#: src/buddy.c:2135
 msgid "by Dir Info"
 msgstr "por Información de Directorio"
 
-#: src/buddy.c:1915 src/buddy.c:1916
+#: src/buddy.c:2142 src/buddy.c:2143
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/buddy.c:1919
+#: src/buddy.c:2146
 msgid "User Info"
 msgstr "Información de Usuario"
 
-#: src/buddy.c:1923 src/dialogs.c:1299
+#: src/buddy.c:2150 src/dialogs.c:1353
 msgid "Directory Info"
 msgstr "Información del Directorio"
 
-#: src/buddy.c:1927 src/dialogs.c:1486
+#: src/buddy.c:2154 src/dialogs.c:1592
 msgid "Change Password"
 msgstr "Cambiar Contraseña"
 
-#: src/buddy.c:1941
+#: src/buddy.c:2171
 #, fuzzy
 msgid "Perl"
 msgstr "Permitir"
 
-#: src/buddy.c:1944
+#: src/buddy.c:2174
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1948
+#: src/buddy.c:2178
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1952
+#: src/buddy.c:2182
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1960
+#: src/buddy.c:2190
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/buddy.c:1965
+#: src/buddy.c:2195
 #, fuzzy
 msgid "About Gaim"
 msgstr "Sobre"
 
-#: src/buddy.c:1984 src/prefs.c:2045
+#: src/buddy.c:2214 src/prefs.c:2053
 msgid "Buddy List"
 msgstr "Lista de Amigos"
 
-#: src/buddy.c:2036
+#: src/buddy.c:2266
 msgid "Add a new Buddy"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:2037
+#: src/buddy.c:2267
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:2038
+#: src/buddy.c:2268
 msgid "Remove selected Buddy"
 msgstr "Quitar Amigo Escogido"
 
-#: src/buddy.c:2063
+#: src/buddy.c:2293
 msgid "Online"
 msgstr "En Linea"
 
-#: src/buddy.c:2065
+#: src/buddy.c:2295
 msgid "Edit Buddies"
 msgstr "Corregir Amigos["
 
-#: src/buddy.c:2102
+#: src/buddy.c:2332
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista de Amigos"
 
-#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
-msgid "Buddy Chat"
-msgstr "Conversación de Amigos"
-
-#: src/buddy_chat.c:123
-msgid "Join"
-msgstr "Unirse"
-
-#: src/buddy_chat.c:129
-msgid "Join what group:"
-msgstr "Unirse a que grupo:"
-
 #: src/buddy_chat.c:135
+msgid "Join Chat"
+msgstr "Unirse a conversación"
+
+#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
+msgid "Buddy Chat"
+msgstr "Conversación de Amigos"
+
+#: src/buddy_chat.c:151
+msgid "Join what group:"
+msgstr "Unirse a que grupo:"
+
+#: src/buddy_chat.c:167
+#, fuzzy
+msgid "Join Chat As:"
+msgstr "Unirse a conversación"
+
+#: src/buddy_chat.c:181
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:143
+#: src/buddy_chat.c:189
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:172
-msgid "Join Chat"
-msgstr "Unirse a conversación"
-
-#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
+#: src/buddy_chat.c:197
+msgid "Join"
+msgstr "Unirse"
+
+#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/buddy_chat.c:234
+#: src/buddy_chat.c:261
 msgid "Invite who?"
 msgstr "Invitar a quien?"
 
-#: src/buddy_chat.c:238
+#: src/buddy_chat.c:265
 msgid "With message:"
 msgstr "Con el mensaje:"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:292
 msgid "Invite to Buddy Chat"
 msgstr "Invitar un Amigo a la conversación"
 
-#: src/buddy_chat.c:424
+#: src/buddy_chat.c:420
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:452
+#: src/buddy_chat.c:459
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:540 src/buddy_chat.c:789
+#: src/buddy_chat.c:559 src/buddy_chat.c:816
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
-#: src/conversation.c:1651 src/dialogs.c:1679
+#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
+#: src/conversation.c:1733
 msgid "Send"
 msgstr "Mandar"
 
-#: src/buddy_chat.c:544
+#: src/buddy_chat.c:563
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: src/buddy_chat.c:820 src/conversation.c:1659
+#: src/buddy_chat.c:849 src/conversation.c:1741
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/buddy_chat.c:822 src/conversation.c:1653 src/dialogs.c:424
-#: src/dialogs.c:426 src/rvous.c:637
+#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
+#: src/dialogs.c:345 src/rvous.c:695
 msgid "Warn"
 msgstr "Advertir"
 
-#: src/conversation.c:171
-#, fuzzy, c-format
-msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
-msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
-
-#: src/conversation.c:178
-#, fuzzy, c-format
-msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
-msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
-
-#: src/conversation.c:435
+#: src/conversation.c:426
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Quitando '%s' de la lista.\n"
 
-#: src/conversation.c:688
-msgid "Message too long, some data truncated."
-msgstr "Mensaje demasiado largo, algunas partes fueron cortadas."
-
-#: src/conversation.c:688 src/dialogs.c:2825 src/dialogs.c:2895
-#: src/rvous.c:221 src/rvous.c:492
-msgid "Error"
-msgstr "Error"
-
-#: src/conversation.c:875
+#: src/conversation.c:902
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Presentemente en %d\n"
 
-#: src/conversation.c:884
+#: src/conversation.c:911
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Moviendo posición a %d\n"
 
-#: src/conversation.c:1489
+#: src/conversation.c:1497
 msgid "Bold"
 msgstr "Negritas"
 
-#: src/conversation.c:1489 src/prefs.c:1292
+#: src/conversation.c:1497 src/prefs.c:818
 msgid "Bold Text"
 msgstr "Texto en Negritas"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1501 src/conversation.c:1502
 msgid "Italics"
 msgstr "Inclinados"
 
-#: src/conversation.c:1493 src/prefs.c:1293
+#: src/conversation.c:1501 src/prefs.c:819
 msgid "Italics Text"
 msgstr "Texto Inclinado"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1505 src/conversation.c:1506
 msgid "Underline"
 msgstr "Subrayar"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1505
 msgid "Underline Text"
 msgstr "Subrayar Texto"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1509 src/conversation.c:1510
 msgid "Strike"
 msgstr "Cruzar"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1509
 msgid "Strike through Text"
 msgstr "Cruzar el Texto"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Small"
 msgstr "Pequeño"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Decrease font size"
 msgstr "Hacer texto mas pequeño"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal font size"
 msgstr "Texto normal"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Increase font size"
 msgstr "Hacer el texto mas grande "
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1526 src/conversation.c:1527
 msgid "Font"
 msgstr "Texto"
 
-#: src/conversation.c:1518 src/dialogs.c:2724 src/dialogs.c:2740
+#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
 msgid "Select Font"
 msgstr "Seleccionar un Texto"
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
+#: src/conversation.c:1535
 msgid "Color"
 msgstr "Color"
 
-#: src/conversation.c:1522 src/prefs.c:1306
+#: src/conversation.c:1530 src/prefs.c:832
 msgid "Text Color"
 msgstr "Color del texto"
 
-#: src/conversation.c:1526 src/prefs.c:1323
+#: src/conversation.c:1534 src/prefs.c:849
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1541 src/conversation.c:1542
 msgid "Link"
 msgstr "Dirección"
 
-#: src/conversation.c:1533 src/dialogs.c:2366
+#: src/conversation.c:1541 src/dialogs.c:2391
 msgid "Insert Link"
 msgstr "Insertar una Dirección"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 #, fuzzy
 msgid "Smiley"
 msgstr "Archivo"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1552 src/conversation.c:1553
 msgid "Logging"
 msgstr "Diario"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1552
 msgid "Enable logging"
 msgstr "Usar Diario"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1556 src/conversation.c:1557
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1556
 msgid "Enable sounds"
 msgstr "Usar Sonidos"
 
-#: src/dialogs.c:225
-msgid "Error Resolving Mail Server.\n"
-msgstr "Error Resolviendo el Servidor de correo.\n"
-
-#: src/dialogs.c:231
-msgid "Error Connecting to Socket.\n"
-msgstr "Error Connectando al encaje. \n"
-
-#: src/dialogs.c:441
+#: src/conversation.c:1768
+#, fuzzy
+msgid "Send message as: "
+msgstr "Sonido cuando un mensaje es enviado"
+
+#: src/dialogs.c:360
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "¿Deveras quiere advertirle a %s?"
 
-#: src/dialogs.c:445
+#: src/dialogs.c:364
 msgid "Warn anonymously?"
 msgstr "¿Advertirle anonimamente?"
 
-#: src/dialogs.c:448
+#: src/dialogs.c:367
 msgid "Anonymous warnings are less harsh."
 msgstr "Las advertencias anonimas son menos duras."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:393
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Advertir usuario?"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:458
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No se pudo escribir archivo %s."
 
-#: src/dialogs.c:544
+#: src/dialogs.c:461
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No se pudo leer archivo %s."
 
-#: src/dialogs.c:547
+#: src/dialogs.c:464
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensaje demasiado largo, ultimos %s bytes fueron borrados."
 
-#: src/dialogs.c:550
+#: src/dialogs.c:467
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s no esta en linea ahorita."
 
-#: src/dialogs.c:553
+#: src/dialogs.c:470
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Advertencias para %s estan prohibidas."
 
-#: src/dialogs.c:556
+#: src/dialogs.c:473
 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:559
+#: src/dialogs.c:476
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Conversación en %s no esta disponible."
 
-#: src/dialogs.c:562
+#: src/dialogs.c:479
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esta mandando los mensajes demasiado rapido a %s."
 
-#: src/dialogs.c:565
+#: src/dialogs.c:482
 #, 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:568
+#: src/dialogs.c:485
 #, 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:571
+#: src/dialogs.c:488
 msgid "Failure."
 msgstr "Falla"
 
-#: src/dialogs.c:574
+#: src/dialogs.c:491
 msgid "Too many matches."
 msgstr "Demasiados resultados"
 
-#: src/dialogs.c:577
+#: src/dialogs.c:494
 msgid "Need more qualifiers."
 msgstr "Necesito mas calificadores"
 
-#: src/dialogs.c:580
+#: src/dialogs.c:497
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio no esta disponible ahorita."
 
-#: src/dialogs.c:583
+#: src/dialogs.c:500
 msgid "Email lookup restricted."
 msgstr "Busqueda de correos electronicos es restringida."
 
-#: src/dialogs.c:586
+#: src/dialogs.c:503
 msgid "Keyword ignored."
 msgstr "Palabra ignorada"
 
-#: src/dialogs.c:589
+#: src/dialogs.c:506
 msgid "No keywords."
 msgstr "Sin palabras"
 
-#: src/dialogs.c:592
+#: src/dialogs.c:509
 msgid "User has no directory information."
 msgstr "El usuario no tiene información en el directorio."
 
-#: src/dialogs.c:596
+#: src/dialogs.c:513
 msgid "Country not supported."
 msgstr "País no apoyado"
 
-#: src/dialogs.c:599
+#: src/dialogs.c:516
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Falla desconocida: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:602 src/oscar.c:318
+#: src/dialogs.c:519 src/oscar.c:471
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contraseña incorrecta."
 
-#: src/dialogs.c:605
+#: src/dialogs.c:522
 msgid "The service is temporarily unavailable."
 msgstr "Este servicio no esta disponible en este momento."
 
-#: src/dialogs.c:608
+#: src/dialogs.c:525
 msgid "Your warning level is currently too high to log in."
 msgstr "Su nivel de advertencias es demasiado alto para conectarse."
 
-#: src/dialogs.c:611
+#: src/dialogs.c:528
 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."
@@ -723,287 +692,332 @@
 "Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
 "intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
 
-#: src/dialogs.c:614
+#: src/dialogs.c:531
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Un error al conectarse ha ocurrido: %s."
 
-#: src/dialogs.c:617
+#: src/dialogs.c:534
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Un error desconocido, %d, ha ocurrido.  Informacion: %s"
 
-#: src/dialogs.c:620
+#: src/dialogs.c:537
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - Error %d"
 
 #. Build OK Button
-#: src/dialogs.c:677 src/dialogs.c:742 src/dialogs.c:817 src/dialogs.c:1168
-#: src/dialogs.c:1491 src/dialogs.c:1777 src/dialogs.c:2110 src/dialogs.c:2272
-#: src/dialogs.c:2371
+#: 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
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:671
 #, fuzzy
 msgid "IM who:"
 msgstr "Quien: "
 
-#: src/dialogs.c:776
+#: src/dialogs.c:695
 msgid "Gaim - IM user"
 msgstr "Gaim - Usuario"
 
-#: src/dialogs.c:813
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "Información de Usuario"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:746
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:851
+#: src/dialogs.c:770
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Crear Información del Usuario"
 
-#: src/dialogs.c:933
+#: src/dialogs.c:845
 msgid "Buddies"
 msgstr "Amigos"
 
-#: src/dialogs.c:985
+#: src/dialogs.c:898
 #, fuzzy
 msgid "Add Group"
 msgstr "Grupo"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:928
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:1062
-msgid "Add Buddy"
-msgstr "Agregar Amigo"
-
-#: src/dialogs.c:1064 src/dialogs.c:3368
-msgid "Buddy"
-msgstr "Amigo"
-
-#: src/dialogs.c:1103
+#: src/dialogs.c:957
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#. Put the buttons in the box
-#: src/dialogs.c:1179
-msgid "Buddy To Pounce:"
-msgstr "Amigo a calar:"
-
-#: src/dialogs.c:1184
-msgid "Open IM Window on Buddy Logon"
+#: src/dialogs.c:967
+msgid "Add Buddy"
+msgstr "Agregar Amigo"
+
+#: src/dialogs.c:979 src/dialogs.c:3443
+msgid "Buddy"
+msgstr "Amigo"
+
+#: src/dialogs.c:1109
+#, fuzzy
+msgid "Pounce buddy as:"
+msgstr "Sonido cuando un amgio se conecte"
+
+#: src/dialogs.c:1181
+#, fuzzy
+msgid "Buddy:"
+msgstr "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:1187
-msgid "Send IM on Buddy Logon"
+#: src/dialogs.c:1234
+#, fuzzy
+msgid "Send IM on pounce"
 msgstr "Mandar un mensaje cuando se conecte este amigo"
 
-#: src/dialogs.c:1195
-msgid "Message to send:"
-msgstr "Mensaje a mandar:"
-
-#: src/dialogs.c:1216
+#: src/dialogs.c:1263
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuevo amigo a calar"
 
 #. Build Save Button
-#: src/dialogs.c:1303 src/dialogs.c:1596 src/dialogs.c:3093
+#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
 msgid "Save"
 msgstr "Guardar"
 
-#: src/dialogs.c:1321
+#: src/dialogs.c:1376
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dejar que busquedas en el Web encuentren su informacion"
 
 #. Line 1
-#: src/dialogs.c:1324 src/dialogs.c:2128
+#: src/dialogs.c:1379 src/dialogs.c:2159
 msgid "First Name"
 msgstr "Nombre"
 
 #. Line 2
-#: src/dialogs.c:1335 src/dialogs.c:2140
+#: src/dialogs.c:1390 src/dialogs.c:2171
 msgid "Middle Name"
 msgstr "Segundo Nombre"
 
 #. Line 3
-#: src/dialogs.c:1347 src/dialogs.c:2152
+#: src/dialogs.c:1402 src/dialogs.c:2183
 msgid "Last Name"
 msgstr "Apellido"
 
 #. Line 4
-#: src/dialogs.c:1358 src/dialogs.c:2164
+#: src/dialogs.c:1413 src/dialogs.c:2195
 msgid "Maiden Name"
 msgstr "Apellido Materno"
 
 #. Line 5
-#: src/dialogs.c:1369 src/dialogs.c:2176
+#: src/dialogs.c:1424 src/dialogs.c:2207
 msgid "City"
 msgstr "Ciudad"
 
 #. Line 6
-#: src/dialogs.c:1380 src/dialogs.c:2187
+#: src/dialogs.c:1435 src/dialogs.c:2218
 msgid "State"
 msgstr "Estado"
 
 #. Line 7
-#: src/dialogs.c:1391 src/dialogs.c:2198
+#: src/dialogs.c:1446 src/dialogs.c:2229
 msgid "Country"
 msgstr "País"
 
-#: src/dialogs.c:1436
+#: src/dialogs.c:1490
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Crear Información del directorio"
 
-#: src/dialogs.c:1453
+#: src/dialogs.c:1507
 msgid "New Passwords Do Not Match"
 msgstr "Las contraseñas nuevas no son iguales"
 
-#: src/dialogs.c:1453 src/dialogs.c:1458
+#: src/dialogs.c:1507 src/dialogs.c:1512
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Error sobre el cambio de contraseña"
 
-#: src/dialogs.c:1458
+#: src/dialogs.c:1512
 msgid "Fill out all fields completely"
 msgstr "Llene todos los campos completamente"
 
-#: src/dialogs.c:1500
+#: src/dialogs.c:1541
+#, fuzzy
+msgid "Change password for:"
+msgstr "Cambiar Contraseña"
+
+#: src/dialogs.c:1580 src/toc.c:515
+msgid "Gaim - Password Change"
+msgstr "Gaim - Cambiar Contraseña"
+
+#: src/dialogs.c:1612
 msgid "Original Password"
 msgstr "Contraseña Original"
 
-#: src/dialogs.c:1516
+#: src/dialogs.c:1626
 msgid "New Password"
 msgstr "Contraseña Nueva"
 
-#: src/dialogs.c:1530
+#: src/dialogs.c:1640
 msgid "New Password (again)"
 msgstr "Contraseña Nueva (de nuevo)"
 
-#: src/dialogs.c:1567
-msgid "Gaim - Password Change"
-msgstr "Gaim - Cambiar Contraseña"
-
-#: src/dialogs.c:1630
+#: src/dialogs.c:1693
+msgid "Set info for:"
+msgstr ""
+
+#: src/dialogs.c:1776
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Crear Información del Usuario"
 
-#: src/dialogs.c:1786
+#: src/dialogs.c:1817
 msgid "Below are the results of your search: "
 msgstr "Siguientemente estan los resultados de su búsqueda: "
 
-#: src/dialogs.c:1918
-#, fuzzy
-msgid "Permit / Deny"
-msgstr "Permitir algunos"
-
-#: src/dialogs.c:1929 src/prefs.c:471
+#: src/dialogs.c:1943 src/dialogs.c:1950
+msgid "Permit"
+msgstr "Permitir"
+
+#: src/dialogs.c:1945 src/dialogs.c:1952
 msgid "Deny"
 msgstr "Negar"
 
-#: src/dialogs.c:1934 src/prefs.c:455 src/prefs.c:512
-msgid "Permit"
-msgstr "Permitir"
-
-#: src/dialogs.c:1975
-msgid "Gaim - Add Permit/Deny"
+#: src/dialogs.c:1993
+#, fuzzy
+msgid "Gaim - Add Permit"
 msgstr "Gaim - Agregar Autorizar/Negar"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:1995
+#, fuzzy
+msgid "Gaim - Add Deny"
+msgstr "Gaim - Agregar Autorizar/Negar"
+
+#: src/dialogs.c:2057
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/dialogs.c:2235
+#: src/dialogs.c:2266
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Encontrar amgio por información"
 
-#: src/dialogs.c:2282
+#: src/dialogs.c:2315
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2328
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electrónico"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2410
 msgid "URL"
 msgstr "Dirección"
 
-#: src/dialogs.c:2393
+#: src/dialogs.c:2418
 msgid "Description"
 msgstr "Descripción"
 
-#: src/dialogs.c:2419
+#: src/dialogs.c:2444
 msgid "GAIM - Add URL"
 msgstr "GAIM - Agregar dirección"
 
-#: src/dialogs.c:2562 src/dialogs.c:2575 src/dialogs.c:2612
+#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
 msgid "Select Text Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2599
+#: src/dialogs.c:2624
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2824 src/rvous.c:220
+#: src/dialogs.c:2847 src/rvous.c:265
 #, c-format
 msgid "Error writing file %s"
 msgstr "Error creando el archivo %s"
 
-#: src/dialogs.c:2841
+#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
+#: src/rvous.c:548
+msgid "Error"
+msgstr "Error"
+
+#: src/dialogs.c:2901
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Exportar lista de amigos"
 
-#: src/dialogs.c:2894 src/rvous.c:491
+#: src/dialogs.c:2967 src/rvous.c:547
 #, c-format
 msgid "Error reading file %s"
 msgstr "Error leyendo el archivo %s"
 
-#: src/dialogs.c:2973
+#: src/dialogs.c:3045
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar lista de amigos"
 
-#: src/dialogs.c:3054
+#: src/dialogs.c:3124
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo mensaje de ausencia"
 
-#. Set up our frame
-#: src/dialogs.c:3061
+#. Put frame and button-box in the toplevel
+#: src/dialogs.c:3136
 #, fuzzy
 msgid "New away message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#. Make a label for away entry
-#: src/dialogs.c:3071
+#: src/dialogs.c:3149
 msgid "Away title: "
 msgstr "Titulo del mensaje: "
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3121
+#: src/dialogs.c:3193
 #, fuzzy
 msgid "Make Away Now"
 msgstr "Hacerme ausente ahora"
 
 #. show everything
-#: src/dialogs.c:3299
+#: src/dialogs.c:3370
 #, fuzzy
 msgid "Smile!"
 msgstr "Archivo"
 
-#: src/dialogs.c:3366
+#: src/dialogs.c:3441
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Agregar Amigo"
 
-#: src/dialogs.c:3404
+#: src/dialogs.c:3478
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Agregar Amigo"
@@ -1013,19 +1027,19 @@
 msgid "file not found: %s\n"
 msgstr "archivo no encontrado: %s\n"
 
-#: src/gnome_applet_mgr.c:122
+#: 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:129
+#: src/gnome_applet_mgr.c:128
 msgid "Attempting to sign on...."
 msgstr "Tratando de conectarme...."
 
-#: src/gnome_applet_mgr.c:252
+#: src/gnome_applet_mgr.c:254
 msgid "GAIM"
 msgstr "GAIM"
 
-#: src/gnome_applet_mgr.c:364
+#: src/gnome_applet_mgr.c:366
 msgid "Can't create GAIM applet!"
 msgstr "No pudo crearse el programa GAIM"
 
@@ -1033,117 +1047,180 @@
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/gnome_applet_mgr.c:408
+#: src/gnome_applet_mgr.c:411
 msgid "Font does not exist"
 msgstr "Ese tipo de texto no existe"
 
-#: src/gnome_applet_mgr.c:424
+#: src/gnome_applet_mgr.c:427
 msgid "About..."
 msgstr "Sobre..."
 
-#: src/gtkhtml.c:1385
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "Dirección:"
 
-#: src/gtkhtml.c:1798
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "Abrir dirección en ventana existente"
 
-#: src/gtkhtml.c:1807
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "Abrir dirección en nueva ventana"
 
-#: src/gtkhtml.c:1815
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "Agregar dirección como favorito"
 
-#: src/html.c:120
-msgid "g001: Error resolving host\n"
-msgstr "Error resolviendo patrón\n"
-
-#: src/html.c:122
+#: src/html.c:122 src/html.c:125
 msgid "g003: Error opening connection.\n"
 msgstr "Error abriendo enlaze. \n"
 
-#: src/html.c:154
+#: src/html.c:158
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "Recibiendo %d bytes de %s"
 
-#: src/html.c:167
+#: src/html.c:171
 msgid "Getting Data"
 msgstr "Recibiendo Data"
 
-#: src/html.c:200
+#: src/html.c:204
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "Recibido: '%s'\n"
 
-#: src/oscar.c:157 src/oscar.c:184
+#: src/multi.c:367 src/prefs.c:112
+#, fuzzy
+msgid "General Options"
+msgstr "Opciones"
+
+#: src/multi.c:402
+#, fuzzy
+msgid "Screenname:"
+msgstr "Nomre de Usuario:"
+
+#: src/multi.c:414
+#, fuzzy
+msgid "Password:"
+msgstr "Contraseña: "
+
+#: src/multi.c:429
+msgid "Remember Password"
+msgstr "Acordarse de la Constraseña"
+
+#: src/multi.c:430
+#, fuzzy
+msgid "Auto-Login"
+msgstr "Auto-conectar"
+
+#: src/multi.c:431
+msgid "Send KeepAlive packet (6 bytes/second)"
+msgstr ""
+
+#: src/multi.c:473
+#, fuzzy
+msgid "Gaim - Modify Account"
+msgstr "Conectación - Gaim"
+
+#: src/multi.c:482
+msgid "Modify Account"
+msgstr ""
+
+#: src/multi.c:576
+#, fuzzy
+msgid "Enter Password"
+msgstr "Contraseña Nueva"
+
+#: src/multi.c:669
+#, fuzzy
+msgid "Gaim - Account Editor"
+msgstr "Gaim - Lista de aditivos"
+
+#: src/multi.c:678
+msgid "Account Editor"
+msgstr ""
+
+#: src/multi.c:697
+msgid "Modify"
+msgstr ""
+
+#: src/multi.c:701
+#, fuzzy
+msgid "Sign On/Off"
+msgstr "Desconectar"
+
+#: src/multi.c:705
+#, fuzzy
+msgid "Delete"
+msgstr "Seleccionar un Texto"
+
+#: src/multi.c:851
+#, 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
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: src/oscar.c:165
+#: src/oscar.c:308
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "error de conección!\n"
 
-#: src/oscar.c:182
+#: src/oscar.c:316
 #, fuzzy
 msgid "major connection error\n"
 msgstr "error de conección!\n"
 
-#: src/oscar.c:196
+#: src/oscar.c:330 src/toc.c:500
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:197
+#: src/oscar.c:331
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Error"
 
-#: src/oscar.c:220
+#: src/oscar.c:362
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Connectando %s\n"
 
-#: src/oscar.c:230
-#, c-format
-msgid "Looking up %s"
-msgstr "Buscando %s"
-
-#: src/oscar.c:235
+#: src/oscar.c:399
 msgid "internal connection error\n"
 msgstr "error interno de conección\n"
 
-#: src/oscar.c:240
+#: src/oscar.c:400
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/oscar.c:248
-msgid "couldn't resolve host\n"
+#: src/oscar.c:405
+#, fuzzy
+msgid "couldn't resolve host"
 msgstr "no se pudo resolver patrón\n"
 
-#: src/oscar.c:252
-msgid "couldn't connect to host\n"
+#: src/oscar.c:409
+#, fuzzy
+msgid "couldn't connect to host"
 msgstr "no se pudo conectar al patrón\n"
 
-#: src/oscar.c:258
+#: src/oscar.c:416
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/oscar.c:283
+#: src/oscar.c:426
 msgid "Password sent, waiting for response\n"
 msgstr "Contraseña mandada, esperando respuesta\n"
 
-#: src/oscar.c:299
+#: src/oscar.c:451
 msgid "Signed off.\n"
 msgstr "Desconectado.\n"
 
 #. connecting too frequently
-#: src/oscar.c:313
+#: src/oscar.c:466
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1152,79 +1229,112 @@
 "Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
 "intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
 
-#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:761
-#: src/oscar.c:766 src/oscar.c:788 src/oscar.c:807 src/oscar.c:831
-#, fuzzy
-msgid "Gaim - Error"
-msgstr "Gaim - Error %d"
-
 #. client too old
-#: src/oscar.c:323
+#: src/oscar.c:476
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:338
+#: src/oscar.c:480 src/toc.c:303
 msgid "Authentication Failed"
 msgstr "Autorización no optenida"
 
-#: src/oscar.c:362
+#: src/oscar.c:513
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/oscar.c:370
+#: src/oscar.c:520
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/oscar.c:401
+#: src/oscar.c:551
 msgid "Connection established, cookie sent"
 msgstr "Conección establesida, cookie enviado"
 
-#: src/oscar.c:632
-msgid "Accept Direct IM?"
-msgstr ""
-
-#: src/oscar.c:642
+#: src/oscar.c:787 src/oscar.c:1860
+#, 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 "%s has requested to directly connect to your computer. Do you accept?"
+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:652 src/rvous.c:635
-msgid "Accept"
-msgstr "Aceptar"
+#: 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:760
+#: src/oscar.c:1194
 #, 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:765
+#: 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
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:786
+#: src/oscar.c:1220
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:787 src/oscar.c:806
+#: src/oscar.c:1221 src/oscar.c:1240
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:805
+#: src/oscar.c:1239
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:830
+#: src/oscar.c:1265
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:836
+#: src/oscar.c:1271
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1236,613 +1346,709 @@
 "<BR>En línea desde : <B>%s</B><BR>Minutos Desocupados : <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/oscar.c:869
+#: src/oscar.c:1305
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:870
+#: src/oscar.c:1306
 msgid "AOL error"
 msgstr ""
 
-#: src/plugins.c:103
+#: src/oscar.c:1913
+#, 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
+#, 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
+#, fuzzy
+msgid "Get Away Msg"
+msgstr "Mensaje de ausencia"
+
+#: src/oscar.c:1982
+#, fuzzy
+msgid "Direct IM"
+msgstr "Información del Directorio"
+
+#. Below is basically stolen from plugins.c
+#: src/perl.c:639
+#, fuzzy
+msgid "Gaim - Select Perl Script"
+msgstr "Gaim - Crear Información del Usuario"
+
+#: src/perl.c:686
+msgid "Perl Scripts"
+msgstr ""
+
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista de aditivos"
 
-#: src/plugins.c:155
-#, c-format
-msgid "Already loaded %s, not reloading.\n"
-msgstr ""
-
-#: src/plugins.c:177 src/plugins.c:185 src/plugins.c:217
+#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
 msgid "Plugin Error"
 msgstr "Error de aditivo"
 
-#: src/plugins.c:265
+#: src/plugins.c:262
 msgid "Gaim - Plugins"
 msgstr "Gaim - Aditivos"
 
 #. Build the bottom button bar
-#: src/plugins.c:297
+#: src/plugins.c:294
 msgid "Load Plugin"
 msgstr "Usar Aditivo"
 
-#: src/plugins.c:304
+#: src/plugins.c:301
 msgid "Configure Plugin"
 msgstr "Configurar Aditivo"
 
-#: src/plugins.c:310
+#: src/plugins.c:307
 msgid "Unload Plugin"
 msgstr "Desocupar Aditivo"
 
-#: src/prefs.c:93
-#, fuzzy
-msgid "General Options"
-msgstr "Opciones"
-
-#: src/prefs.c:100 src/prefs.c:358 src/prefs.c:387 src/prefs.c:414
-#: src/prefs.c:614 src/prefs.c:701 src/prefs.c:810 src/prefs.c:895
-#: src/prefs.c:1288 src/prefs.c:1373 src/prefs.c:1404 src/prefs.c:1691
+#: 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
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:104
-#, fuzzy
-msgid "Remember password"
-msgstr "Acordarse de la Constraseña"
-
-#: src/prefs.c:106
-msgid "Auto-login"
-msgstr "Auto-conectar"
-
-#: src/prefs.c:112
+#.
+#. 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
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:113
+#: src/prefs.c:135
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:116
+#: src/prefs.c:138
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:124
-#, fuzzy
-msgid "Report Idle Times"
-msgstr "Demostrar el tiempo de inactividad de los amigos"
-
-#: src/prefs.c:202
-#, fuzzy
-msgid "Connection Options"
-msgstr "Connección"
-
-#: src/prefs.c:210
-msgid ""
-"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
-"other is TOC.\n"
-"\n"
-"TOC is a published protocol; AOL allows people to use the TOC protocol in "
-"their clients to connect. It is a simplified version of Oscar; it is capable "
-"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
-"is published, using TOC in gaim tends to be more stable and reliable.\n"
-"\n"
-"Oscar is a proprietary protocol. AOL has not published any information about "
-"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
-"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
-"or implemented all of the functions of Oscar, it is still able to perform "
-"most functions TOC provides as well as several others. However, using Oscar "
-"in gaim tends to be less reliable, though more usable.\n"
-"\n"
-"Changing this option takes effect at signon time."
-msgstr ""
-
-#: src/prefs.c:216
-msgid "Use Oscar Protocol"
-msgstr ""
-
-#: src/prefs.c:222
-msgid "Send Keep-Alive Packet (6 bytes/minute)"
-msgstr ""
-
-#: src/prefs.c:239 src/prefs.c:2016
+#: src/prefs.c:150
 #, fuzzy
-msgid "TOC Options"
-msgstr "Opciones"
-
-#: src/prefs.c:251
-msgid "TOC Host:"
-msgstr "Patrón TOC: "
-
-#: src/prefs.c:261 src/prefs.c:286 src/prefs.c:320
-msgid "Port:"
-msgstr "Puerto:"
-
-#: src/prefs.c:276
-msgid "Login Host:"
-msgstr "Patrón de Conección"
-
-#: src/prefs.c:297
-msgid "No Proxy"
-msgstr "No Proxy"
-
-#: src/prefs.c:298
-msgid "HTTP Proxy"
-msgstr "Proxy HTTP"
-
-#: src/prefs.c:299
+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 "Socks 4 Proxy"
-msgstr "No Proxy"
-
-#: src/prefs.c:300
-#, fuzzy
-msgid "Socks 5 Proxy"
-msgstr "No Proxy"
-
-#: src/prefs.c:306
-msgid "Proxy Host:"
-msgstr "Patrón Proxy:"
-
-#: src/prefs.c:351 src/prefs.c:2021
-#, fuzzy
-msgid "Oscar Options"
-msgstr "Opciones"
-
-#: src/prefs.c:362
-msgid "No options currently (Isn't that sad)"
-msgstr ""
-
-#: src/prefs.c:380
-#, fuzzy
-msgid "Applet Options"
-msgstr "Opciones"
-
-#: src/prefs.c:391
-#, fuzzy
-msgid "Display Buddy List near applet"
-msgstr "Lista de amigos se demuestra cerca del applet"
-
-#: src/prefs.c:407
+msgid "X Use"
+msgstr "GAIM Usar"
+
+#: src/prefs.c:172
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Lista de Amigos"
 
-#: src/prefs.c:418
+#: src/prefs.c:184
 msgid "Show numbers in groups"
 msgstr "Demostrar los numeros en grupos"
 
-#: src/prefs.c:419
+#: src/prefs.c:185
 msgid "Hide groups with no online buddies"
 msgstr ""
 
-#: src/prefs.c:420
+#: src/prefs.c:186
 msgid "Show idle times"
 msgstr "Demostrar el tiempo de inactividad de los amigos"
 
-#: src/prefs.c:421
+#: src/prefs.c:187
 #, fuzzy
 msgid "Show buddy type icons"
 msgstr "Demostrar dibujos de los tipos de amigos"
 
-#: src/prefs.c:427
+#: src/prefs.c:193
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
-#: src/prefs.c:428
+#: src/prefs.c:194
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:434
+#: src/prefs.c:200
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "Guardar algunas configuraciones de tamaño/posicion de ventanas"
 
-#: src/prefs.c:436
+#: src/prefs.c:202
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "Automaticamente demuestre la lista de amigos"
 
-#: src/prefs.c:586
-msgid "Please sign on before editing the permit/deny lists."
-msgstr ""
-
-#: src/prefs.c:587
-msgid "Please sign on"
-msgstr ""
-
-#: src/prefs.c:607
-msgid "Permit/Deny List Options"
-msgstr ""
-
-#: src/prefs.c:622
-msgid ""
-"The permit/deny configuration will change between users,\n"
-"and changes while you are signed off will not be saved."
-msgstr ""
-
-#: src/prefs.c:635
+#: src/prefs.c:203
 #, fuzzy
-msgid "Allow Anyone"
-msgstr "Permitir a todos"
-
-#. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
-#. * and merging the two would be very difficult at best, most likely
-#. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:640
-msgid "Allow only users on Buddy List"
-msgstr ""
-
-#: src/prefs.c:642
-msgid "Allow only the users in \"Permit\""
-msgstr ""
-
-#: src/prefs.c:648
-msgid "Block all users"
-msgstr ""
-
-#: src/prefs.c:649
-msgid "Block the users in \"Deny\""
-msgstr ""
-
-#: src/prefs.c:694
+msgid "Display Buddy List near applet"
+msgstr "Lista de amigos se demuestra cerca del applet"
+
+#: src/prefs.c:219
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:705
+#: src/prefs.c:231
 msgid "Enter sends message"
 msgstr "Enter manda el mensaje"
 
-#: src/prefs.c:706
+#: src/prefs.c:232
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:707
+#: src/prefs.c:233
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:713
+#: src/prefs.c:239
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "Demostrar caritas gráficas (experimental)"
 
-#: src/prefs.c:714
+#: src/prefs.c:240
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "Demostrar la hora de los mensajes"
 
-#: src/prefs.c:715
+#: src/prefs.c:241
 #, fuzzy
 msgid "Ignore incoming colors"
 msgstr "Ignorar los colores de los amigos"
 
-#: src/prefs.c:716
+#: src/prefs.c:242
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:722
+#: src/prefs.c:248
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:723
+#: src/prefs.c:249
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "Quitar HTML de todas las conversaciones guardadas"
 
-#: src/prefs.c:729
+#: src/prefs.c:255
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Automagicamente destaque las faltas de ortografía"
 
-#: src/prefs.c:730
+#: src/prefs.c:256
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "Mandar direcciones como enlaze"
 
-#: src/prefs.c:731
+#: src/prefs.c:257
 msgid "Sending messages removes away status"
 msgstr "Mandando un mensaje quita el estado de ausente"
 
-#: src/prefs.c:772 src/prefs.c:857
+#: src/prefs.c:298 src/prefs.c:386
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:777 src/prefs.c:862
+#: src/prefs.c:303 src/prefs.c:391
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:782 src/prefs.c:867
+#: src/prefs.c:308 src/prefs.c:396
 #, fuzzy
 msgid "Text Only"
 msgstr "Color del texto"
 
-#: src/prefs.c:803
+#: src/prefs.c:331
 #, fuzzy
 msgid "IM Options"
 msgstr "Opciones"
 
-#: src/prefs.c:814
+#: src/prefs.c:343
 #, fuzzy
 msgid "Show logins in window"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:820 src/prefs.c:905
+#: src/prefs.c:349 src/prefs.c:435
 #, fuzzy
 msgid "Show buttons as "
 msgstr "Demostrar los dibujos en los botonoes"
 
-#: src/prefs.c:829 src/prefs.c:915
+#: src/prefs.c:358 src/prefs.c:445
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:830 src/prefs.c:916
+#: src/prefs.c:359 src/prefs.c:446
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Alzar ventanas cuando un mensaje sea recibido"
 
-#: src/prefs.c:831 src/prefs.c:1611
+#: src/prefs.c:360
 msgid "Ignore new conversations when away"
 msgstr "Ignorar nuevas conversaciones mientras este ausente"
 
-#: src/prefs.c:832
+#: src/prefs.c:361
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "Crear Mensaje"
 
-#: src/prefs.c:888 src/prefs.c:1090
+#: src/prefs.c:417 src/prefs.c:620
 #, fuzzy
 msgid "Chat Options"
 msgstr "Opciones"
 
-#: src/prefs.c:899
+#: src/prefs.c:429
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:947 src/prefs.c:949 src/prefs.c:1161 src/prefs.c:1163
+#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
 msgid "Gaim Chat"
 msgstr "Gaim Conversaciones"
 
-#: src/prefs.c:1107
+#: src/prefs.c:638
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/prefs.c:1135
+#: src/prefs.c:666
 msgid "List of available chats"
 msgstr "Lista de conversaciones disponibles"
 
-#: src/prefs.c:1149
+#: src/prefs.c:680
 msgid "List of subscribed chats"
 msgstr "Lista de conversaciones subscritas"
 
-#: src/prefs.c:1281 src/prefs.c:2082
+#: src/prefs.c:806 src/prefs.c:2084
 #, fuzzy
 msgid "Font Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1294
+#: src/prefs.c:820
 msgid "Underlined Text"
 msgstr "Texto Subrayado"
 
-#: src/prefs.c:1295
+#: src/prefs.c:821
 msgid "Strike Text"
 msgstr "Texto cruzado por una linea"
 
-#: src/prefs.c:1308 src/prefs.c:1325 src/prefs.c:1345
+#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
 #, fuzzy
 msgid "Select"
 msgstr "Seleccionar un Texto"
 
-#: src/prefs.c:1343
+#: src/prefs.c:869
 msgid "Font Face for Text"
 msgstr "Tipo de texto"
 
-#: src/prefs.c:1366
+#: src/prefs.c:892
 #, fuzzy
 msgid "Sound Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1378
-msgid "Sounds go through GNOME"
-msgstr "Sonidos pasan por GNOME"
-
-#: src/prefs.c:1380
+#: src/prefs.c:904
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:1381 src/prefs.c:1612
+#: src/prefs.c:905 src/prefs.c:1296
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1382
+#: src/prefs.c:906
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1397
+#: src/prefs.c:968
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Guardar Conversación"
+
+#: src/prefs.c:1002
+#, fuzzy
+msgid "Reset"
+msgstr "Registrar"
+
+#: src/prefs.c:1007
+#, fuzzy
+msgid "Choose"
+msgstr "Cerrar"
+
+#: src/prefs.c:1035
 #, fuzzy
 msgid "Sound Events"
 msgstr "Sonidos"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1047
 msgid "Sound when buddy logs in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:1409
+#: src/prefs.c:1048
 msgid "Sound when buddy logs out"
 msgstr "Sonido cuando un amigo se desconecte"
 
-#: src/prefs.c:1415
+#: src/prefs.c:1054
 msgid "Sound when message is received"
 msgstr "Sonido cuando un mensaje es recibido"
 
-#: src/prefs.c:1416
+#: src/prefs.c:1055
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "Sonido cuando un mensaje es recibido"
 
-#: src/prefs.c:1417
+#: src/prefs.c:1056
 msgid "Sound when message is sent"
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/prefs.c:1423
+#: src/prefs.c:1062
 #, fuzzy
-msgid "Sound in chat rooms when people enter/leave"
+msgid "Sound in chat rooms when people enter"
+msgstr "Sonidos en conversaciones cuando gente entra o sale"
+
+#: src/prefs.c:1063
+#, fuzzy
+msgid "Sound in chat rooms when people leave"
 msgstr "Sonidos en conversaciones cuando gente entra o sale"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1064
 #, fuzzy
-msgid "Sound in chat rooms when people talk"
+msgid "Sound in chat rooms when you talk"
 msgstr "Sonidos en conversaciones cuando getne habla"
 
-#: src/prefs.c:1509 src/prefs.c:2109
+#: src/prefs.c:1065
+#, fuzzy
+msgid "Sound in chat rooms when others talk"
+msgstr "Sonidos en conversaciones cuando getne habla"
+
+#: src/prefs.c:1197 src/prefs.c:2111
 #, fuzzy
 msgid "Away Messages"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/prefs.c:1525
+#: src/prefs.c:1209
 #, fuzzy
 msgid "Title"
 msgstr "Archivo"
 
-#: src/prefs.c:1529
+#: src/prefs.c:1213
 #, fuzzy
 msgid "Message"
 msgstr "Crear Mensaje"
 
-#: src/prefs.c:1569
+#: src/prefs.c:1253
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1573
+#: src/prefs.c:1257
 #, fuzzy
 msgid "Make Away"
 msgstr "Hacerme ausente ahora"
 
-#: src/prefs.c:1684
+#: src/prefs.c:1295
+#, fuzzy
+msgid "Ignore new conversations when away   "
+msgstr "Ignorar nuevas conversaciones mientras este ausente"
+
+#: src/prefs.c:1306
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1318
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1400
 #, fuzzy
 msgid "Browser Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1695
+#: src/prefs.c:1412
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:1696
+#: src/prefs.c:1413
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1698
+#: src/prefs.c:1415
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1700
-#, fuzzy
-msgid "Internal HTML Widget (Quite likely a bad idea!)"
-msgstr "Programa de HTML Interno (Probablemente una idea mala!)"
-
-#: src/prefs.c:1701
+#: src/prefs.c:1417
 msgid "Manual"
 msgstr "Manual"
 
-#: src/prefs.c:1710
+#: src/prefs.c:1426
 msgid "Pop up new window by default"
 msgstr "Crear una nueva ventana por omisión"
 
-#: src/prefs.c:1755
+#: src/prefs.c:1641
+#, fuzzy
+msgid "Privacy Options"
+msgstr "Opciones"
+
+#: src/prefs.c:1657
+msgid "Set privacy for:"
+msgstr ""
+
+#: src/prefs.c:1677
+msgid "Allow all users to contact me"
+msgstr ""
+
+#: src/prefs.c:1678
+msgid "Allow only the users below"
+msgstr ""
+
+#: src/prefs.c:1680
+msgid "Allow List"
+msgstr ""
+
+#: src/prefs.c:1712
+#, fuzzy
+msgid "Deny all users"
+msgstr "Negar algunos"
+
+#: src/prefs.c:1713
+msgid "Block the users below"
+msgstr ""
+
+#: src/prefs.c:1715
+#, fuzzy
+msgid "Block List"
+msgstr "Bloquear"
+
+#: src/prefs.c:1791
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
-#: src/prefs.c:1843
+#: src/prefs.c:1877
 msgid "GAIM debug output window"
 msgstr "GAIM ventana de respuestas del programa"
 
-#: src/prefs.c:1998
+#: src/prefs.c:2040
 msgid "General"
 msgstr "General"
 
-#: src/prefs.c:2011
-msgid "Connection"
-msgstr "Connección"
-
-#: src/prefs.c:2033
-msgid "Applet"
-msgstr "Applet"
-
-#. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:2051
-#, fuzzy
-msgid "Permit/Deny"
-msgstr "Permitir algunos"
-
-#: src/prefs.c:2062
+#: src/prefs.c:2064
 #, fuzzy
 msgid "Conversations"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:2067
+#: src/prefs.c:2069
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2072
+#: src/prefs.c:2074
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2077
+#: src/prefs.c:2079
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:2093
+#: src/prefs.c:2095
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/prefs.c:2098
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2120
+#: src/prefs.c:2122
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/rvous.c:108
+#: src/prefs.c:2133
+msgid "Privacy"
+msgstr ""
+
+#: src/rvous.c:148
 msgid "Gaim - Save As..."
 msgstr "Gaim - Guardar Como..."
 
-#: src/rvous.c:269
+#: src/rvous.c:317
 #, c-format
 msgid "Receiving %s from %s"
 msgstr "Recibiendo %s de %s"
 
-#: src/rvous.c:285 src/rvous.c:422
-msgid "Gaim - File Transfer"
-msgstr "Gaim - Transferencia de archivos"
-
-#: src/rvous.c:406
-#, c-format
-msgid "Sending %s to %s"
-msgstr "Mandando %s a %s"
-
-#: src/rvous.c:662
+#: src/rvous.c:693
+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:665
+#: 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:675
+#: src/rvous.c:733
 msgid "Gaim - File Transfer?"
 msgstr "¿Gaim - Transferir Archivos?"
 
+#: src/server.c:581
+msgid "Yes"
+msgstr ""
+
+#: src/server.c:582
+msgid "No"
+msgstr ""
+
+#: src/toc.c:253 src/toc.c:260
+#, fuzzy
+msgid "Connection Closed"
+msgstr "Connección"
+
+#: src/toc.c:295
+msgid "Waiting for reply..."
+msgstr ""
+
+#: src/toc.c:354
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr ""
+
+#: src/toc.c:355
+msgid "TOC Resume"
+msgstr ""
+
+#: src/toc.c:515
+#, fuzzy
+msgid "Password Change Successeful"
+msgstr "Gaim - Cambiar Contraseña"
+
+#: src/toc.c:518
+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
+msgid "TOC Pause"
+msgstr ""
+
+#: src/toc.c:977
+#, fuzzy
+msgid "Get Dir Info"
+msgstr "Información del Directorio"
+
+#~ msgid "You must give your password"
+#~ msgstr "Tiene que introduzir su contraseña"
+
+#~ msgid "%d/%d Buddies Online"
+#~ msgstr "%d/%d Amigos en línea"
+
+#~ msgid "Toggle Logging"
+#~ msgstr "Prender/Apagar Diario"
+
+#, fuzzy
+#~ msgid "%sChat"
+#~ msgstr "Hablar"
+
+#~ msgid "Message too long, some data truncated."
+#~ msgstr "Mensaje demasiado largo, algunas partes fueron cortadas."
+
+#~ msgid "Error Resolving Mail Server.\n"
+#~ msgstr "Error Resolviendo el Servidor de correo.\n"
+
+#~ msgid "Buddy To Pounce:"
+#~ msgstr "Amigo a calar:"
+
+#~ msgid "Message to send:"
+#~ msgstr "Mensaje a mandar:"
+
+#, fuzzy
+#~ msgid "Permit / Deny"
+#~ msgstr "Permitir algunos"
+
+#~ msgid "g001: Error resolving host\n"
+#~ msgstr "Error resolviendo patrón\n"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Buscando %s"
+
+#, fuzzy
+#~ msgid "Remember password"
+#~ msgstr "Acordarse de la Constraseña"
+
+#, fuzzy
+#~ msgid "TOC Options"
+#~ msgstr "Opciones"
+
+#~ msgid "TOC Host:"
+#~ msgstr "Patrón TOC: "
+
+#~ msgid "Port:"
+#~ msgstr "Puerto:"
+
+#~ msgid "Login Host:"
+#~ msgstr "Patrón de Conección"
+
+#~ msgid "No Proxy"
+#~ msgstr "No Proxy"
+
+#~ msgid "HTTP Proxy"
+#~ msgstr "Proxy HTTP"
+
+#, fuzzy
+#~ msgid "Socks 4 Proxy"
+#~ msgstr "No Proxy"
+
+#, fuzzy
+#~ msgid "Socks 5 Proxy"
+#~ msgstr "No Proxy"
+
+#~ msgid "Proxy Host:"
+#~ msgstr "Patrón Proxy:"
+
+#, fuzzy
+#~ msgid "Oscar Options"
+#~ msgstr "Opciones"
+
+#, fuzzy
+#~ msgid "Applet Options"
+#~ msgstr "Opciones"
+
+#, fuzzy
+#~ msgid "Allow Anyone"
+#~ msgstr "Permitir a todos"
+
+#~ msgid "Sounds go through GNOME"
+#~ msgstr "Sonidos pasan por GNOME"
+
+#, fuzzy
+#~ msgid "Internal HTML Widget (Quite likely a bad idea!)"
+#~ msgstr "Programa de HTML Interno (Probablemente una idea mala!)"
+
+#~ msgid "Connection"
+#~ msgstr "Connección"
+
+#~ msgid "Applet"
+#~ msgstr "Applet"
+
+#, fuzzy
+#~ msgid "Permit/Deny"
+#~ msgstr "Permitir algunos"
+
 #~ msgid "Permit some"
 #~ msgstr "Permitir algunos"
 
-#~ msgid "Deny some"
-#~ msgstr "Negar algunos"
-
 #~ msgid "Add buddy to permit/deny"
 #~ msgstr "Agregar amigo a autorizar/negar"
 
@@ -1867,9 +2073,6 @@
 #~ msgid "No Idle"
 #~ msgstr "No desocupado"
 
-#~ msgid "GAIM Use"
-#~ msgstr "GAIM Usar"
-
 #~ msgid "SOCKS v4 Proxy"
 #~ msgstr "Proxy SOCKS v4"
 
--- a/po/fr.po	Mon Dec 04 07:13:31 2000 +0000
+++ b/po/fr.po	Mon Dec 04 07:58:38 2000 +0000
@@ -2,209 +2,190 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/gnome_applet_mgr.c:254
+#: src/gnome_applet_mgr.c:256
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2000-10-09 11:11-0700\n"
+"POT-Creation-Date: 2000-12-03 23:24-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:73
+#: src/about.c:72
 #, c-format
 msgid "About GAIM v%s"
 msgstr "A propos de GAIM v%s"
 
-#: src/aim.c:168
-msgid "Please enter your logon"
-msgstr "Entrez votre login"
-
-#: src/aim.c:172
-msgid "You must give your password"
-msgstr "Vous devez indiquer votre mot de passe"
-
-#: src/aim.c:222 src/buddy.c:1873
+#: src/aim.c:133 src/buddy.c:2100
 msgid "Signoff"
 msgstr "Deconnection"
 
-#: src/aim.c:325 src/aim.c:570 src/buddy.c:319
+#: src/aim.c:147
+msgid "Please enter your logon"
+msgstr "Entrez votre login"
+
+#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#, fuzzy
+msgid "Signon Error"
+msgstr "Connection"
+
+#: src/aim.c:152
+#, fuzzy
+msgid "Please enter your password"
+msgstr "Entrez votre login"
+
+#: src/aim.c:254 src/multi.c:608
 msgid "Signon"
 msgstr "Connection"
 
-#: src/aim.c:326 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:428
-#: src/dialogs.c:747 src/dialogs.c:822 src/dialogs.c:979 src/dialogs.c:1056
-#: src/dialogs.c:1173 src/dialogs.c:1305 src/dialogs.c:1492 src/dialogs.c:1597
-#: src/dialogs.c:1678 src/dialogs.c:1923 src/dialogs.c:2111 src/dialogs.c:2277
-#: src/dialogs.c:2372 src/dialogs.c:3098 src/dialogs.c:3360 src/oscar.c:655
-#: src/rvous.c:279 src/rvous.c:416 src/rvous.c:638
+#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+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:327 src/buddy.c:1870
+#: src/aim.c:259
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: src/aim.c:328
+#: src/aim.c:260
 msgid "Options"
 msgstr "Options"
 
-#: src/aim.c:330 src/aim.c:576 src/buddy.c:1936
+#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:404
+#. Labels for selectors and text boxes
+#: src/aim.c:338
 msgid "Screen Name: "
 msgstr "Pseudonyme: "
 
-#: src/aim.c:407
+#: src/aim.c:341
 msgid "Password: "
 msgstr "Mot de Passe: "
 
-#: src/aim.c:410
-msgid "Remember Password"
-msgstr "Mémoriser le mot de passe"
-
-#: src/aim.c:457
+#: src/aim.c:380
 msgid "Gaim - Login"
 msgstr "Gaim - Connection"
 
-#: src/aim.c:565 src/buddy.c:1933
+#: src/aim.c:599 src/buddy.c:2163
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/away.c:88 src/away.c:203
+#: src/away.c:110 src/away.c:227
 msgid "Back"
 msgstr "De retour"
 
-#: src/away.c:99
+#: src/away.c:121
 msgid "I'm Back!"
 msgstr "Je suis de Retour!!"
 
-#: src/away.c:141
+#: src/away.c:160
 msgid "Gaim - Away!"
 msgstr "Gaim - Absent!"
 
-#: src/away.c:242 src/gnome_applet_mgr.c:198
+#: src/away.c:266 src/gnome_applet_mgr.c:200
 msgid "New Away Message"
 msgstr "Nouveau Message d'absence"
 
-#: src/away.c:260
+#: src/away.c:284
 msgid "Remove Away Message"
 msgstr "Enlever le message d'absence"
 
-#: src/buddy.c:161
-#, c-format
-msgid "%d/%d Buddies Online"
-msgstr "%d/%d potes en ligne"
-
 #. Put the buttons in the box
-#: src/buddy.c:260 src/buddy.c:2005 src/buddy_chat.c:816
-#: src/conversation.c:440 src/conversation.c:1658 src/dialogs.c:977
-#: src/dialogs.c:1055 src/dialogs.c:1922 src/dialogs.c:1944 src/dialogs.c:3358
-#: src/prefs.c:667 src/prefs.c:1108 src/prefs.c:1565
+#: 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
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/buddy.c:261 src/buddy.c:2006 src/dialogs.c:987 src/dialogs.c:1071
+#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
 msgid "Group"
 msgstr "Groupe"
 
-#: src/buddy.c:262 src/buddy.c:2007 src/buddy_chat.c:818
-#: src/conversation.c:1656 src/dialogs.c:885 src/prefs.c:671 src/prefs.c:1109
-#: src/prefs.c:1577
+#: 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
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/buddy.c:265 src/buddy.c:1777
+#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
 msgid "Chat"
 msgstr "Forum"
 
-#: src/buddy.c:266 src/buddy.c:406 src/buddy.c:1775 src/buddy_chat.c:543
+#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:267 src/buddy.c:412 src/buddy.c:1776 src/buddy_chat.c:545
-#: src/buddy_chat.c:824 src/conversation.c:1652 src/rvous.c:636
+#: 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
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:418 src/dialogs.c:3372
+#. Put the buttons in the box
+#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
 msgid "Alias"
 msgstr ""
 
 #: src/buddy.c:425
-msgid "Dir Info"
-msgstr "Info Personnelle"
-
-#: src/buddy.c:432
-#, fuzzy
-msgid "Direct IM"
-msgstr "Information Personnelle"
-
-#: src/buddy.c:438
-msgid "Away Msg"
-msgstr "Message d'absence"
-
-#: src/buddy.c:445
-msgid "Toggle Logging"
-msgstr "Activer le Traçage"
-
-#: src/buddy.c:451
 msgid "Add Buddy Pounce"
 msgstr "Ajouter une Alerte"
 
-#: src/buddy.c:1270
+#: src/buddy.c:1368
 msgid "New Buddy Pounce"
 msgstr "Nouvelle Alerte"
 
-#: src/buddy.c:1288
+#: src/buddy.c:1386
 msgid "Remove Buddy Pounce"
 msgstr "Enlever une Alerte"
 
-#: src/buddy.c:1376
-#, fuzzy, c-format
-msgid "%sBuddy Icon"
+#: src/buddy.c:1675
+#, fuzzy
+msgid "Buddy Icon"
 msgstr "Alerte"
 
-#: src/buddy.c:1379
-#, c-format
-msgid "%sVoice"
+#: src/buddy.c:1678
+msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1382
-#, c-format
-msgid "%sIM Image"
+#: src/buddy.c:1681
+msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1385
-#, fuzzy, c-format
-msgid "%sChat"
-msgstr "Forum"
-
-#: src/buddy.c:1388
-#, c-format
-msgid "%sGet File"
-msgstr ""
-
-#: src/buddy.c:1391
-#, c-format
-msgid "%sSend File"
-msgstr ""
-
-#: src/buddy.c:1446
+#: src/buddy.c:1687
+#, fuzzy
+msgid "Get File"
+msgstr "Fichier"
+
+#: src/buddy.c:1690
+#, fuzzy
+msgid "Send File"
+msgstr "Fichier"
+
+#: src/buddy.c:1749
 msgid "Warnings: %d%%\n"
 msgstr "Attention: %d%%\n"
 
-#: src/buddy.c:1452
+#: src/buddy.c:1754
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1456
+#: src/buddy.c:1758
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -216,506 +197,494 @@
 "Connecté depuis: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1456
+#: src/buddy.c:1761
 msgid "Idle: "
 msgstr "Inactif: "
 
-#: src/buddy.c:1501
+#: src/buddy.c:1828
 #, 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:1644
+#: src/buddy.c:1878
 #, 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:1802
+#: src/buddy.c:2028
 msgid "Information on selected Buddy"
 msgstr "Information sur le pote sélectionné"
 
-#: src/buddy.c:1803 src/dialogs.c:738
+#: src/buddy.c:2029 src/dialogs.c:657
 msgid "Send Instant Message"
 msgstr "Envoyer un message"
 
-#: src/buddy.c:1804
+#: src/buddy.c:2030
 msgid "Start/join a Buddy Chat"
 msgstr "Ouvrir/Rallier un Forum"
 
-#: src/buddy.c:1857
+#: src/buddy.c:2088
 msgid "File"
 msgstr "Fichier"
 
-#: src/buddy.c:1861 src/buddy.c:1862
+#: src/buddy.c:2092 src/buddy.c:2093
 msgid "Add A Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/buddy.c:1863
+#: src/buddy.c:2094
 #, fuzzy
 msgid "Join A Chat"
 msgstr "Rallier le forum"
 
-#: src/buddy.c:1865
+#: src/buddy.c:2095
+#, fuzzy
+msgid "New Instant Message"
+msgstr "Envoyer un message"
+
+#: src/buddy.c:2097
 msgid "Import Buddy List"
 msgstr "Importer une Liste de Potes"
 
-#: src/buddy.c:1866
+#: src/buddy.c:2098
 msgid "Export Buddy List"
 msgstr "Exporter une Liste de Potes"
 
-#: src/buddy.c:1876
+#: src/buddy.c:2103
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/buddy.c:1878 src/buddy_chat.c:537 src/buddy_chat.c:791
-#: src/buddy_chat.c:812 src/conversation.c:1654 src/dialogs.c:505
-#: src/plugins.c:317 src/prefs.c:1810
+#: 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:1883
+#: src/buddy.c:2110
 msgid "Tools"
 msgstr "Outils"
 
-#: src/buddy.c:1888 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
 msgid "Away"
 msgstr "Absent"
 
-#: src/buddy.c:1893
+#: src/buddy.c:2120
 msgid "Buddy Pounce"
 msgstr "Alerte"
 
-#: src/buddy.c:1901 src/dialogs.c:2105 src/dialogs.c:2262
+#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
 msgid "Search for Buddy"
 msgstr "Rechercher un Pote"
 
-#: src/buddy.c:1904
+#: src/buddy.c:2131
 msgid "by Email"
 msgstr "Par son Email"
 
-#: src/buddy.c:1908
+#: src/buddy.c:2135
 msgid "by Dir Info"
 msgstr "Par ses Informations Personnelles"
 
-#: src/buddy.c:1915 src/buddy.c:1916
+#: src/buddy.c:2142 src/buddy.c:2143
 msgid "Settings"
 msgstr "Préférences"
 
-#: src/buddy.c:1919
+#: src/buddy.c:2146
 msgid "User Info"
 msgstr "Message d'Information"
 
-#: src/buddy.c:1923 src/dialogs.c:1299
+#: src/buddy.c:2150 src/dialogs.c:1353
 msgid "Directory Info"
 msgstr "Information Personnelle"
 
-#: src/buddy.c:1927 src/dialogs.c:1486
+#: src/buddy.c:2154 src/dialogs.c:1592
 msgid "Change Password"
 msgstr "Changer de Mot de Passe"
 
-#: src/buddy.c:1941
+#: src/buddy.c:2171
 #, fuzzy
 msgid "Perl"
 msgstr "Autoriser"
 
-#: src/buddy.c:1944
+#: src/buddy.c:2174
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1948
+#: src/buddy.c:2178
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1952
+#: src/buddy.c:2182
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1960
+#: src/buddy.c:2190
 msgid "Help"
 msgstr "Aide"
 
-#: src/buddy.c:1965
+#: src/buddy.c:2195
 #, fuzzy
 msgid "About Gaim"
 msgstr "A propos..."
 
-#: src/buddy.c:1984 src/prefs.c:2045
+#: src/buddy.c:2214 src/prefs.c:2053
 msgid "Buddy List"
 msgstr "Liste de Potes"
 
-#: src/buddy.c:2036
+#: src/buddy.c:2266
 msgid "Add a new Buddy"
 msgstr "Ajouter un Nouveau Pote"
 
-#: src/buddy.c:2037
+#: src/buddy.c:2267
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Ajouter un Nouveau Pote"
 
-#: src/buddy.c:2038
+#: src/buddy.c:2268
 msgid "Remove selected Buddy"
 msgstr "Supprimer le Pote sélectionné"
 
-#: src/buddy.c:2063
+#: src/buddy.c:2293
 msgid "Online"
 msgstr "En Ligne"
 
-#: src/buddy.c:2065
+#: src/buddy.c:2295
 msgid "Edit Buddies"
 msgstr "Editer ses amis"
 
-#: src/buddy.c:2102
+#: src/buddy.c:2332
 msgid "Gaim - Buddy List"
 msgstr "GAIM - Liste des Potes"
 
-#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
-msgid "Buddy Chat"
-msgstr "Forum"
-
-#: src/buddy_chat.c:123
-msgid "Join"
-msgstr "Joindre"
-
-#: src/buddy_chat.c:129
-msgid "Join what group:"
-msgstr "Joindre le groupe: "
-
 #: src/buddy_chat.c:135
+msgid "Join Chat"
+msgstr "Rallier le forum"
+
+#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
+msgid "Buddy Chat"
+msgstr "Forum"
+
+#: src/buddy_chat.c:151
+msgid "Join what group:"
+msgstr "Joindre le groupe: "
+
+#: src/buddy_chat.c:167
+#, fuzzy
+msgid "Join Chat As:"
+msgstr "Rallier le forum"
+
+#: src/buddy_chat.c:181
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:143
+#: src/buddy_chat.c:189
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:172
-msgid "Join Chat"
-msgstr "Rallier le forum"
-
-#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
+#: src/buddy_chat.c:197
+msgid "Join"
+msgstr "Joindre"
+
+#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/buddy_chat.c:234
+#: src/buddy_chat.c:261
 msgid "Invite who?"
 msgstr "Inviter qui ?"
 
-#: src/buddy_chat.c:238
+#: src/buddy_chat.c:265
 msgid "With message:"
 msgstr "En utilisant le message:"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:292
 msgid "Invite to Buddy Chat"
 msgstr "Inviter à un Forum"
 
-#: src/buddy_chat.c:424
+#: src/buddy_chat.c:420
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:452
+#: src/buddy_chat.c:459
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:540 src/buddy_chat.c:789
+#: src/buddy_chat.c:559 src/buddy_chat.c:816
 msgid "Whisper"
 msgstr "Murmurer"
 
-#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
-#: src/conversation.c:1651 src/dialogs.c:1679
+#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
+#: src/conversation.c:1733
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/buddy_chat.c:544
+#: src/buddy_chat.c:563
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: src/buddy_chat.c:820 src/conversation.c:1659
+#: src/buddy_chat.c:849 src/conversation.c:1741
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/buddy_chat.c:822 src/conversation.c:1653 src/dialogs.c:424
-#: src/dialogs.c:426 src/rvous.c:637
+#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
+#: src/dialogs.c:345 src/rvous.c:695
 msgid "Warn"
 msgstr "Donner un Avertissement"
 
-#: src/conversation.c:171
-#, fuzzy, c-format
-msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
-msgstr "<HR><B>%s s'est connecté%s%s.</B><BR><HR>"
-
-#: src/conversation.c:178
-#, fuzzy, c-format
-msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
-msgstr "<HR><B>%s s'est connecté%s%s.</B><BR><HR>"
-
-#: src/conversation.c:435
+#: src/conversation.c:426
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Suppression de '%s' de la Liste\n"
 
-#: src/conversation.c:688
-msgid "Message too long, some data truncated."
-msgstr "Message trop long, données tronquées"
-
-#: src/conversation.c:688 src/dialogs.c:2825 src/dialogs.c:2895
-#: src/rvous.c:221 src/rvous.c:492
-msgid "Error"
-msgstr "Erreur"
-
-#: src/conversation.c:875
+#: src/conversation.c:902
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Actuellement à %d\n"
 
-#: src/conversation.c:884
+#: src/conversation.c:911
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Positionné à %d\n"
 
-#: src/conversation.c:1489
+#: src/conversation.c:1497
 msgid "Bold"
 msgstr "Gras"
 
-#: src/conversation.c:1489 src/prefs.c:1292
+#: src/conversation.c:1497 src/prefs.c:818
 msgid "Bold Text"
 msgstr "Texte en Gras"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1501 src/conversation.c:1502
 msgid "Italics"
 msgstr "Italique"
 
-#: src/conversation.c:1493 src/prefs.c:1293
+#: src/conversation.c:1501 src/prefs.c:819
 msgid "Italics Text"
 msgstr "Texte en Italique"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1505 src/conversation.c:1506
 msgid "Underline"
 msgstr "Souligné"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1505
 msgid "Underline Text"
 msgstr "Texte Souligné"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1509 src/conversation.c:1510
 msgid "Strike"
 msgstr "Barré"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1509
 msgid "Strike through Text"
 msgstr "Texte Barré"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Small"
 msgstr "Petit"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Decrease font size"
 msgstr "Fonte plus Petite"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal font size"
 msgstr "Fonte Normale"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Big"
 msgstr "Grand"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Increase font size"
 msgstr "Fonte plus Grande"
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1526 src/conversation.c:1527
 msgid "Font"
 msgstr "Fonte"
 
-#: src/conversation.c:1518 src/dialogs.c:2724 src/dialogs.c:2740
+#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
 msgid "Select Font"
 msgstr "Sectionner une fonte"
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
+#: src/conversation.c:1535
 msgid "Color"
 msgstr "Couleur"
 
-#: src/conversation.c:1522 src/prefs.c:1306
+#: src/conversation.c:1530 src/prefs.c:832
 msgid "Text Color"
 msgstr "Couleur de texte"
 
-#: src/conversation.c:1526 src/prefs.c:1323
+#: src/conversation.c:1534 src/prefs.c:849
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1541 src/conversation.c:1542
 msgid "Link"
 msgstr "Lien"
 
-#: src/conversation.c:1533 src/dialogs.c:2366
+#: src/conversation.c:1541 src/dialogs.c:2391
 msgid "Insert Link"
 msgstr "Insérer un Lien"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 #, fuzzy
 msgid "Smiley"
 msgstr "Fichier"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1552 src/conversation.c:1553
 msgid "Logging"
 msgstr "Connection"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1552
 msgid "Enable logging"
 msgstr "Activer la Connection"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1556 src/conversation.c:1557
 msgid "Sound"
 msgstr "Son"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1556
 msgid "Enable sounds"
 msgstr "Activer le son"
 
-#: src/dialogs.c:225
-msgid "Error Resolving Mail Server.\n"
-msgstr "Erreur à la résolution du serveur de mail\n"
-
-#: src/dialogs.c:231
-msgid "Error Connecting to Socket.\n"
-msgstr "Erreur à la connection socket\n"
-
-#: src/dialogs.c:441
+#: src/conversation.c:1768
+#, fuzzy
+msgid "Send message as: "
+msgstr "Son à l'envoi d'un message"
+
+#: src/dialogs.c:360
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Voulez-vous réellement donner un avertissement à %s?"
 
-#: src/dialogs.c:445
+#: src/dialogs.c:364
 msgid "Warn anonymously?"
 msgstr "Donner un avertissement anonyme?"
 
-#: src/dialogs.c:448
+#: src/dialogs.c:367
 msgid "Anonymous warnings are less harsh."
 msgstr "Les avertissements anonymes sont moins durs."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:393
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Donner un Avertissement?"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:458
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossible d'ecrire dans le fichier %s."
 
-#: src/dialogs.c:544
+#: src/dialogs.c:461
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossible de lire le fichier %s."
 
-#: src/dialogs.c:547
+#: src/dialogs.c:464
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message trop long, perte des %d derniers octets."
 
-#: src/dialogs.c:550
+#: src/dialogs.c:467
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s n'est pas en ligne."
 
-#: src/dialogs.c:553
+#: src/dialogs.c:470
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Les Avertissements à %s ne sont pas permis."
 
-#: src/dialogs.c:556
+#: src/dialogs.c:473
 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:559
+#: src/dialogs.c:476
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Le forum %s est inaccessible."
 
-#: src/dialogs.c:562
+#: src/dialogs.c:479
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Vous envoyez vos messages trop vite à %s."
 
-#: src/dialogs.c:565
+#: src/dialogs.c:482
 #, 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:568
+#: src/dialogs.c:485
 #, 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:571
+#: src/dialogs.c:488
 msgid "Failure."
 msgstr "Echec"
 
-#: src/dialogs.c:574
+#: src/dialogs.c:491
 msgid "Too many matches."
 msgstr "Trop de réponses"
 
-#: src/dialogs.c:577
+#: src/dialogs.c:494
 msgid "Need more qualifiers."
 msgstr "Besoin de plus de critères."
 
-#: src/dialogs.c:580
+#: src/dialogs.c:497
 msgid "Dir service temporarily unavailable."
 msgstr "Le repertoire est temporairement indisponible."
 
-#: src/dialogs.c:583
+#: src/dialogs.c:500
 msgid "Email lookup restricted."
 msgstr "La recherche par Email est restreinte."
 
-#: src/dialogs.c:586
+#: src/dialogs.c:503
 msgid "Keyword ignored."
 msgstr "Mot clé ignoré."
 
-#: src/dialogs.c:589
+#: src/dialogs.c:506
 msgid "No keywords."
 msgstr "Pas de mot-clé."
 
-#: src/dialogs.c:592
+#: src/dialogs.c:509
 msgid "User has no directory information."
 msgstr "L'utilisateur n'a pas d'information personnelle."
 
-#: src/dialogs.c:596
+#: src/dialogs.c:513
 msgid "Country not supported."
 msgstr "Pays non supporté."
 
-#: src/dialogs.c:599
+#: src/dialogs.c:516
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Echec inconnu: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:602 src/oscar.c:318
+#: src/dialogs.c:519 src/oscar.c:471
 msgid "Incorrect nickname or password."
 msgstr "Pseudonye ou Mot de Passe incorrect."
 
-#: src/dialogs.c:605
+#: src/dialogs.c:522
 msgid "The service is temporarily unavailable."
 msgstr "Le service est termporairement indisponible."
 
-#: src/dialogs.c:608
+#: src/dialogs.c:525
 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:611
+#: src/dialogs.c:528
 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."
@@ -724,287 +693,332 @@
 "etRéessayez. Si vous continuez d'essayer, il vous faudra attendre encore "
 "plus longtemps."
 
-#: src/dialogs.c:614
+#: src/dialogs.c:531
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Une erreur inconnue est survenue à la connection: %s."
 
-#: src/dialogs.c:617
+#: src/dialogs.c:534
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Une erreur inconnue, %d, s'est produite. Info:%s"
 
-#: src/dialogs.c:620
+#: src/dialogs.c:537
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - Erreur %d"
 
 #. Build OK Button
-#: src/dialogs.c:677 src/dialogs.c:742 src/dialogs.c:817 src/dialogs.c:1168
-#: src/dialogs.c:1491 src/dialogs.c:1777 src/dialogs.c:2110 src/dialogs.c:2272
-#: src/dialogs.c:2371
+#: 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
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:671
 #, fuzzy
 msgid "IM who:"
 msgstr "Envoyer un message à qui: "
 
-#: src/dialogs.c:776
+#: src/dialogs.c:695
 msgid "Gaim - IM user"
 msgstr "Gaim - IM Utilisateur"
 
-#: src/dialogs.c:813
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "Message d'Information"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:746
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:851
+#: src/dialogs.c:770
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Message d'information"
 
-#: src/dialogs.c:933
+#: src/dialogs.c:845
 msgid "Buddies"
 msgstr "Potes"
 
-#: src/dialogs.c:985
+#: src/dialogs.c:898
 #, fuzzy
 msgid "Add Group"
 msgstr "Groupe"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:928
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "GAIM - Ajouter un Pote"
 
-#: src/dialogs.c:1062
-msgid "Add Buddy"
-msgstr "Ajouter un Pote"
-
-#: src/dialogs.c:1064 src/dialogs.c:3368
-msgid "Buddy"
-msgstr "Pote"
-
-#: src/dialogs.c:1103
+#: src/dialogs.c:957
 msgid "Gaim - Add Buddy"
 msgstr "GAIM - Ajouter un Pote"
 
-#. Put the buttons in the box
-#: src/dialogs.c:1179
-msgid "Buddy To Pounce:"
-msgstr "Pote à attendre:"
-
-#: src/dialogs.c:1184
-msgid "Open IM Window on Buddy Logon"
+#: src/dialogs.c:967
+msgid "Add Buddy"
+msgstr "Ajouter un Pote"
+
+#: src/dialogs.c:979 src/dialogs.c:3443
+msgid "Buddy"
+msgstr "Pote"
+
+#: src/dialogs.c:1109
+#, fuzzy
+msgid "Pounce buddy as:"
+msgstr "Son quand vos potes se connectent"
+
+#: src/dialogs.c:1181
+#, fuzzy
+msgid "Buddy:"
+msgstr "Pote"
+
+#: 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:1187
-msgid "Send IM on Buddy Logon"
+#: src/dialogs.c:1234
+#, fuzzy
+msgid "Send IM on pounce"
 msgstr "Envoyer un message à la connection"
 
-#: src/dialogs.c:1195
-msgid "Message to send:"
-msgstr "Message à envoyer"
-
-#: src/dialogs.c:1216
+#: src/dialogs.c:1263
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nouvelle Alerte"
 
 #. Build Save Button
-#: src/dialogs.c:1303 src/dialogs.c:1596 src/dialogs.c:3093
+#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/dialogs.c:1321
+#: src/dialogs.c:1376
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Autoriser les recherches sur le web à trouver vos informations"
 
 #. Line 1
-#: src/dialogs.c:1324 src/dialogs.c:2128
+#: src/dialogs.c:1379 src/dialogs.c:2159
 msgid "First Name"
 msgstr "Prénom"
 
 #. Line 2
-#: src/dialogs.c:1335 src/dialogs.c:2140
+#: src/dialogs.c:1390 src/dialogs.c:2171
 msgid "Middle Name"
 msgstr "Surnom"
 
 #. Line 3
-#: src/dialogs.c:1347 src/dialogs.c:2152
+#: src/dialogs.c:1402 src/dialogs.c:2183
 msgid "Last Name"
 msgstr "Nom"
 
 #. Line 4
-#: src/dialogs.c:1358 src/dialogs.c:2164
+#: src/dialogs.c:1413 src/dialogs.c:2195
 msgid "Maiden Name"
 msgstr "Nom de jeune-fille"
 
 #. Line 5
-#: src/dialogs.c:1369 src/dialogs.c:2176
+#: src/dialogs.c:1424 src/dialogs.c:2207
 msgid "City"
 msgstr "Ville"
 
 #. Line 6
-#: src/dialogs.c:1380 src/dialogs.c:2187
+#: src/dialogs.c:1435 src/dialogs.c:2218
 msgid "State"
 msgstr "Etat"
 
 #. Line 7
-#: src/dialogs.c:1391 src/dialogs.c:2198
+#: src/dialogs.c:1446 src/dialogs.c:2229
 msgid "Country"
 msgstr "Pays"
 
-#: src/dialogs.c:1436
+#: src/dialogs.c:1490
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Donner vos informations personnelles"
 
-#: src/dialogs.c:1453
+#: src/dialogs.c:1507
 msgid "New Passwords Do Not Match"
 msgstr "Les nouveaux password diffèrent"
 
-#: src/dialogs.c:1453 src/dialogs.c:1458
+#: src/dialogs.c:1507 src/dialogs.c:1512
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Erreur au changement de Mot de Passe"
 
-#: src/dialogs.c:1458
+#: src/dialogs.c:1512
 msgid "Fill out all fields completely"
 msgstr "Remplissez tous les champs"
 
-#: src/dialogs.c:1500
+#: src/dialogs.c:1541
+#, fuzzy
+msgid "Change password for:"
+msgstr "Changer de Mot de Passe"
+
+#: src/dialogs.c:1580 src/toc.c:515
+msgid "Gaim - Password Change"
+msgstr "Gaim - Changement de mot de passe"
+
+#: src/dialogs.c:1612
 msgid "Original Password"
 msgstr "Mot de Passe courrant"
 
-#: src/dialogs.c:1516
+#: src/dialogs.c:1626
 msgid "New Password"
 msgstr "Nouveau Mot de Passe"
 
-#: src/dialogs.c:1530
+#: src/dialogs.c:1640
 msgid "New Password (again)"
 msgstr "Nouveau Mot de passe (confirmation)"
 
-#: src/dialogs.c:1567
-msgid "Gaim - Password Change"
-msgstr "Gaim - Changement de mot de passe"
-
-#: src/dialogs.c:1630
+#: src/dialogs.c:1693
+msgid "Set info for:"
+msgstr ""
+
+#: src/dialogs.c:1776
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Message d'information"
 
-#: src/dialogs.c:1786
+#: src/dialogs.c:1817
 msgid "Below are the results of your search: "
 msgstr "Résultats de votre recherche: "
 
-#: src/dialogs.c:1918
-#, fuzzy
-msgid "Permit / Deny"
-msgstr "Autoriser certains"
-
-#: src/dialogs.c:1929 src/prefs.c:471
+#: src/dialogs.c:1943 src/dialogs.c:1950
+msgid "Permit"
+msgstr "Autoriser"
+
+#: src/dialogs.c:1945 src/dialogs.c:1952
 msgid "Deny"
 msgstr "Interdire"
 
-#: src/dialogs.c:1934 src/prefs.c:455 src/prefs.c:512
-msgid "Permit"
-msgstr "Autoriser"
-
-#: src/dialogs.c:1975
-msgid "Gaim - Add Permit/Deny"
+#: src/dialogs.c:1993
+#, fuzzy
+msgid "Gaim - Add Permit"
 msgstr "Gaim - Ajouter des autorisation/Permission"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:1995
+#, fuzzy
+msgid "Gaim - Add Deny"
+msgstr "Gaim - Ajouter des autorisation/Permission"
+
+#: src/dialogs.c:2057
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/dialogs.c:2235
+#: src/dialogs.c:2266
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - trouver un pote d'après ses Infos."
 
-#: src/dialogs.c:2282
+#: src/dialogs.c:2315
 msgid "Email"
 msgstr "Email"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2328
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Trouver un ami d'après son Email"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2410
 msgid "URL"
 msgstr "Site Web"
 
-#: src/dialogs.c:2393
+#: src/dialogs.c:2418
 msgid "Description"
 msgstr "Description"
 
-#: src/dialogs.c:2419
+#: src/dialogs.c:2444
 msgid "GAIM - Add URL"
 msgstr "Gaim - Ajouter un site Web"
 
-#: src/dialogs.c:2562 src/dialogs.c:2575 src/dialogs.c:2612
+#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
 msgid "Select Text Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2599
+#: src/dialogs.c:2624
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2824 src/rvous.c:220
+#: src/dialogs.c:2847 src/rvous.c:265
 #, c-format
 msgid "Error writing file %s"
 msgstr "Erreur à l'écriture du fichier %s"
 
-#: src/dialogs.c:2841
+#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
+#: src/rvous.c:548
+msgid "Error"
+msgstr "Erreur"
+
+#: src/dialogs.c:2901
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Exporter la liste de Potes"
 
-#: src/dialogs.c:2894 src/rvous.c:491
+#: src/dialogs.c:2967 src/rvous.c:547
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erreur à la lecture du fichier %s"
 
-#: src/dialogs.c:2973
+#: src/dialogs.c:3045
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importer la liste de Potes"
 
-#: src/dialogs.c:3054
+#: src/dialogs.c:3124
 msgid "Gaim - New away message"
 msgstr "Gaim - Nouveau message d'absence"
 
-#. Set up our frame
-#: src/dialogs.c:3061
+#. Put frame and button-box in the toplevel
+#: src/dialogs.c:3136
 #, fuzzy
 msgid "New away message"
 msgstr "Nouveau Message d'absence"
 
-#. Make a label for away entry
-#: src/dialogs.c:3071
+#: src/dialogs.c:3149
 msgid "Away title: "
 msgstr "Intitulé: "
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3121
+#: src/dialogs.c:3193
 #, fuzzy
 msgid "Make Away Now"
 msgstr "Etre absent maintenant"
 
 #. show everything
-#: src/dialogs.c:3299
+#: src/dialogs.c:3370
 #, fuzzy
 msgid "Smile!"
 msgstr "Fichier"
 
-#: src/dialogs.c:3366
+#: src/dialogs.c:3441
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/dialogs.c:3404
+#: src/dialogs.c:3478
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "GAIM - Ajouter un Pote"
@@ -1014,19 +1028,19 @@
 msgid "file not found: %s\n"
 msgstr "Fichier non trouvé: %s\n"
 
-#: src/gnome_applet_mgr.c:122
+#: 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:129
+#: src/gnome_applet_mgr.c:128
 msgid "Attempting to sign on...."
 msgstr "Tentative de connection"
 
-#: src/gnome_applet_mgr.c:252
+#: src/gnome_applet_mgr.c:254
 msgid "GAIM"
 msgstr "GAIM"
 
-#: src/gnome_applet_mgr.c:364
+#: src/gnome_applet_mgr.c:366
 msgid "Can't create GAIM applet!"
 msgstr "Impossible de créer l'applet GAIM"
 
@@ -1034,117 +1048,180 @@
 msgid "Offline"
 msgstr "Hors Ligne"
 
-#: src/gnome_applet_mgr.c:408
+#: src/gnome_applet_mgr.c:411
 msgid "Font does not exist"
 msgstr "Cette fonte n'existe pas."
 
-#: src/gnome_applet_mgr.c:424
+#: src/gnome_applet_mgr.c:427
 msgid "About..."
 msgstr "A Propos..."
 
-#: src/gtkhtml.c:1385
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "Lien HTML:"
 
-#: src/gtkhtml.c:1798
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "Ouvrir l'URL dans une fenêtre existante"
 
-#: src/gtkhtml.c:1807
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "Ouvrir l'URL dans une nouvelle fenêtre"
 
-#: src/gtkhtml.c:1815
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "Ajouter l'URL aux favoris/bookmarks"
 
-#: src/html.c:120
-msgid "g001: Error resolving host\n"
-msgstr "g001: Erreur à la résolution de l'adresse\n"
-
-#: src/html.c:122
+#: src/html.c:122 src/html.c:125
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erreur à l'ouvcerture de connection.\n"
 
-#: src/html.c:154
+#: src/html.c:158
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "Obtention de %d octets de %s"
 
-#: src/html.c:167
+#: src/html.c:171
 msgid "Getting Data"
 msgstr "Recuperation de donnée"
 
-#: src/html.c:200
+#: src/html.c:204
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "Reçu: '%s'\n"
 
-#: src/oscar.c:157 src/oscar.c:184
+#: src/multi.c:367 src/prefs.c:112
+#, fuzzy
+msgid "General Options"
+msgstr "Options"
+
+#: src/multi.c:402
+#, fuzzy
+msgid "Screenname:"
+msgstr "Pseudonyme: "
+
+#: src/multi.c:414
+#, fuzzy
+msgid "Password:"
+msgstr "Mot de Passe: "
+
+#: src/multi.c:429
+msgid "Remember Password"
+msgstr "Mémoriser le mot de passe"
+
+#: src/multi.c:430
+#, fuzzy
+msgid "Auto-Login"
+msgstr "Connection automatique"
+
+#: src/multi.c:431
+msgid "Send KeepAlive packet (6 bytes/second)"
+msgstr ""
+
+#: src/multi.c:473
+#, fuzzy
+msgid "Gaim - Modify Account"
+msgstr "Gaim - Connection"
+
+#: src/multi.c:482
+msgid "Modify Account"
+msgstr ""
+
+#: src/multi.c:576
+#, fuzzy
+msgid "Enter Password"
+msgstr "Nouveau Mot de Passe"
+
+#: src/multi.c:669
+#, fuzzy
+msgid "Gaim - Account Editor"
+msgstr "Gaim - Liste des Plugins"
+
+#: src/multi.c:678
+msgid "Account Editor"
+msgstr ""
+
+#: src/multi.c:697
+msgid "Modify"
+msgstr ""
+
+#: src/multi.c:701
+#, fuzzy
+msgid "Sign On/Off"
+msgstr "Deconnection"
+
+#: src/multi.c:705
+#, fuzzy
+msgid "Delete"
+msgstr "Sectionner une fonte"
+
+#: src/multi.c:851
+#, 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
 msgid "Disconnected."
 msgstr "Déconnecté."
 
-#: src/oscar.c:165
+#: src/oscar.c:308
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "erreur à la connection!\n"
 
-#: src/oscar.c:182
+#: src/oscar.c:316
 #, fuzzy
 msgid "major connection error\n"
 msgstr "erreur à la connection!\n"
 
-#: src/oscar.c:196
+#: src/oscar.c:330 src/toc.c:500
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:197
+#: src/oscar.c:331
 #, fuzzy
 msgid "Chat Error!"
 msgstr "Erreur"
 
-#: src/oscar.c:220
+#: src/oscar.c:362
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Connection de %s.\n"
 
-#: src/oscar.c:230
-#, c-format
-msgid "Looking up %s"
-msgstr "Résolution de %s"
-
-#: src/oscar.c:235
+#: src/oscar.c:399
 msgid "internal connection error\n"
 msgstr "erreur interne de connection\n"
 
-#: src/oscar.c:240
+#: src/oscar.c:400
 msgid "Unable to login to AIM"
 msgstr "Impossible de se connecter à AIM."
 
-#: src/oscar.c:248
-msgid "couldn't resolve host\n"
+#: src/oscar.c:405
+#, fuzzy
+msgid "couldn't resolve host"
 msgstr "incapable de résoudre l'adresse\n"
 
-#: src/oscar.c:252
-msgid "couldn't connect to host\n"
+#: src/oscar.c:409
+#, fuzzy
+msgid "couldn't connect to host"
 msgstr "incapable de se connecter au serveur\n"
 
-#: src/oscar.c:258
+#: src/oscar.c:416
 #, c-format
 msgid "Signon: %s"
 msgstr "Connection: %s"
 
-#: src/oscar.c:283
+#: src/oscar.c:426
 msgid "Password sent, waiting for response\n"
 msgstr "Mot de passe envoyé, en attente de réponse\n"
 
-#: src/oscar.c:299
+#: src/oscar.c:451
 msgid "Signed off.\n"
 msgstr "Hors Ligne.\n"
 
 #. connecting too frequently
-#: src/oscar.c:313
+#: src/oscar.c:466
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1154,80 +1231,113 @@
 "etRéessayez. Si vous continuez d'essayer, il vous faudra attendre encore "
 "plus longtemps."
 
-#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:761
-#: src/oscar.c:766 src/oscar.c:788 src/oscar.c:807 src/oscar.c:831
-#, fuzzy
-msgid "Gaim - Error"
-msgstr "Gaim - Erreur %d"
-
 #. client too old
-#: src/oscar.c:323
+#: src/oscar.c:476
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:338
+#: src/oscar.c:480 src/toc.c:303
 msgid "Authentication Failed"
 msgstr "Echec de Vérification."
 
-#: src/oscar.c:362
+#: src/oscar.c:513
 msgid "Internal Error"
 msgstr "Erreur Interne"
 
-#: src/oscar.c:370
+#: src/oscar.c:520
 msgid "Could Not Connect"
 msgstr "Impossible de se Connecter"
 
-#: src/oscar.c:401
+#: src/oscar.c:551
 msgid "Connection established, cookie sent"
 msgstr "Connection établie, cookie envoyé"
 
-#: src/oscar.c:632
-msgid "Accept Direct IM?"
-msgstr ""
-
-#: src/oscar.c:642
+#: src/oscar.c:787 src/oscar.c:1860
+#, 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 "%s has requested to directly connect to your computer. Do you accept?"
+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:652 src/rvous.c:635
-msgid "Accept"
-msgstr "Accepter"
+#: 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:760
+#: src/oscar.c:1194
 #, 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:765
+#: 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
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:786
+#: src/oscar.c:1220
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:787 src/oscar.c:806
+#: src/oscar.c:1221 src/oscar.c:1240
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:805
+#: src/oscar.c:1239
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:830
+#: src/oscar.c:1265
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:836
+#: src/oscar.c:1271
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1239,611 +1349,707 @@
 "<BR>En Ligne depuis : <B>%s</B><BR>Minutes d'inactivité : <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/oscar.c:869
+#: src/oscar.c:1305
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:870
+#: src/oscar.c:1306
 msgid "AOL error"
 msgstr ""
 
-#: src/plugins.c:103
+#: src/oscar.c:1913
+#, 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
+#, 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
+#, fuzzy
+msgid "Get Away Msg"
+msgstr "Message d'absence"
+
+#: src/oscar.c:1982
+#, fuzzy
+msgid "Direct IM"
+msgstr "Information Personnelle"
+
+#. Below is basically stolen from plugins.c
+#: src/perl.c:639
+#, fuzzy
+msgid "Gaim - Select Perl Script"
+msgstr "Gaim - Message d'information"
+
+#: src/perl.c:686
+msgid "Perl Scripts"
+msgstr ""
+
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Liste des Plugins"
 
-#: src/plugins.c:155
-#, c-format
-msgid "Already loaded %s, not reloading.\n"
-msgstr ""
-
-#: src/plugins.c:177 src/plugins.c:185 src/plugins.c:217
+#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
 msgid "Plugin Error"
 msgstr "Erreur de Plugin"
 
-#: src/plugins.c:265
+#: src/plugins.c:262
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
 #. Build the bottom button bar
-#: src/plugins.c:297
+#: src/plugins.c:294
 msgid "Load Plugin"
 msgstr "Charger le Plugin"
 
-#: src/plugins.c:304
+#: src/plugins.c:301
 msgid "Configure Plugin"
 msgstr "Configurer le Plugin"
 
-#: src/plugins.c:310
+#: src/plugins.c:307
 msgid "Unload Plugin"
 msgstr "Décharger le Plugin"
 
-#: src/prefs.c:93
-#, fuzzy
-msgid "General Options"
-msgstr "Options"
-
-#: src/prefs.c:100 src/prefs.c:358 src/prefs.c:387 src/prefs.c:414
-#: src/prefs.c:614 src/prefs.c:701 src/prefs.c:810 src/prefs.c:895
-#: src/prefs.c:1288 src/prefs.c:1373 src/prefs.c:1404 src/prefs.c:1691
+#: 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
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:104
-#, fuzzy
-msgid "Remember password"
-msgstr "Mémoriser le mot de passe"
-
-#: src/prefs.c:106
-msgid "Auto-login"
-msgstr "Connection automatique"
-
-#: src/prefs.c:112
+#.
+#. 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
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:113
+#: src/prefs.c:135
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:116
+#: src/prefs.c:138
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:124
+#: 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
 #, fuzzy
-msgid "Report Idle Times"
+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
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "Mémoriser la taille et la position de certaines fenetres"
+
 #: src/prefs.c:202
 #, fuzzy
-msgid "Connection Options"
-msgstr "Connection"
-
-#: src/prefs.c:210
-msgid ""
-"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
-"other is TOC.\n"
-"\n"
-"TOC is a published protocol; AOL allows people to use the TOC protocol in "
-"their clients to connect. It is a simplified version of Oscar; it is capable "
-"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
-"is published, using TOC in gaim tends to be more stable and reliable.\n"
-"\n"
-"Oscar is a proprietary protocol. AOL has not published any information about "
-"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
-"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
-"or implemented all of the functions of Oscar, it is still able to perform "
-"most functions TOC provides as well as several others. However, using Oscar "
-"in gaim tends to be less reliable, though more usable.\n"
-"\n"
-"Changing this option takes effect at signon time."
-msgstr ""
-
-#: src/prefs.c:216
-msgid "Use Oscar Protocol"
-msgstr ""
-
-#: src/prefs.c:222
-msgid "Send Keep-Alive Packet (6 bytes/minute)"
-msgstr ""
-
-#: src/prefs.c:239 src/prefs.c:2016
-#, fuzzy
-msgid "TOC Options"
-msgstr "Options"
-
-#: src/prefs.c:251
-msgid "TOC Host:"
-msgstr "Serveur TOC:"
-
-#: src/prefs.c:261 src/prefs.c:286 src/prefs.c:320
-msgid "Port:"
-msgstr "Port:"
-
-#: src/prefs.c:276
-msgid "Login Host:"
-msgstr "Connection au serveur:"
-
-#: src/prefs.c:297
-msgid "No Proxy"
-msgstr "Pas de proxy"
-
-#: src/prefs.c:298
-msgid "HTTP Proxy"
-msgstr "Proxy HTTP"
-
-#: src/prefs.c:299
-#, fuzzy
-msgid "Socks 4 Proxy"
-msgstr "Pas de proxy"
-
-#: src/prefs.c:300
-#, fuzzy
-msgid "Socks 5 Proxy"
-msgstr "Pas de proxy"
-
-#: src/prefs.c:306
-msgid "Proxy Host:"
-msgstr "Proxy"
-
-#: src/prefs.c:351 src/prefs.c:2021
-#, fuzzy
-msgid "Oscar Options"
-msgstr "Options"
-
-#: src/prefs.c:362
-msgid "No options currently (Isn't that sad)"
-msgstr ""
-
-#: src/prefs.c:380
-#, fuzzy
-msgid "Applet Options"
-msgstr "Options"
-
-#: src/prefs.c:391
+msgid "Automatically show buddy list on sign on"
+msgstr "Afficher la liste des potes automagiquement"
+
+#: src/prefs.c:203
 #, fuzzy
 msgid "Display Buddy List near applet"
 msgstr "La liste des potes disparait près de l'applet"
 
-#: src/prefs.c:407
-#, fuzzy
-msgid "Buddy List Options"
-msgstr "Liste de Potes"
-
-#: src/prefs.c:418
-msgid "Show numbers in groups"
-msgstr "Afficher le nombre dans les groupes"
-
-#: src/prefs.c:419
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:420
-msgid "Show idle times"
-msgstr "Afficher les temps d'inactivité"
-
-#: src/prefs.c:421
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "afficher les images des potes"
-
-#: src/prefs.c:427
-msgid "Hide IM/Info/Chat buttons"
-msgstr ""
-
-#: src/prefs.c:428
-msgid "Show pictures on buttons"
-msgstr ""
-
-#: src/prefs.c:434
-#, fuzzy
-msgid "Save Window Size/Position"
-msgstr "Mémoriser la taille et la position de certaines fenetres"
-
-#: src/prefs.c:436
-#, fuzzy
-msgid "Automatically show buddy list on sign on"
-msgstr "Afficher la liste des potes automagiquement"
-
-#: src/prefs.c:586
-msgid "Please sign on before editing the permit/deny lists."
-msgstr ""
-
-#: src/prefs.c:587
-msgid "Please sign on"
-msgstr ""
-
-#: src/prefs.c:607
-msgid "Permit/Deny List Options"
-msgstr ""
-
-#: src/prefs.c:622
-msgid ""
-"The permit/deny configuration will change between users,\n"
-"and changes while you are signed off will not be saved."
-msgstr ""
-
-#: src/prefs.c:635
-#, fuzzy
-msgid "Allow Anyone"
-msgstr "Autoriser tout le monde"
-
-#. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
-#. * and merging the two would be very difficult at best, most likely
-#. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:640
-msgid "Allow only users on Buddy List"
-msgstr ""
-
-#: src/prefs.c:642
-msgid "Allow only the users in \"Permit\""
-msgstr ""
-
-#: src/prefs.c:648
-msgid "Block all users"
-msgstr ""
-
-#: src/prefs.c:649
-msgid "Block the users in \"Deny\""
-msgstr ""
-
-#: src/prefs.c:694
+#: src/prefs.c:219
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:705
+#: src/prefs.c:231
 msgid "Enter sends message"
 msgstr "Entrer les messages envoyés"
 
-#: src/prefs.c:706
+#: src/prefs.c:232
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:707
+#: src/prefs.c:233
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:713
+#: src/prefs.c:239
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "Afficher graphiquement les smileys (expérimental)"
 
-#: src/prefs.c:714
+#: src/prefs.c:240
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "Afficher l'heure su les messages"
 
-#: src/prefs.c:715
+#: src/prefs.c:241
 #, fuzzy
 msgid "Ignore incoming colors"
 msgstr "Ignorer les couleurs envoyées"
 
-#: src/prefs.c:716
+#: src/prefs.c:242
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:722
+#: src/prefs.c:248
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Tracer toutes les conversations"
 
-#: src/prefs.c:723
+#: src/prefs.c:249
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "Enlever l'HTML des traces"
 
-#: src/prefs.c:729
+#: src/prefs.c:255
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Surligner automagiquement les mots mal orthographiés"
 
-#: src/prefs.c:730
+#: src/prefs.c:256
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "Envoyer les URL comme des liens cliquables"
 
-#: src/prefs.c:731
+#: src/prefs.c:257
 msgid "Sending messages removes away status"
 msgstr "L'envoi de message supprime le statut d'absence"
 
-#: src/prefs.c:772 src/prefs.c:857
+#: src/prefs.c:298 src/prefs.c:386
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:777 src/prefs.c:862
+#: src/prefs.c:303 src/prefs.c:391
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:782 src/prefs.c:867
+#: src/prefs.c:308 src/prefs.c:396
 #, fuzzy
 msgid "Text Only"
 msgstr "Couleur de texte"
 
-#: src/prefs.c:803
+#: src/prefs.c:331
 #, fuzzy
 msgid "IM Options"
 msgstr "Options"
 
-#: src/prefs.c:814
+#: src/prefs.c:343
 #, fuzzy
 msgid "Show logins in window"
 msgstr "Afficher les (dé)connection dans la fenetre de forum"
 
-#: src/prefs.c:820 src/prefs.c:905
+#: src/prefs.c:349 src/prefs.c:435
 #, fuzzy
 msgid "Show buttons as "
 msgstr "Afficher les images sur les boutons"
 
-#: src/prefs.c:829 src/prefs.c:915
+#: src/prefs.c:358 src/prefs.c:445
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:830 src/prefs.c:916
+#: src/prefs.c:359 src/prefs.c:446
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Avancer les fenêtres recevant un message"
 
-#: src/prefs.c:831 src/prefs.c:1611
+#: src/prefs.c:360
 msgid "Ignore new conversations when away"
 msgstr "Ignorer les nouveaux forums lors des absences"
 
-#: src/prefs.c:832
+#: src/prefs.c:361
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "Créer un Message"
 
-#: src/prefs.c:888 src/prefs.c:1090
+#: src/prefs.c:417 src/prefs.c:620
 #, fuzzy
 msgid "Chat Options"
 msgstr "Options"
 
-#: src/prefs.c:899
+#: src/prefs.c:429
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:947 src/prefs.c:949 src/prefs.c:1161 src/prefs.c:1163
+#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
 msgid "Gaim Chat"
 msgstr "Forum Gaim"
 
-#: src/prefs.c:1107
+#: src/prefs.c:638
 msgid "Refresh"
 msgstr "Rafraichir"
 
-#: src/prefs.c:1135
+#: src/prefs.c:666
 msgid "List of available chats"
 msgstr "Liste des forums disponibles"
 
-#: src/prefs.c:1149
+#: src/prefs.c:680
 msgid "List of subscribed chats"
 msgstr "Liste des forums souscrits"
 
-#: src/prefs.c:1281 src/prefs.c:2082
+#: src/prefs.c:806 src/prefs.c:2084
 #, fuzzy
 msgid "Font Options"
 msgstr "Options"
 
-#: src/prefs.c:1294
+#: src/prefs.c:820
 msgid "Underlined Text"
 msgstr "Texte Souligné"
 
-#: src/prefs.c:1295
+#: src/prefs.c:821
 msgid "Strike Text"
 msgstr "Texte barré"
 
-#: src/prefs.c:1308 src/prefs.c:1325 src/prefs.c:1345
+#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
 #, fuzzy
 msgid "Select"
 msgstr "Sectionner une fonte"
 
-#: src/prefs.c:1343
+#: src/prefs.c:869
 msgid "Font Face for Text"
 msgstr "Fonte pour le Texte"
 
-#: src/prefs.c:1366
+#: src/prefs.c:892
 #, fuzzy
 msgid "Sound Options"
 msgstr "Options"
 
-#: src/prefs.c:1378
-msgid "Sounds go through GNOME"
-msgstr "Les sons sont envoyés à GNOME"
-
-#: src/prefs.c:1380
+#: src/prefs.c:904
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Son quand vos potes se connectent"
 
-#: src/prefs.c:1381 src/prefs.c:1612
+#: src/prefs.c:905 src/prefs.c:1296
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1382
+#: src/prefs.c:906
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1397
+#: src/prefs.c:968
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - Tracer la Conversation"
+
+#: src/prefs.c:1002
+#, fuzzy
+msgid "Reset"
+msgstr "S'enregistrer"
+
+#: src/prefs.c:1007
+#, fuzzy
+msgid "Choose"
+msgstr "Fermer"
+
+#: src/prefs.c:1035
 #, fuzzy
 msgid "Sound Events"
 msgstr "Sons"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1047
 msgid "Sound when buddy logs in"
 msgstr "Son quand vos potes se connectent"
 
-#: src/prefs.c:1409
+#: src/prefs.c:1048
 msgid "Sound when buddy logs out"
 msgstr "Son quand vos potes se déconnectent"
 
-#: src/prefs.c:1415
+#: src/prefs.c:1054
 msgid "Sound when message is received"
 msgstr "Son à la reception d'un message"
 
-#: src/prefs.c:1416
+#: src/prefs.c:1055
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "Son à la reception d'un message"
 
-#: src/prefs.c:1417
+#: src/prefs.c:1056
 msgid "Sound when message is sent"
 msgstr "Son à l'envoi d'un message"
 
-#: src/prefs.c:1423
+#: src/prefs.c:1062
 #, fuzzy
-msgid "Sound in chat rooms when people enter/leave"
+msgid "Sound in chat rooms when people enter"
+msgstr "Son lorsque les personnes entrent/sortent d'un forum"
+
+#: src/prefs.c:1063
+#, fuzzy
+msgid "Sound in chat rooms when people leave"
 msgstr "Son lorsque les personnes entrent/sortent d'un forum"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1064
 #, fuzzy
-msgid "Sound in chat rooms when people talk"
+msgid "Sound in chat rooms when you talk"
 msgstr "Son lorsque els personnes parlent dnas un forum"
 
-#: src/prefs.c:1509 src/prefs.c:2109
+#: src/prefs.c:1065
+#, 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
 #, fuzzy
 msgid "Away Messages"
 msgstr "Nouveau Message d'absence"
 
-#: src/prefs.c:1525
+#: src/prefs.c:1209
 #, fuzzy
 msgid "Title"
 msgstr "Fichier"
 
-#: src/prefs.c:1529
+#: src/prefs.c:1213
 #, fuzzy
 msgid "Message"
 msgstr "Créer un Message"
 
-#: src/prefs.c:1569
+#: src/prefs.c:1253
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1573
+#: src/prefs.c:1257
 #, fuzzy
 msgid "Make Away"
 msgstr "Etre absent maintenant"
 
-#: src/prefs.c:1684
+#: src/prefs.c:1295
+#, fuzzy
+msgid "Ignore new conversations when away   "
+msgstr "Ignorer les nouveaux forums lors des absences"
+
+#: src/prefs.c:1306
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1318
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1400
 #, fuzzy
 msgid "Browser Options"
 msgstr "Options"
 
-#: src/prefs.c:1695
+#: src/prefs.c:1412
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:1696
+#: src/prefs.c:1413
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1698
+#: src/prefs.c:1415
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1700
-#, fuzzy
-msgid "Internal HTML Widget (Quite likely a bad idea!)"
-msgstr "Support HTML Interne (plutot une mauvaise idée!)"
-
-#: src/prefs.c:1701
+#: src/prefs.c:1417
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/prefs.c:1710
+#: src/prefs.c:1426
 msgid "Pop up new window by default"
 msgstr "Afficher une nouvelle fenêtre par défaut"
 
-#: src/prefs.c:1755
+#: src/prefs.c:1641
+#, fuzzy
+msgid "Privacy Options"
+msgstr "Options"
+
+#: src/prefs.c:1657
+msgid "Set privacy for:"
+msgstr ""
+
+#: src/prefs.c:1677
+msgid "Allow all users to contact me"
+msgstr ""
+
+#: src/prefs.c:1678
+msgid "Allow only the users below"
+msgstr ""
+
+#: src/prefs.c:1680
+msgid "Allow List"
+msgstr ""
+
+#: src/prefs.c:1712
+#, fuzzy
+msgid "Deny all users"
+msgstr "Interdire certains"
+
+#: src/prefs.c:1713
+msgid "Block the users below"
+msgstr ""
+
+#: src/prefs.c:1715
+#, fuzzy
+msgid "Block List"
+msgstr "Bloquer"
+
+#: src/prefs.c:1791
 msgid "Gaim - Preferences"
 msgstr "Gaim - Préférences"
 
-#: src/prefs.c:1843
+#: src/prefs.c:1877
 msgid "GAIM debug output window"
 msgstr "fenetre de debug GAIM"
 
-#: src/prefs.c:1998
+#: src/prefs.c:2040
 msgid "General"
 msgstr "Génerale"
 
-#: src/prefs.c:2011
-msgid "Connection"
-msgstr "Connection"
-
-#: src/prefs.c:2033
-msgid "Applet"
-msgstr "Applet"
-
-#. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:2051
-#, fuzzy
-msgid "Permit/Deny"
-msgstr "Autoriser certains"
-
-#: src/prefs.c:2062
+#: src/prefs.c:2064
 #, fuzzy
 msgid "Conversations"
 msgstr "Tracer toutes les conversations"
 
-#: src/prefs.c:2067
+#: src/prefs.c:2069
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2072
+#: src/prefs.c:2074
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2077
+#: src/prefs.c:2079
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:2093
+#: src/prefs.c:2095
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/prefs.c:2098
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2120
+#: src/prefs.c:2122
 msgid "Browser"
 msgstr "Navigateur"
 
-#: src/rvous.c:108
+#: src/prefs.c:2133
+msgid "Privacy"
+msgstr ""
+
+#: src/rvous.c:148
 msgid "Gaim - Save As..."
 msgstr "Gaim - Enregistrer sous..."
 
-#: src/rvous.c:269
+#: src/rvous.c:317
 #, c-format
 msgid "Receiving %s from %s"
 msgstr "Reception de %s en provenance de %s"
 
-#: src/rvous.c:285 src/rvous.c:422
-msgid "Gaim - File Transfer"
-msgstr "Gaim - Transfert de fichier"
-
-#: src/rvous.c:406
-#, c-format
-msgid "Sending %s to %s"
-msgstr "Envoi de %s à %s"
-
-#: src/rvous.c:662
+#: src/rvous.c:693
+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:665
+#: 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:675
+#: src/rvous.c:733
 msgid "Gaim - File Transfer?"
 msgstr "Gaim - Transfert de fichier?"
 
+#: src/server.c:581
+msgid "Yes"
+msgstr ""
+
+#: src/server.c:582
+msgid "No"
+msgstr ""
+
+#: src/toc.c:253 src/toc.c:260
+#, fuzzy
+msgid "Connection Closed"
+msgstr "Connection"
+
+#: src/toc.c:295
+msgid "Waiting for reply..."
+msgstr ""
+
+#: src/toc.c:354
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr ""
+
+#: src/toc.c:355
+msgid "TOC Resume"
+msgstr ""
+
+#: src/toc.c:515
+#, fuzzy
+msgid "Password Change Successeful"
+msgstr "Gaim - Changement de mot de passe"
+
+#: src/toc.c:518
+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
+msgid "TOC Pause"
+msgstr ""
+
+#: src/toc.c:977
+#, fuzzy
+msgid "Get Dir Info"
+msgstr "Info Personnelle"
+
+#~ msgid "You must give your password"
+#~ msgstr "Vous devez indiquer votre mot de passe"
+
+#~ msgid "%d/%d Buddies Online"
+#~ msgstr "%d/%d potes en ligne"
+
+#~ msgid "Toggle Logging"
+#~ msgstr "Activer le Traçage"
+
+#, fuzzy
+#~ msgid "%sChat"
+#~ msgstr "Forum"
+
+#~ msgid "Message too long, some data truncated."
+#~ msgstr "Message trop long, données tronquées"
+
+#~ msgid "Error Resolving Mail Server.\n"
+#~ msgstr "Erreur à la résolution du serveur de mail\n"
+
+#~ msgid "Buddy To Pounce:"
+#~ msgstr "Pote à attendre:"
+
+#~ msgid "Message to send:"
+#~ msgstr "Message à envoyer"
+
+#, fuzzy
+#~ msgid "Permit / Deny"
+#~ msgstr "Autoriser certains"
+
+#~ msgid "g001: Error resolving host\n"
+#~ msgstr "g001: Erreur à la résolution de l'adresse\n"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Résolution de %s"
+
+#, fuzzy
+#~ msgid "Remember password"
+#~ msgstr "Mémoriser le mot de passe"
+
+#, fuzzy
+#~ msgid "TOC Options"
+#~ msgstr "Options"
+
+#~ msgid "TOC Host:"
+#~ msgstr "Serveur TOC:"
+
+#~ msgid "Port:"
+#~ msgstr "Port:"
+
+#~ msgid "Login Host:"
+#~ msgstr "Connection au serveur:"
+
+#~ msgid "No Proxy"
+#~ msgstr "Pas de proxy"
+
+#~ msgid "HTTP Proxy"
+#~ msgstr "Proxy HTTP"
+
+#, fuzzy
+#~ msgid "Socks 4 Proxy"
+#~ msgstr "Pas de proxy"
+
+#, fuzzy
+#~ msgid "Socks 5 Proxy"
+#~ msgstr "Pas de proxy"
+
+#~ msgid "Proxy Host:"
+#~ msgstr "Proxy"
+
+#, fuzzy
+#~ msgid "Oscar Options"
+#~ msgstr "Options"
+
+#, fuzzy
+#~ msgid "Applet Options"
+#~ msgstr "Options"
+
+#, fuzzy
+#~ msgid "Allow Anyone"
+#~ msgstr "Autoriser tout le monde"
+
+#~ msgid "Sounds go through GNOME"
+#~ msgstr "Les sons sont envoyés à GNOME"
+
+#, fuzzy
+#~ msgid "Internal HTML Widget (Quite likely a bad idea!)"
+#~ msgstr "Support HTML Interne (plutot une mauvaise idée!)"
+
+#~ msgid "Connection"
+#~ msgstr "Connection"
+
+#~ msgid "Applet"
+#~ msgstr "Applet"
+
+#, fuzzy
+#~ msgid "Permit/Deny"
+#~ msgstr "Autoriser certains"
+
 #~ msgid "Permit some"
 #~ msgstr "Autoriser certains"
 
-#~ msgid "Deny some"
-#~ msgstr "Interdire certains"
-
 #~ msgid "Add buddy to permit/deny"
 #~ msgstr "Autoriser/Interdire des potes"
 
@@ -1868,9 +2074,6 @@
 #~ msgid "No Idle"
 #~ msgstr "Actif"
 
-#~ msgid "GAIM Use"
-#~ msgstr "Utilisation de GAIM"
-
 #~ msgid "SOCKS v4 Proxy"
 #~ msgstr "Proxy SOCKS v4"
 
--- a/po/ko.po	Mon Dec 04 07:13:31 2000 +0000
+++ b/po/ko.po	Mon Dec 04 07:58:38 2000 +0000
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/gnome_applet_mgr.c:254
+#: src/gnome_applet_mgr.c:256
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-10-09 11:11-0700\n"
+"POT-Creation-Date: 2000-12-03 23:24-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,197 +15,178 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: src/about.c:73
+#: src/about.c:72
 #, c-format
 msgid "About GAIM v%s"
 msgstr "GAIM v%s ¿¡ ´ëÇÏ¿©"
 
-#: src/aim.c:168
+#: src/aim.c:133 src/buddy.c:2100
+msgid "Signoff"
+msgstr "²÷±â"
+
+#: src/aim.c:147
 msgid "Please enter your logon"
 msgstr "À̸§À» ÀÔ·ÂÇϼ¼¿ä"
 
-#: src/aim.c:172
-msgid "You must give your password"
-msgstr "Æнº¿öµå¸¦ ÀÔ·ÂÇϼž߸¸ ÇÕ´Ï´Ù"
+#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#, fuzzy
+msgid "Signon Error"
+msgstr "¿¬°á"
 
-#: src/aim.c:222 src/buddy.c:1873
-msgid "Signoff"
-msgstr "²÷±â"
+#: src/aim.c:152
+#, fuzzy
+msgid "Please enter your password"
+msgstr "À̸§À» ÀÔ·ÂÇϼ¼¿ä"
 
-#: src/aim.c:325 src/aim.c:570 src/buddy.c:319
+#: src/aim.c:254 src/multi.c:608
 msgid "Signon"
 msgstr "¿¬°á"
 
-#: src/aim.c:326 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:428
-#: src/dialogs.c:747 src/dialogs.c:822 src/dialogs.c:979 src/dialogs.c:1056
-#: src/dialogs.c:1173 src/dialogs.c:1305 src/dialogs.c:1492 src/dialogs.c:1597
-#: src/dialogs.c:1678 src/dialogs.c:1923 src/dialogs.c:2111 src/dialogs.c:2277
-#: src/dialogs.c:2372 src/dialogs.c:3098 src/dialogs.c:3360 src/oscar.c:655
-#: src/rvous.c:279 src/rvous.c:416 src/rvous.c:638
+#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+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:327 src/buddy.c:1870
+#: src/aim.c:259
 msgid "Register"
 msgstr "µî·Ï"
 
-#: src/aim.c:328
+#: src/aim.c:260
 msgid "Options"
 msgstr "¿É¼Ç"
 
-#: src/aim.c:330 src/aim.c:576 src/buddy.c:1936
+#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
 msgid "Plugins"
 msgstr "Ç÷¯±×ÀÎ"
 
-#: src/aim.c:404
+#. Labels for selectors and text boxes
+#: src/aim.c:338
 msgid "Screen Name: "
 msgstr "È­¸éÀ̸§: "
 
-#: src/aim.c:407
+#: src/aim.c:341
 msgid "Password: "
 msgstr "¾ÏÈ£: "
 
-#: src/aim.c:410
-msgid "Remember Password"
-msgstr "¾ÏÈ£ ÀúÀå"
-
-#: src/aim.c:457
+#: src/aim.c:380
 msgid "Gaim - Login"
 msgstr "Gaim - ·Î±×ÀÎ"
 
-#: src/aim.c:565 src/buddy.c:1933
+#: src/aim.c:599 src/buddy.c:2163
 msgid "Preferences"
 msgstr "¼³Á¤"
 
-#: src/away.c:88 src/away.c:203
+#: src/away.c:110 src/away.c:227
 msgid "Back"
 msgstr "µÚ·Î"
 
-#: src/away.c:99
+#: src/away.c:121
 msgid "I'm Back!"
 msgstr "³»°¡ µ¹¾Æ¿Ô´Ù!"
 
-#: src/away.c:141
+#: src/away.c:160
 msgid "Gaim - Away!"
 msgstr "Gaim - Àá¼ö!"
 
-#: src/away.c:242 src/gnome_applet_mgr.c:198
+#: src/away.c:266 src/gnome_applet_mgr.c:200
 msgid "New Away Message"
 msgstr "»õ·Î¿î Àá¼ö ¸Þ½ÃÁö"
 
-#: src/away.c:260
+#: src/away.c:284
 msgid "Remove Away Message"
 msgstr "Àá¼ö ¸Þ½ÃÁö ¾ø¾Ö±â"
 
-#: src/buddy.c:161
-#, c-format
-msgid "%d/%d Buddies Online"
-msgstr "ÇöÀç Á¢¼ÓµÈ Ä£±¸´Â %d/%d"
-
 #. Put the buttons in the box
-#: src/buddy.c:260 src/buddy.c:2005 src/buddy_chat.c:816
-#: src/conversation.c:440 src/conversation.c:1658 src/dialogs.c:977
-#: src/dialogs.c:1055 src/dialogs.c:1922 src/dialogs.c:1944 src/dialogs.c:3358
-#: src/prefs.c:667 src/prefs.c:1108 src/prefs.c:1565
+#: 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
 msgid "Add"
 msgstr "´õÇϱâ"
 
-#: src/buddy.c:261 src/buddy.c:2006 src/dialogs.c:987 src/dialogs.c:1071
+#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
 msgid "Group"
 msgstr "±×·ì"
 
-#: src/buddy.c:262 src/buddy.c:2007 src/buddy_chat.c:818
-#: src/conversation.c:1656 src/dialogs.c:885 src/prefs.c:671 src/prefs.c:1109
-#: src/prefs.c:1577
+#: 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
 msgid "Remove"
 msgstr "Á¦°Å"
 
-#: src/buddy.c:265 src/buddy.c:1777
+#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
 msgid "Chat"
 msgstr "äÆÃ"
 
-#: src/buddy.c:266 src/buddy.c:406 src/buddy.c:1775 src/buddy_chat.c:543
+#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:267 src/buddy.c:412 src/buddy.c:1776 src/buddy_chat.c:545
-#: src/buddy_chat.c:824 src/conversation.c:1652 src/rvous.c:636
+#: 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
 msgid "Info"
 msgstr "Á¤º¸"
 
-#: src/buddy.c:418 src/dialogs.c:3372
+#. Put the buttons in the box
+#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
 msgid "Alias"
 msgstr ""
 
 #: src/buddy.c:425
-msgid "Dir Info"
-msgstr "µð·ºÅ丮 Á¤º¸"
-
-#: src/buddy.c:432
-#, fuzzy
-msgid "Direct IM"
-msgstr "µð·ºÅ丮 Á¤º¸"
-
-#: src/buddy.c:438
-msgid "Away Msg"
-msgstr "Àá¼ö ¸Þ½ÃÁö"
-
-#: src/buddy.c:445
-msgid "Toggle Logging"
-msgstr "·Î±ë ¼±ÅÃ"
-
-#: src/buddy.c:451
 msgid "Add Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â ¸¸µé±â"
 
-#: src/buddy.c:1270
+#: src/buddy.c:1368
 msgid "New Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â »õ·Î ¸¸µé±â"
 
-#: src/buddy.c:1288
+#: src/buddy.c:1386
 msgid "Remove Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â Áö¿ì±â"
 
-#: src/buddy.c:1376
-#, fuzzy, c-format
-msgid "%sBuddy Icon"
+#: src/buddy.c:1675
+#, fuzzy
+msgid "Buddy Icon"
 msgstr "Ä£±¸ ºÙÀâ±â"
 
-#: src/buddy.c:1379
-#, c-format
-msgid "%sVoice"
-msgstr ""
-
-#: src/buddy.c:1382
-#, c-format
-msgid "%sIM Image"
+#: src/buddy.c:1678
+msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1385
-#, fuzzy, c-format
-msgid "%sChat"
-msgstr "äÆÃ"
-
-#: src/buddy.c:1388
-#, c-format
-msgid "%sGet File"
+#: src/buddy.c:1681
+msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1391
-#, c-format
-msgid "%sSend File"
-msgstr ""
+#: src/buddy.c:1687
+#, fuzzy
+msgid "Get File"
+msgstr "ÆÄÀÏ"
 
-#: src/buddy.c:1446
+#: src/buddy.c:1690
+#, fuzzy
+msgid "Send File"
+msgstr "ÆÄÀÏ"
+
+#: src/buddy.c:1749
 msgid "Warnings: %d%%\n"
 msgstr "ÁÖÀÇ: %d%%\n"
 
-#: src/buddy.c:1452
+#: src/buddy.c:1754
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1456
+#: src/buddy.c:1758
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -217,503 +198,491 @@
 "·Î±×ÀÎ ÇÑ ¶§: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:1456
+#: src/buddy.c:1761
 msgid "Idle: "
 msgstr "³î±â: "
 
-#: src/buddy.c:1501
+#: src/buddy.c:1828
 #, 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:1644
+#: src/buddy.c:1878
 #, 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:1802
+#: src/buddy.c:2028
 msgid "Information on selected Buddy"
 msgstr "¼±ÅÃÇÑ Ä£±¸¿¡ ´ëÇÑ Á¤º¸"
 
-#: src/buddy.c:1803 src/dialogs.c:738
+#: src/buddy.c:2029 src/dialogs.c:657
 msgid "Send Instant Message"
 msgstr "¸Þ½ÃÁö º¸³»±â"
 
-#: src/buddy.c:1804
+#: src/buddy.c:2030
 msgid "Start/join a Buddy Chat"
 msgstr "äÆà ½ÃÀÛ/Âü°¡"
 
-#: src/buddy.c:1857
+#: src/buddy.c:2088
 msgid "File"
 msgstr "ÆÄÀÏ"
 
-#: src/buddy.c:1861 src/buddy.c:1862
+#: src/buddy.c:2092 src/buddy.c:2093
 msgid "Add A Buddy"
 msgstr "Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:1863
+#: src/buddy.c:2094
 #, fuzzy
 msgid "Join A Chat"
 msgstr "äÆÿ¡ Âü°¡"
 
-#: src/buddy.c:1865
+#: src/buddy.c:2095
+#, fuzzy
+msgid "New Instant Message"
+msgstr "¸Þ½ÃÁö º¸³»±â"
+
+#: src/buddy.c:2097
 msgid "Import Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï °¡Á®¿À±â"
 
-#: src/buddy.c:1866
+#: src/buddy.c:2098
 msgid "Export Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï ³»º¸³»±â"
 
-#: src/buddy.c:1876
+#: src/buddy.c:2103
 msgid "Quit"
 msgstr "³¡³»±â"
 
-#: src/buddy.c:1878 src/buddy_chat.c:537 src/buddy_chat.c:791
-#: src/buddy_chat.c:812 src/conversation.c:1654 src/dialogs.c:505
-#: src/plugins.c:317 src/prefs.c:1810
+#: 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:1883
+#: src/buddy.c:2110
 msgid "Tools"
 msgstr "µµ±¸"
 
-#: src/buddy.c:1888 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
 msgid "Away"
 msgstr "Àá¼ö"
 
-#: src/buddy.c:1893
+#: src/buddy.c:2120
 msgid "Buddy Pounce"
 msgstr "Ä£±¸ ºÙÀâ±â"
 
-#: src/buddy.c:1901 src/dialogs.c:2105 src/dialogs.c:2262
+#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
 msgid "Search for Buddy"
 msgstr "Ä£±¸ ã±â"
 
-#: src/buddy.c:1904
+#: src/buddy.c:2131
 msgid "by Email"
 msgstr "¸ÞÀÏ·Î"
 
-#: src/buddy.c:1908
+#: src/buddy.c:2135
 msgid "by Dir Info"
 msgstr "µð·ºÅ丮 Á¤º¸·Î"
 
-#: src/buddy.c:1915 src/buddy.c:1916
+#: src/buddy.c:2142 src/buddy.c:2143
 msgid "Settings"
 msgstr "¼³Á¤"
 
-#: src/buddy.c:1919
+#: src/buddy.c:2146
 msgid "User Info"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: src/buddy.c:1923 src/dialogs.c:1299
+#: src/buddy.c:2150 src/dialogs.c:1353
 msgid "Directory Info"
 msgstr "µð·ºÅ丮 Á¤º¸"
 
-#: src/buddy.c:1927 src/dialogs.c:1486
+#: src/buddy.c:2154 src/dialogs.c:1592
 msgid "Change Password"
 msgstr "Æнº¿öµå ¹Ù²Ù±â"
 
-#: src/buddy.c:1941
+#: src/buddy.c:2171
 #, fuzzy
 msgid "Perl"
 msgstr "Çã¿ë"
 
-#: src/buddy.c:1944
+#: src/buddy.c:2174
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1948
+#: src/buddy.c:2178
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1952
+#: src/buddy.c:2182
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1960
+#: src/buddy.c:2190
 msgid "Help"
 msgstr "µµ¿ò¸»"
 
-#: src/buddy.c:1965
+#: src/buddy.c:2195
 #, fuzzy
 msgid "About Gaim"
 msgstr "GAIM ˼"
 
-#: src/buddy.c:1984 src/prefs.c:2045
+#: src/buddy.c:2214 src/prefs.c:2053
 msgid "Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï"
 
-#: src/buddy.c:2036
+#: src/buddy.c:2266
 msgid "Add a new Buddy"
 msgstr "»õ Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:2037
+#: src/buddy.c:2267
 #, fuzzy
 msgid "Add a new Group"
 msgstr "»õ Ä£±¸ ´õÇϱâ"
 
-#: src/buddy.c:2038
+#: src/buddy.c:2268
 msgid "Remove selected Buddy"
 msgstr "¼±ÅÃÇÑ Ä£±¸ »©±â"
 
-#: src/buddy.c:2063
+#: src/buddy.c:2293
 msgid "Online"
 msgstr "¿¬°áÁß"
 
-#: src/buddy.c:2065
+#: src/buddy.c:2295
 msgid "Edit Buddies"
 msgstr "Ä£±¸ ÆíÁý"
 
-#: src/buddy.c:2102
+#: src/buddy.c:2332
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï"
 
-#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
+#: src/buddy_chat.c:135
+msgid "Join Chat"
+msgstr "äÆÿ¡ Âü°¡"
+
+#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
 msgid "Buddy Chat"
 msgstr "äÆÃ"
 
-#: src/buddy_chat.c:123
-msgid "Join"
-msgstr "Âü°¡"
-
-#: src/buddy_chat.c:129
+#: src/buddy_chat.c:151
 msgid "Join what group:"
 msgstr "Âü°¡ÇÒ ±×·ìÀº:"
 
-#: src/buddy_chat.c:135
+#: src/buddy_chat.c:167
+#, fuzzy
+msgid "Join Chat As:"
+msgstr "äÆÿ¡ Âü°¡"
+
+#: src/buddy_chat.c:181
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:143
+#: src/buddy_chat.c:189
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:172
-msgid "Join Chat"
-msgstr "äÆÿ¡ Âü°¡"
+#: src/buddy_chat.c:197
+msgid "Join"
+msgstr "Âü°¡"
 
-#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
+#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
 msgid "Invite"
 msgstr "ÃÊ´ë"
 
-#: src/buddy_chat.c:234
+#: src/buddy_chat.c:261
 msgid "Invite who?"
 msgstr "´©±¼ ÃÊ´ëÇÒ±î¿ä?"
 
-#: src/buddy_chat.c:238
+#: src/buddy_chat.c:265
 msgid "With message:"
 msgstr "¸Þ½ÃÁö´Â:"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:292
 msgid "Invite to Buddy Chat"
 msgstr "äÆÿ¡ ÃÊ´ë"
 
-#: src/buddy_chat.c:424
+#: src/buddy_chat.c:420
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:452
+#: src/buddy_chat.c:459
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:540 src/buddy_chat.c:789
+#: src/buddy_chat.c:559 src/buddy_chat.c:816
 msgid "Whisper"
 msgstr "±Ó¼Ó¸»"
 
-#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
-#: src/conversation.c:1651 src/dialogs.c:1679
+#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
+#: src/conversation.c:1733
 msgid "Send"
 msgstr "º¸³»±â"
 
-#: src/buddy_chat.c:544
+#: src/buddy_chat.c:563
 msgid "Ignore"
 msgstr "¹«½Ã"
 
-#: src/buddy_chat.c:820 src/conversation.c:1659
+#: src/buddy_chat.c:849 src/conversation.c:1741
 msgid "Block"
 msgstr "Â÷´Ü"
 
-#: src/buddy_chat.c:822 src/conversation.c:1653 src/dialogs.c:424
-#: src/dialogs.c:426 src/rvous.c:637
+#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
+#: src/dialogs.c:345 src/rvous.c:695
 msgid "Warn"
 msgstr "ÁÖÀÇ"
 
-#: src/conversation.c:171
-#, fuzzy, c-format
-msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
-msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
-
-#: src/conversation.c:178
-#, fuzzy, c-format
-msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
-msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
-
-#: src/conversation.c:435
+#: src/conversation.c:426
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "'%s' ¸¦ Ä£±¸ ¸ñ·Ï¿¡¼­ »®´Ï´Ù.\n"
 
-#: src/conversation.c:688
-msgid "Message too long, some data truncated."
-msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±æ¾î¼­ ¾à°£ ©·È½À´Ï´Ù."
-
-#: src/conversation.c:688 src/dialogs.c:2825 src/dialogs.c:2895
-#: src/rvous.c:221 src/rvous.c:492
-msgid "Error"
-msgstr "¿À·ù"
-
-#: src/conversation.c:875
+#: src/conversation.c:902
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "ÇöÀç %d ¿¡ ÀÖ½À´Ï´Ù\n"
 
-#: src/conversation.c:884
+#: src/conversation.c:911
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "À§Ä¡¸¦ %d ·Î ¿Å±é´Ï´Ù\n"
 
-#: src/conversation.c:1489
+#: src/conversation.c:1497
 msgid "Bold"
 msgstr "±½°Ô"
 
-#: src/conversation.c:1489 src/prefs.c:1292
+#: src/conversation.c:1497 src/prefs.c:818
 msgid "Bold Text"
 msgstr "±½Àº ±Û¾¾"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1501 src/conversation.c:1502
 msgid "Italics"
 msgstr "±â¿ïÀÓ"
 
-#: src/conversation.c:1493 src/prefs.c:1293
+#: src/conversation.c:1501 src/prefs.c:819
 msgid "Italics Text"
 msgstr "±â¿ïÀÎ ±Û¾¾"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1505 src/conversation.c:1506
 msgid "Underline"
 msgstr "¹ØÁÙ"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1505
 msgid "Underline Text"
 msgstr "¹ØÁÙÄ£ ±Û¾¾"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1509 src/conversation.c:1510
 msgid "Strike"
 msgstr "°¡¿îµ¥ÁÙ"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1509
 msgid "Strike through Text"
 msgstr "°¡¿îµ¥ÁÙÄ£ ±Û¾¾"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Small"
 msgstr "ÀÛ°Ô"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Decrease font size"
 msgstr "±Û¾¾ Å©±â ÁÙÀ̱â"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal"
 msgstr "º¸Åë"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal font size"
 msgstr "º¸Åë ±Û¾¾ Å©±â"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Big"
 msgstr "Å©°Ô"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Increase font size"
 msgstr "±Û¾¾ Å©±â Å°¿ì±â"
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1526 src/conversation.c:1527
 msgid "Font"
 msgstr "±Û²Ã"
 
-#: src/conversation.c:1518 src/dialogs.c:2724 src/dialogs.c:2740
+#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
 msgid "Select Font"
 msgstr "±Û²Ã ¼±ÅÃ"
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
+#: src/conversation.c:1535
 msgid "Color"
 msgstr "»ö±ò"
 
-#: src/conversation.c:1522 src/prefs.c:1306
+#: src/conversation.c:1530 src/prefs.c:832
 msgid "Text Color"
 msgstr "±Û¾¾ »ö±ò"
 
-#: src/conversation.c:1526 src/prefs.c:1323
+#: src/conversation.c:1534 src/prefs.c:849
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1541 src/conversation.c:1542
 msgid "Link"
 msgstr "¿¬°á"
 
-#: src/conversation.c:1533 src/dialogs.c:2366
+#: src/conversation.c:1541 src/dialogs.c:2391
 msgid "Insert Link"
 msgstr "¿¬°á ³Ö±â"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 #, fuzzy
 msgid "Smiley"
 msgstr "ÆÄÀÏ"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1552 src/conversation.c:1553
 msgid "Logging"
 msgstr "·Î±ë"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1552
 msgid "Enable logging"
 msgstr "·Î±ë Çϱâ"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1556 src/conversation.c:1557
 msgid "Sound"
 msgstr "¼Ò¸®"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1556
 msgid "Enable sounds"
 msgstr "¼Ò¸® µé¸®°Ô"
 
-#: src/dialogs.c:225
-msgid "Error Resolving Mail Server.\n"
-msgstr "¸ÞÀÏ ¼­¹ö¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù.\n"
+#: src/conversation.c:1768
+#, fuzzy
+msgid "Send message as: "
+msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¶§ ¼Ò¸® ³»±â"
 
-#: src/dialogs.c:231
-msgid "Error Connecting to Socket.\n"
-msgstr "¼ÒÄÏÀ» ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
-
-#: src/dialogs.c:441
+#: src/dialogs.c:360
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "%s ¿¡°Ô Á¤¸»·Î ÁÖÀǸ¦ º¸³»½Ã·Æ´Ï±î?"
 
-#: src/dialogs.c:445
+#: src/dialogs.c:364
 msgid "Warn anonymously?"
 msgstr "ÁÖÀǸ¦ À͸íÀ¸·Î º¸³¾±î¿ä?"
 
-#: src/dialogs.c:448
+#: src/dialogs.c:367
 msgid "Anonymous warnings are less harsh."
 msgstr "À͸íÀÇ ÁÖÀÇ°¡ ´ú °Å½½¸± ¼ö ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:473
+#: src/dialogs.c:393
 msgid "Gaim - Warn user?"
 msgstr "Gaim - »ç¿ëÀÚ¿¡°Ô ÁÖÀÇ º¸³»±â"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:458
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%s ÆÄÀÏ¿¡ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:544
+#: src/dialogs.c:461
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:547
+#: src/dialogs.c:464
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±æ¾î¼­ ¸¶Áö¸· %s ¹ÙÀÌÆ®°¡ ©·È½À´Ï´Ù."
 
-#: src/dialogs.c:550
+#: src/dialogs.c:467
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ´Â ÇöÀç ·Î±×ÀÎÇÏÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/dialogs.c:553
+#: src/dialogs.c:470
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s ¿¡°Ô ÁÖÀǸ¦ º¸³»´Â °ÍÀº Çã¿ëµÇÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:556
+#: src/dialogs.c:473
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "¼­¹öÀÇ ¼ÓµµÇѰ踦 ³Ñ¾ú±â ¶§¹®¿¡ ¸Þ½ÃÁö¸¦ ¹ö·È½À´Ï´Ù."
 
-#: src/dialogs.c:559
+#: src/dialogs.c:476
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s ¿¡ äÆà Âü°¡¸¦ ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:562
+#: src/dialogs.c:479
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "%s ¿¡°Ô ³Ê¹« »¡¸® ¸Þ½ÃÁö¸¦ º¸³»°í ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:565
+#: src/dialogs.c:482
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« Ä¿¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/dialogs.c:568
+#: src/dialogs.c:485
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« »¡¶ó¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/dialogs.c:571
+#: src/dialogs.c:488
 msgid "Failure."
 msgstr "½ÇÆÐ."
 
-#: src/dialogs.c:574
+#: src/dialogs.c:491
 msgid "Too many matches."
 msgstr "ÇØ´ç Ç׸ñÀÌ ³Ê¹« ¸¹½À´Ï´Ù."
 
-#: src/dialogs.c:577
+#: src/dialogs.c:494
 msgid "Need more qualifiers."
 msgstr "´õ »ó¼¼È÷ ÁöÁ¤ÇϽʽÿä."
 
-#: src/dialogs.c:580
+#: src/dialogs.c:497
 msgid "Dir service temporarily unavailable."
 msgstr "µð·ºÅ丮 ¼­ºñ½º¸¦ ÀϽÃÀûÀ¸·Î »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:583
+#: src/dialogs.c:500
 msgid "Email lookup restricted."
 msgstr "¸ÞÀÏ Ã£¾Æº¸±â¿¡ Á¦¾àÀÌ ÀÖ½À´Ï´Ù."
 
-#: src/dialogs.c:586
+#: src/dialogs.c:503
 msgid "Keyword ignored."
 msgstr "Å°¿öµå°¡ ¹«½ÃµÇ¾ú½À´Ï´Ù."
 
-#: src/dialogs.c:589
+#: src/dialogs.c:506
 msgid "No keywords."
 msgstr "Å°¿öµå°¡ ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:592
+#: src/dialogs.c:509
 msgid "User has no directory information."
 msgstr "»ç¿ëÀÚ°¡ µð·ºÅ丮 Á¤º¸¸¦ °®°í ÀÖÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:596
+#: src/dialogs.c:513
 msgid "Country not supported."
 msgstr "±¹°¡´Â Áö¿øµÇÁö ¾Ê½À´Ï´Ù."
 
-#: src/dialogs.c:599
+#: src/dialogs.c:516
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "¾Ë ¼ö ¾ø´Â ½ÇÆÐ: %s."
 
 #. Incorrect nick/password
-#: src/dialogs.c:602 src/oscar.c:318
+#: src/dialogs.c:519 src/oscar.c:471
 msgid "Incorrect nickname or password."
 msgstr "À̸§À̳ª Æнº¿öµå°¡ Ʋ·È½À´Ï´Ù."
 
-#: src/dialogs.c:605
+#: src/dialogs.c:522
 msgid "The service is temporarily unavailable."
 msgstr "Àá½Ã ¼­ºñ½º°¡ »ç¿ëºÒ°¡´ÉÇÕ´Ï´Ù."
 
-#: src/dialogs.c:608
+#: src/dialogs.c:525
 msgid "Your warning level is currently too high to log in."
 msgstr "´ç½ÅÀº ÁÖÀÇ ¼öÁØÀÌ ³ô¾î¼­ ·Î±×ÀÎ ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/dialogs.c:611
+#: src/dialogs.c:528
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -721,287 +690,332 @@
 "´ç½ÅÀº ³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°íÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã "
 "½ÃµµÇϽʽÿä. °è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
-#: src/dialogs.c:614
+#: src/dialogs.c:531
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Á¢¼Ó Áß¿¡ ¾Ë ¼ö ¾ø´Â ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù: %s."
 
-#: src/dialogs.c:617
+#: src/dialogs.c:534
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù, %d °¡ ¹ß»ýÇÏ¿´½À´Ï´Ù.  Á¤º¸´Â: %s"
 
-#: src/dialogs.c:620
+#: src/dialogs.c:537
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - ¿À·ù %d"
 
 #. Build OK Button
-#: src/dialogs.c:677 src/dialogs.c:742 src/dialogs.c:817 src/dialogs.c:1168
-#: src/dialogs.c:1491 src/dialogs.c:1777 src/dialogs.c:2110 src/dialogs.c:2272
-#: src/dialogs.c:2371
+#: 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
 msgid "OK"
 msgstr "È®ÀÎ"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:671
 #, fuzzy
 msgid "IM who:"
 msgstr "ÀνºÅÏÆ® ¸Þ½ÅÀú »ç¿ëÀÚ: "
 
-#: src/dialogs.c:776
+#: src/dialogs.c:695
 msgid "Gaim - IM user"
 msgstr "Gaim - ÀνºÅÏÆ® ¸Þ½ÅÀú »ç¿ëÀÚ"
 
-#: src/dialogs.c:813
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:746
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:851
+#: src/dialogs.c:770
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - »ç¿ëÀÚ Á¤º¸ ¼³Á¤"
 
-#: src/dialogs.c:933
+#: src/dialogs.c:845
 msgid "Buddies"
 msgstr "Ä£±¸"
 
-#: src/dialogs.c:985
+#: src/dialogs.c:898
 #, fuzzy
 msgid "Add Group"
 msgstr "±×·ì"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:928
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:1062
-msgid "Add Buddy"
-msgstr "Ä£±¸ ´õÇϱâ"
-
-#: src/dialogs.c:1064 src/dialogs.c:3368
-msgid "Buddy"
-msgstr "Ä£±¸"
-
-#: src/dialogs.c:1103
+#: src/dialogs.c:957
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ä£±¸ ´õÇϱâ"
 
-#. Put the buttons in the box
-#: src/dialogs.c:1179
-msgid "Buddy To Pounce:"
-msgstr "ºÙÀâÀ» Ä£±¸:"
+#: src/dialogs.c:967
+msgid "Add Buddy"
+msgstr "Ä£±¸ ´õÇϱâ"
+
+#: src/dialogs.c:979 src/dialogs.c:3443
+msgid "Buddy"
+msgstr "Ä£±¸"
+
+#: src/dialogs.c:1109
+#, fuzzy
+msgid "Pounce buddy as:"
+msgstr "Ä£±¸°¡ µé¾î¿À¸é ¼Ò¸® ³»±â"
+
+#: src/dialogs.c:1181
+#, fuzzy
+msgid "Buddy:"
+msgstr "Ä£±¸"
+
+#: src/dialogs.c:1189
+#, fuzzy
+msgid "Message:"
+msgstr "¸Þ½ÃÁö ¸¸µé±â"
 
-#: src/dialogs.c:1184
-msgid "Open IM Window on Buddy Logon"
+#: 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:1187
-msgid "Send IM on Buddy Logon"
+#: src/dialogs.c:1234
+#, fuzzy
+msgid "Send IM on pounce"
 msgstr "Ä£±¸°¡ Á¢¼ÓÇÒ ¶§ ¸Þ½ÃÁö º¸³»±â"
 
-#: src/dialogs.c:1195
-msgid "Message to send:"
-msgstr "º¸³¾ ¸Þ½ÃÁö:"
-
-#: src/dialogs.c:1216
+#: src/dialogs.c:1263
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ºÙÀâÀ» Ä£±¸ »õ·Î ¸¸µé±â"
 
 #. Build Save Button
-#: src/dialogs.c:1303 src/dialogs.c:1596 src/dialogs.c:3093
+#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
 msgid "Save"
 msgstr "ÀúÀå"
 
-#: src/dialogs.c:1321
+#: src/dialogs.c:1376
 msgid "Allow Web Searches To Find Your Info"
 msgstr "À¥À» ÅëÇÏ¿© ³ªÀÇ Á¤º¸¸¦ °Ë»öÇÒ ¼ö ÀÖµµ·Ï Çã¿ë"
 
 #. Line 1
-#: src/dialogs.c:1324 src/dialogs.c:2128
+#: src/dialogs.c:1379 src/dialogs.c:2159
 msgid "First Name"
 msgstr "À̸§"
 
 #. Line 2
-#: src/dialogs.c:1335 src/dialogs.c:2140
+#: src/dialogs.c:1390 src/dialogs.c:2171
 msgid "Middle Name"
 msgstr "Áß°£ À̸§"
 
 #. Line 3
-#: src/dialogs.c:1347 src/dialogs.c:2152
+#: src/dialogs.c:1402 src/dialogs.c:2183
 msgid "Last Name"
 msgstr "¼º"
 
 #. Line 4
-#: src/dialogs.c:1358 src/dialogs.c:2164
+#: src/dialogs.c:1413 src/dialogs.c:2195
 msgid "Maiden Name"
 msgstr "ó³à½ÃÀý À̸§"
 
 #. Line 5
-#: src/dialogs.c:1369 src/dialogs.c:2176
+#: src/dialogs.c:1424 src/dialogs.c:2207
 msgid "City"
 msgstr "±º/±¸"
 
 #. Line 6
-#: src/dialogs.c:1380 src/dialogs.c:2187
+#: src/dialogs.c:1435 src/dialogs.c:2218
 msgid "State"
 msgstr "½Ã/µµ"
 
 #. Line 7
-#: src/dialogs.c:1391 src/dialogs.c:2198
+#: src/dialogs.c:1446 src/dialogs.c:2229
 msgid "Country"
 msgstr "±¹°¡"
 
-#: src/dialogs.c:1436
+#: src/dialogs.c:1490
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - µð·ºÅ丮 Á¤º¸ ¼³Á¤"
 
-#: src/dialogs.c:1453
+#: src/dialogs.c:1507
 msgid "New Passwords Do Not Match"
 msgstr "»õ ¾ÏÈ£°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/dialogs.c:1453 src/dialogs.c:1458
+#: src/dialogs.c:1507 src/dialogs.c:1512
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ¾ÏÈ£ º¯°æ ½ÇÆÐ"
 
-#: src/dialogs.c:1458
+#: src/dialogs.c:1512
 msgid "Fill out all fields completely"
 msgstr "¸ðµç Ç׸ñÀ» ¿ÏÀüÈ÷ ä¿ì½Ê½Ã¿ä"
 
-#: src/dialogs.c:1500
+#: src/dialogs.c:1541
+#, fuzzy
+msgid "Change password for:"
+msgstr "Æнº¿öµå ¹Ù²Ù±â"
+
+#: src/dialogs.c:1580 src/toc.c:515
+msgid "Gaim - Password Change"
+msgstr "Gaim - ¾ÏÈ£ º¯°æ"
+
+#: src/dialogs.c:1612
 msgid "Original Password"
 msgstr "¿ø·¡ ¾ÏÈ£"
 
-#: src/dialogs.c:1516
+#: src/dialogs.c:1626
 msgid "New Password"
 msgstr "»õ ¾ÏÈ£"
 
-#: src/dialogs.c:1530
+#: src/dialogs.c:1640
 msgid "New Password (again)"
 msgstr "»õ ¾ÏÈ£ (Çѹø´õ)"
 
-#: src/dialogs.c:1567
-msgid "Gaim - Password Change"
-msgstr "Gaim - ¾ÏÈ£ º¯°æ"
+#: src/dialogs.c:1693
+msgid "Set info for:"
+msgstr ""
 
-#: src/dialogs.c:1630
+#: src/dialogs.c:1776
 msgid "Gaim - Set User Info"
 msgstr "Gaim - »ç¿ëÀÚ Á¤º¸ ¼³Á¤"
 
-#: src/dialogs.c:1786
+#: src/dialogs.c:1817
 msgid "Below are the results of your search: "
 msgstr "°Ë»öÀÇ °á°ú´Â ´ÙÀ½°ú °°½À´Ï´Ù: "
 
-#: src/dialogs.c:1918
-#, fuzzy
-msgid "Permit / Deny"
-msgstr "¸î¸í¸¸ Çã¿ë"
+#: src/dialogs.c:1943 src/dialogs.c:1950
+msgid "Permit"
+msgstr "Çã¿ë"
 
-#: src/dialogs.c:1929 src/prefs.c:471
+#: src/dialogs.c:1945 src/dialogs.c:1952
 msgid "Deny"
 msgstr "°ÅºÎ"
 
-#: src/dialogs.c:1934 src/prefs.c:455 src/prefs.c:512
-msgid "Permit"
-msgstr "Çã¿ë"
-
-#: src/dialogs.c:1975
-msgid "Gaim - Add Permit/Deny"
+#: src/dialogs.c:1993
+#, fuzzy
+msgid "Gaim - Add Permit"
 msgstr "Gaim - Çã¿ë/°ÅºÎ ¸ñ·Ï¿¡ ´õÇϱâ"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:1995
+#, fuzzy
+msgid "Gaim - Add Deny"
+msgstr "Gaim - Çã¿ë/°ÅºÎ ¸ñ·Ï¿¡ ´õÇϱâ"
+
+#: src/dialogs.c:2057
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ´ëÈ­ ·Î±ë"
 
-#: src/dialogs.c:2235
+#: src/dialogs.c:2266
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Á¤º¸·Î Ä£±¸ ã±â"
 
-#: src/dialogs.c:2282
+#: src/dialogs.c:2315
 msgid "Email"
 msgstr "¸ÞÀÏ"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2328
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ¸ÞÀϷΠģ±¸ ã±â"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2410
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2393
+#: src/dialogs.c:2418
 msgid "Description"
 msgstr "¼³¸í"
 
-#: src/dialogs.c:2419
+#: src/dialogs.c:2444
 msgid "GAIM - Add URL"
 msgstr "GAIM - URL ´õÇϱâ"
 
-#: src/dialogs.c:2562 src/dialogs.c:2575 src/dialogs.c:2612
+#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
 msgid "Select Text Color"
 msgstr "±Û¾¾ »ö±ò ¼±ÅÃ"
 
-#: src/dialogs.c:2599
+#: src/dialogs.c:2624
 #, fuzzy
 msgid "Select Background Color"
 msgstr "±Û¾¾ »ö±ò ¼±ÅÃ"
 
-#: src/dialogs.c:2824 src/rvous.c:220
+#: src/dialogs.c:2847 src/rvous.c:265
 #, c-format
 msgid "Error writing file %s"
 msgstr "%s ÆÄÀÏ¿¡ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: src/dialogs.c:2841
+#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
+#: src/rvous.c:548
+msgid "Error"
+msgstr "¿À·ù"
+
+#: src/dialogs.c:2901
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï ³»º¸³»±â"
 
-#: src/dialogs.c:2894 src/rvous.c:491
+#: src/dialogs.c:2967 src/rvous.c:547
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s ÆÄÀÏ¿¡¼­ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: src/dialogs.c:2973
+#: src/dialogs.c:3045
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Ä£±¸ ¸ñ·Ï °¡Á®¿À±â"
 
-#: src/dialogs.c:3054
+#: src/dialogs.c:3124
 msgid "Gaim - New away message"
 msgstr "Gaim - Àá¼ö ¸Þ½ÃÁö »õ·Î ¸¸µé±â"
 
-#. Set up our frame
-#: src/dialogs.c:3061
+#. Put frame and button-box in the toplevel
+#: src/dialogs.c:3136
 #, fuzzy
 msgid "New away message"
 msgstr "»õ·Î¿î Àá¼ö ¸Þ½ÃÁö"
 
-#. Make a label for away entry
-#: src/dialogs.c:3071
+#: src/dialogs.c:3149
 msgid "Away title: "
 msgstr "Á¦¸ñ: "
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3121
+#: src/dialogs.c:3193
 #, fuzzy
 msgid "Make Away Now"
 msgstr "Áö±Ý ¹Ù·Î Àá¼ö"
 
 #. show everything
-#: src/dialogs.c:3299
+#: src/dialogs.c:3370
 #, fuzzy
 msgid "Smile!"
 msgstr "ÆÄÀÏ"
 
-#: src/dialogs.c:3366
+#: src/dialogs.c:3441
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ä£±¸ ´õÇϱâ"
 
-#: src/dialogs.c:3404
+#: src/dialogs.c:3478
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Ä£±¸ ´õÇϱâ"
@@ -1011,19 +1025,19 @@
 msgid "file not found: %s\n"
 msgstr "ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: src/gnome_applet_mgr.c:122
+#: src/gnome_applet_mgr.c:121
 msgid "Offilne. Click to bring up login box."
 msgstr "Á¢¼ÓµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù. Ŭ¸¯ÇÏ¸é ·Î±×ÀÎ È­¸éÀÌ ³ª¿É´Ï´Ù."
 
-#: src/gnome_applet_mgr.c:129
+#: src/gnome_applet_mgr.c:128
 msgid "Attempting to sign on...."
 msgstr "Á¢¼ÓÀ» ½ÃµµÇÕ´Ï´Ù...."
 
-#: src/gnome_applet_mgr.c:252
+#: src/gnome_applet_mgr.c:254
 msgid "GAIM"
 msgstr "GAIM"
 
-#: src/gnome_applet_mgr.c:364
+#: src/gnome_applet_mgr.c:366
 msgid "Can't create GAIM applet!"
 msgstr "GAIM ¾ÖÇø´À» ¸¸µé ¼ö ¾ø½À´Ï´Ù!"
 
@@ -1031,117 +1045,180 @@
 msgid "Offline"
 msgstr "²÷±è"
 
-#: src/gnome_applet_mgr.c:408
+#: src/gnome_applet_mgr.c:411
 msgid "Font does not exist"
 msgstr "±Û²ÃÀÌ ¾ø½À´Ï´Ù"
 
-#: src/gnome_applet_mgr.c:424
+#: src/gnome_applet_mgr.c:427
 msgid "About..."
 msgstr "...¿¡ ´ëÇÏ¿©"
 
-#: src/gtkhtml.c:1385
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "HTML ¿¬°á:"
 
-#: src/gtkhtml.c:1798
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "ÇöÀç â¿¡¼­ URL ¿­±â"
 
-#: src/gtkhtml.c:1807
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "»õ â¿¡¼­ URL ¿­±â"
 
-#: src/gtkhtml.c:1815
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "Áñ°Üã±â¿¡ URL ´õÇϱâ"
 
-#: src/html.c:120
-msgid "g001: Error resolving host\n"
-msgstr "g001: È£½ºÆ® ã±â ¿À·ù\n"
-
-#: src/html.c:122
+#: src/html.c:122 src/html.c:125
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ¿¬°á ¿À·ù.\n"
 
-#: src/html.c:154
+#: src/html.c:158
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "%d ¹ÙÀÌÆ®¸¦ %s ¿¡¼­ °¡Á®¿È"
 
-#: src/html.c:167
+#: src/html.c:171
 msgid "Getting Data"
 msgstr "µ¥ÀÌÅÍ °¡Á®¿À±â"
 
-#: src/html.c:200
+#: src/html.c:204
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "¹ÞÀº³»¿ë: '%s'\n"
 
-#: src/oscar.c:157 src/oscar.c:184
+#: src/multi.c:367 src/prefs.c:112
+#, fuzzy
+msgid "General Options"
+msgstr "¿É¼Ç"
+
+#: src/multi.c:402
+#, fuzzy
+msgid "Screenname:"
+msgstr "È­¸éÀ̸§: "
+
+#: src/multi.c:414
+#, fuzzy
+msgid "Password:"
+msgstr "¾ÏÈ£: "
+
+#: src/multi.c:429
+msgid "Remember Password"
+msgstr "¾ÏÈ£ ÀúÀå"
+
+#: src/multi.c:430
+#, fuzzy
+msgid "Auto-Login"
+msgstr "ÀÚµ¿ ·Î±×ÀÎ"
+
+#: src/multi.c:431
+msgid "Send KeepAlive packet (6 bytes/second)"
+msgstr ""
+
+#: src/multi.c:473
+#, fuzzy
+msgid "Gaim - Modify Account"
+msgstr "Gaim - ·Î±×ÀÎ"
+
+#: src/multi.c:482
+msgid "Modify Account"
+msgstr ""
+
+#: src/multi.c:576
+#, fuzzy
+msgid "Enter Password"
+msgstr "»õ ¾ÏÈ£"
+
+#: src/multi.c:669
+#, fuzzy
+msgid "Gaim - Account Editor"
+msgstr "Gaim - Ç÷¯±×ÀÎ ¸ñ·Ï"
+
+#: src/multi.c:678
+msgid "Account Editor"
+msgstr ""
+
+#: src/multi.c:697
+msgid "Modify"
+msgstr ""
+
+#: src/multi.c:701
+#, fuzzy
+msgid "Sign On/Off"
+msgstr "²÷±â"
+
+#: src/multi.c:705
+#, fuzzy
+msgid "Delete"
+msgstr "±Û²Ã ¼±ÅÃ"
+
+#: src/multi.c:851
+#, 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
 msgid "Disconnected."
 msgstr "²÷¾îÁü."
 
-#: src/oscar.c:165
+#: src/oscar.c:308
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "Á¢¼Ó ¿À·ù!\n"
 
-#: src/oscar.c:182
+#: src/oscar.c:316
 #, fuzzy
 msgid "major connection error\n"
 msgstr "Á¢¼Ó ¿À·ù!\n"
 
-#: src/oscar.c:196
+#: src/oscar.c:330 src/toc.c:500
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:197
+#: src/oscar.c:331
 #, fuzzy
 msgid "Chat Error!"
 msgstr "¿À·ù"
 
-#: src/oscar.c:220
+#: src/oscar.c:362
 #, c-format
 msgid "Logging in %s\n"
 msgstr "%s ¿¡ Á¢¼Ó\n"
 
-#: src/oscar.c:230
-#, c-format
-msgid "Looking up %s"
-msgstr "%s ¸¦ ã¾Æº½"
-
-#: src/oscar.c:235
+#: src/oscar.c:399
 msgid "internal connection error\n"
 msgstr "³»ºÎ Á¢¼Ó ¿À·ù\n"
 
-#: src/oscar.c:240
+#: src/oscar.c:400
 msgid "Unable to login to AIM"
 msgstr "AIM ¿¡ ·Î±×ÀÎÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/oscar.c:248
-msgid "couldn't resolve host\n"
+#: src/oscar.c:405
+#, fuzzy
+msgid "couldn't resolve host"
 msgstr "È£½ºÆ®¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: src/oscar.c:252
-msgid "couldn't connect to host\n"
+#: src/oscar.c:409
+#, fuzzy
+msgid "couldn't connect to host"
 msgstr "È£½ºÆ®¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: src/oscar.c:258
+#: src/oscar.c:416
 #, c-format
 msgid "Signon: %s"
 msgstr "Á¢¼Ó: %s"
 
-#: src/oscar.c:283
+#: src/oscar.c:426
 msgid "Password sent, waiting for response\n"
 msgstr "¾ÏÈ£¸¦ º¸³»°í ÀÀ´äÀ» ±â´Ù¸³´Ï´Ù\n"
 
-#: src/oscar.c:299
+#: src/oscar.c:451
 msgid "Signed off.\n"
 msgstr "Á¢¼Ó ²÷±â.\n"
 
 #. connecting too frequently
-#: src/oscar.c:313
+#: src/oscar.c:466
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1150,79 +1227,112 @@
 "´ç½ÅÀº ³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°íÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã "
 "½ÃµµÇϽʽÿä. °è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
-#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:761
-#: src/oscar.c:766 src/oscar.c:788 src/oscar.c:807 src/oscar.c:831
-#, fuzzy
-msgid "Gaim - Error"
-msgstr "Gaim - ¿À·ù %d"
-
 #. client too old
-#: src/oscar.c:323
+#: src/oscar.c:476
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:338
+#: src/oscar.c:480 src/toc.c:303
 msgid "Authentication Failed"
 msgstr "ÀÎÁõ ½ÇÆÐ"
 
-#: src/oscar.c:362
+#: src/oscar.c:513
 msgid "Internal Error"
 msgstr "³»ºÎ ¿À·ù"
 
-#: src/oscar.c:370
+#: src/oscar.c:520
 msgid "Could Not Connect"
 msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/oscar.c:401
+#: src/oscar.c:551
 msgid "Connection established, cookie sent"
 msgstr "¿¬°áÇÏ°í ÄíÅ°¸¦ º¸³Â½À´Ï´Ù"
 
-#: src/oscar.c:632
-msgid "Accept Direct IM?"
+#: src/oscar.c:787 src/oscar.c:1860
+#, 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:642
-#, c-format
-msgid "%s has requested to directly connect to your computer. Do you accept?"
+#: 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:652 src/rvous.c:635
-msgid "Accept"
-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:760
+#: src/oscar.c:1194
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« Ä¿¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/oscar.c:765
+#: 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
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:786
+#: src/oscar.c:1220
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:787 src/oscar.c:806
+#: src/oscar.c:1221 src/oscar.c:1240
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:805
+#: src/oscar.c:1239
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:830
+#: src/oscar.c:1265
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:836
+#: src/oscar.c:1271
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1234,610 +1344,706 @@
 "<BR>Á¢¼ÓÇÑ ¶§ : <B>%s</B><BR>¸îºÐ° ³î°íÀÖ³ª : <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/oscar.c:869
+#: src/oscar.c:1305
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:870
+#: src/oscar.c:1306
 msgid "AOL error"
 msgstr ""
 
-#: src/plugins.c:103
+#: src/oscar.c:1913
+#, fuzzy, c-format
+msgid "<B>Direct IM with %s closed</B>"
+msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
+
+#: src/oscar.c:1958
+#, 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
+#, fuzzy
+msgid "Get Away Msg"
+msgstr "Àá¼ö ¸Þ½ÃÁö"
+
+#: src/oscar.c:1982
+#, fuzzy
+msgid "Direct IM"
+msgstr "µð·ºÅ丮 Á¤º¸"
+
+#. Below is basically stolen from plugins.c
+#: src/perl.c:639
+#, fuzzy
+msgid "Gaim - Select Perl Script"
+msgstr "Gaim - »ç¿ëÀÚ Á¤º¸ ¼³Á¤"
+
+#: src/perl.c:686
+msgid "Perl Scripts"
+msgstr ""
+
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Ç÷¯±×ÀÎ ¸ñ·Ï"
 
-#: src/plugins.c:155
-#, c-format
-msgid "Already loaded %s, not reloading.\n"
-msgstr ""
-
-#: src/plugins.c:177 src/plugins.c:185 src/plugins.c:217
+#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
 msgid "Plugin Error"
 msgstr "Ç÷¯±×ÀÎ ¿À·ù"
 
-#: src/plugins.c:265
+#: src/plugins.c:262
 msgid "Gaim - Plugins"
 msgstr "Gaim - Ç÷¯±×ÀÎ"
 
 #. Build the bottom button bar
-#: src/plugins.c:297
+#: src/plugins.c:294
 msgid "Load Plugin"
 msgstr "Ç÷¯±×ÀÎ ¿Ã¸®±â"
 
-#: src/plugins.c:304
+#: src/plugins.c:301
 msgid "Configure Plugin"
 msgstr "Ç÷¯±×ÀÎ ¼³Á¤"
 
-#: src/plugins.c:310
+#: src/plugins.c:307
 msgid "Unload Plugin"
 msgstr "Ç÷¯±×ÀÎ ³»¸®±â"
 
-#: src/prefs.c:93
-#, fuzzy
-msgid "General Options"
-msgstr "¿É¼Ç"
-
-#: src/prefs.c:100 src/prefs.c:358 src/prefs.c:387 src/prefs.c:414
-#: src/prefs.c:614 src/prefs.c:701 src/prefs.c:810 src/prefs.c:895
-#: src/prefs.c:1288 src/prefs.c:1373 src/prefs.c:1404 src/prefs.c:1691
+#: 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
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:104
-#, fuzzy
-msgid "Remember password"
-msgstr "¾ÏÈ£ ÀúÀå"
-
-#: src/prefs.c:106
-msgid "Auto-login"
-msgstr "ÀÚµ¿ ·Î±×ÀÎ"
-
-#: src/prefs.c:112
+#.
+#. 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
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:113
+#: src/prefs.c:135
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:116
+#: src/prefs.c:138
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:124
+#: 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
 #, fuzzy
-msgid "Report Idle Times"
+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
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "ÀϺΠâÀÇ Å©±â/À§Ä¡ ÀúÀå"
+
 #: src/prefs.c:202
 #, fuzzy
-msgid "Connection Options"
-msgstr "¿¬°á"
-
-#: src/prefs.c:210
-msgid ""
-"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
-"other is TOC.\n"
-"\n"
-"TOC is a published protocol; AOL allows people to use the TOC protocol in "
-"their clients to connect. It is a simplified version of Oscar; it is capable "
-"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
-"is published, using TOC in gaim tends to be more stable and reliable.\n"
-"\n"
-"Oscar is a proprietary protocol. AOL has not published any information about "
-"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
-"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
-"or implemented all of the functions of Oscar, it is still able to perform "
-"most functions TOC provides as well as several others. However, using Oscar "
-"in gaim tends to be less reliable, though more usable.\n"
-"\n"
-"Changing this option takes effect at signon time."
-msgstr ""
-
-#: src/prefs.c:216
-msgid "Use Oscar Protocol"
-msgstr ""
-
-#: src/prefs.c:222
-msgid "Send Keep-Alive Packet (6 bytes/minute)"
-msgstr ""
-
-#: src/prefs.c:239 src/prefs.c:2016
-#, fuzzy
-msgid "TOC Options"
-msgstr "¿É¼Ç"
-
-#: src/prefs.c:251
-msgid "TOC Host:"
-msgstr "TOC È£½ºÆ®:"
+msgid "Automatically show buddy list on sign on"
+msgstr "Ä£±¸ ¸ñ·ÏÀ» ÀÚµ¿À¸·Î º¸¿©ÁÜ"
 
-#: src/prefs.c:261 src/prefs.c:286 src/prefs.c:320
-msgid "Port:"
-msgstr "Æ÷Æ®:"
-
-#: src/prefs.c:276
-msgid "Login Host:"
-msgstr "·Î±×ÀΠȣ½ºÆ®:"
-
-#: src/prefs.c:297
-msgid "No Proxy"
-msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
-
-#: src/prefs.c:298
-msgid "HTTP Proxy"
-msgstr "HTTP ÇÁ·Ï½Ã"
-
-#: src/prefs.c:299
-#, fuzzy
-msgid "Socks 4 Proxy"
-msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
-
-#: src/prefs.c:300
-#, fuzzy
-msgid "Socks 5 Proxy"
-msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
-
-#: src/prefs.c:306
-msgid "Proxy Host:"
-msgstr "ÇÁ·Ï½Ã È£½ºÆ®:"
-
-#: src/prefs.c:351 src/prefs.c:2021
-#, fuzzy
-msgid "Oscar Options"
-msgstr "¿É¼Ç"
-
-#: src/prefs.c:362
-msgid "No options currently (Isn't that sad)"
-msgstr ""
-
-#: src/prefs.c:380
-#, fuzzy
-msgid "Applet Options"
-msgstr "¿É¼Ç"
-
-#: src/prefs.c:391
+#: src/prefs.c:203
 #, fuzzy
 msgid "Display Buddy List near applet"
 msgstr "Ä£±¸ ¸ñ·ÏÀº ¾ÖÇø´ ºÎ±Ù¿¡ Ç¥½Ã"
 
-#: src/prefs.c:407
-#, fuzzy
-msgid "Buddy List Options"
-msgstr "Ä£±¸ ¸ñ·Ï"
-
-#: src/prefs.c:418
-msgid "Show numbers in groups"
-msgstr "±×·ì¿¡ Àοø Ç¥½Ã"
-
-#: src/prefs.c:419
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:420
-msgid "Show idle times"
-msgstr "³î°í ÀÖ´Â ½Ã°£ º¸¿©ÁÖ±â"
-
-#: src/prefs.c:421
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "Ä£±¸ Á¾·ù ±×¸² º¸¿©ÁÖ±â"
-
-#: src/prefs.c:427
-msgid "Hide IM/Info/Chat buttons"
-msgstr ""
-
-#: src/prefs.c:428
-msgid "Show pictures on buttons"
-msgstr ""
-
-#: src/prefs.c:434
-#, fuzzy
-msgid "Save Window Size/Position"
-msgstr "ÀϺΠâÀÇ Å©±â/À§Ä¡ ÀúÀå"
-
-#: src/prefs.c:436
-#, fuzzy
-msgid "Automatically show buddy list on sign on"
-msgstr "Ä£±¸ ¸ñ·ÏÀ» ÀÚµ¿À¸·Î º¸¿©ÁÜ"
-
-#: src/prefs.c:586
-msgid "Please sign on before editing the permit/deny lists."
-msgstr ""
-
-#: src/prefs.c:587
-msgid "Please sign on"
-msgstr ""
-
-#: src/prefs.c:607
-msgid "Permit/Deny List Options"
-msgstr ""
-
-#: src/prefs.c:622
-msgid ""
-"The permit/deny configuration will change between users,\n"
-"and changes while you are signed off will not be saved."
-msgstr ""
-
-#: src/prefs.c:635
-#, fuzzy
-msgid "Allow Anyone"
-msgstr "´©±¸µçÁö Çã¿ë"
-
-#. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
-#. * and merging the two would be very difficult at best, most likely
-#. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:640
-msgid "Allow only users on Buddy List"
-msgstr ""
-
-#: src/prefs.c:642
-msgid "Allow only the users in \"Permit\""
-msgstr ""
-
-#: src/prefs.c:648
-msgid "Block all users"
-msgstr ""
-
-#: src/prefs.c:649
-msgid "Block the users in \"Deny\""
-msgstr ""
-
-#: src/prefs.c:694
+#: src/prefs.c:219
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:705
+#: src/prefs.c:231
 msgid "Enter sends message"
 msgstr "¿£ÅÍÅ°¸¦ ´©¸£¸é ¸Þ½ÃÁö º¸³»±â"
 
-#: src/prefs.c:706
+#: src/prefs.c:232
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:707
+#: src/prefs.c:233
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:713
+#: src/prefs.c:239
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "±Û¾¾±×¸²À» ±×¸²À¸·Î º¸¿©ÁÖ±â (½ÇÇè¼öÁØ)"
 
-#: src/prefs.c:714
+#: src/prefs.c:240
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "¸Þ½ÃÁö¿¡ ½Ã°£ Ç¥½Ã"
 
-#: src/prefs.c:715
+#: src/prefs.c:241
 #, fuzzy
 msgid "Ignore incoming colors"
 msgstr "º¸³»¿À´Â »ö±òÀº ¹«½Ã"
 
-#: src/prefs.c:716
+#: src/prefs.c:242
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:722
+#: src/prefs.c:248
 #, fuzzy
 msgid "Log all conversations"
 msgstr "¸ðµç ´ëÈ­¸¦ ·Î±ë"
 
-#: src/prefs.c:723
+#: src/prefs.c:249
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "·Î±× ÆÄÀÏ¿¡ HTML Àº »©°í ´ã±â"
 
-#: src/prefs.c:729
+#: src/prefs.c:255
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Ʋ¸° öÀÚ ÀÚµ¿À¸·Î Ç¥½Ã"
 
-#: src/prefs.c:730
+#: src/prefs.c:256
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "URL À» ¸µÅ©·Î º¸³»±â"
 
-#: src/prefs.c:731
+#: src/prefs.c:257
 msgid "Sending messages removes away status"
 msgstr "¸Þ½ÃÁö¸¦ º¸³»¸é Àá¼ö¿¡¼­ ³ª¿À±â"
 
-#: src/prefs.c:772 src/prefs.c:857
+#: src/prefs.c:298 src/prefs.c:386
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:777 src/prefs.c:862
+#: src/prefs.c:303 src/prefs.c:391
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:782 src/prefs.c:867
+#: src/prefs.c:308 src/prefs.c:396
 #, fuzzy
 msgid "Text Only"
 msgstr "±Û¾¾ »ö±ò"
 
-#: src/prefs.c:803
+#: src/prefs.c:331
 #, fuzzy
 msgid "IM Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:814
+#: src/prefs.c:343
 #, fuzzy
 msgid "Show logins in window"
 msgstr "´ëȭâ¿¡¼­ ·Î±×¿Â/¿ÀÇÁ º¸¿©ÁÖ±â"
 
-#: src/prefs.c:820 src/prefs.c:905
+#: src/prefs.c:349 src/prefs.c:435
 #, fuzzy
 msgid "Show buttons as "
 msgstr "¹öÆ° ±×¸² º¸¿©ÁÖ±â"
 
-#: src/prefs.c:829 src/prefs.c:915
+#: src/prefs.c:358 src/prefs.c:445
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:830 src/prefs.c:916
+#: src/prefs.c:359 src/prefs.c:446
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é âÀ» ¾ÕÀ¸·Î"
 
-#: src/prefs.c:831 src/prefs.c:1611
+#: src/prefs.c:360
 msgid "Ignore new conversations when away"
 msgstr "Àá¼öÁß¿¡´Â »õ·Î¿î ´ëÈ­ ¹«½Ã"
 
-#: src/prefs.c:832
+#: src/prefs.c:361
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "¸Þ½ÃÁö ¸¸µé±â"
 
-#: src/prefs.c:888 src/prefs.c:1090
+#: src/prefs.c:417 src/prefs.c:620
 #, fuzzy
 msgid "Chat Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:899
+#: src/prefs.c:429
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:947 src/prefs.c:949 src/prefs.c:1161 src/prefs.c:1163
+#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
 msgid "Gaim Chat"
 msgstr "Gaim äÆÃ"
 
-#: src/prefs.c:1107
+#: src/prefs.c:638
 msgid "Refresh"
 msgstr "°»½Å"
 
-#: src/prefs.c:1135
+#: src/prefs.c:666
 msgid "List of available chats"
 msgstr "°¡´ÉÇÑ Ã¤ÆÃÀÇ ¸ñ·Ï"
 
-#: src/prefs.c:1149
+#: src/prefs.c:680
 msgid "List of subscribed chats"
 msgstr "°¡ÀÔÇÑ Ã¤ÆÃÀÇ ¸ñ·Ï"
 
-#: src/prefs.c:1281 src/prefs.c:2082
+#: src/prefs.c:806 src/prefs.c:2084
 #, fuzzy
 msgid "Font Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:1294
+#: src/prefs.c:820
 msgid "Underlined Text"
 msgstr "¹ØÁÙÄ£ ±Û¾¾"
 
-#: src/prefs.c:1295
+#: src/prefs.c:821
 msgid "Strike Text"
 msgstr "°¡¿îµ¥ ÁÙÄ£ ±Û¾¾"
 
-#: src/prefs.c:1308 src/prefs.c:1325 src/prefs.c:1345
+#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
 #, fuzzy
 msgid "Select"
 msgstr "±Û²Ã ¼±ÅÃ"
 
-#: src/prefs.c:1343
+#: src/prefs.c:869
 msgid "Font Face for Text"
 msgstr "±Û¾¾¿¡ »ç¿ëÇÒ ±Û²Ã"
 
-#: src/prefs.c:1366
+#: src/prefs.c:892
 #, fuzzy
 msgid "Sound Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:1378
-msgid "Sounds go through GNOME"
-msgstr "±×³ðÀ» ÀÌ¿ëÇÏ¿© ¼Ò¸®³»±â"
-
-#: src/prefs.c:1380
+#: src/prefs.c:904
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Ä£±¸°¡ µé¾î¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1381 src/prefs.c:1612
+#: src/prefs.c:905 src/prefs.c:1296
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1382
+#: src/prefs.c:906
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1397
+#: src/prefs.c:968
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - ´ëÈ­ ·Î±ë"
+
+#: src/prefs.c:1002
+#, fuzzy
+msgid "Reset"
+msgstr "µî·Ï"
+
+#: src/prefs.c:1007
+#, fuzzy
+msgid "Choose"
+msgstr "´Ý±â"
+
+#: src/prefs.c:1035
 #, fuzzy
 msgid "Sound Events"
 msgstr "¼Ò¸®"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1047
 msgid "Sound when buddy logs in"
 msgstr "Ä£±¸°¡ µé¾î¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1409
+#: src/prefs.c:1048
 msgid "Sound when buddy logs out"
 msgstr "Ä£±¸°¡ ³ª°¡¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1415
+#: src/prefs.c:1054
 msgid "Sound when message is received"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1416
+#: src/prefs.c:1055
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1417
+#: src/prefs.c:1056
 msgid "Sound when message is sent"
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1423
+#: src/prefs.c:1062
 #, fuzzy
-msgid "Sound in chat rooms when people enter/leave"
+msgid "Sound in chat rooms when people enter"
+msgstr "äÆù濡 »ç¶÷µéÀÌ µå³ªµé ¶§ ¼Ò¸® ³»±â"
+
+#: src/prefs.c:1063
+#, fuzzy
+msgid "Sound in chat rooms when people leave"
 msgstr "äÆù濡 »ç¶÷µéÀÌ µå³ªµé ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1064
 #, fuzzy
-msgid "Sound in chat rooms when people talk"
+msgid "Sound in chat rooms when you talk"
 msgstr "»ç¶÷µéÀÌ Ã¤Æù濡¼­ ¾ê±âÇÒ ¶§ ¼Ò¸® ³»±â"
 
-#: src/prefs.c:1509 src/prefs.c:2109
+#: src/prefs.c:1065
+#, fuzzy
+msgid "Sound in chat rooms when others talk"
+msgstr "»ç¶÷µéÀÌ Ã¤Æù濡¼­ ¾ê±âÇÒ ¶§ ¼Ò¸® ³»±â"
+
+#: src/prefs.c:1197 src/prefs.c:2111
 #, fuzzy
 msgid "Away Messages"
 msgstr "»õ·Î¿î Àá¼ö ¸Þ½ÃÁö"
 
-#: src/prefs.c:1525
+#: src/prefs.c:1209
 #, fuzzy
 msgid "Title"
 msgstr "ÆÄÀÏ"
 
-#: src/prefs.c:1529
+#: src/prefs.c:1213
 #, fuzzy
 msgid "Message"
 msgstr "¸Þ½ÃÁö ¸¸µé±â"
 
-#: src/prefs.c:1569
+#: src/prefs.c:1253
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1573
+#: src/prefs.c:1257
 #, fuzzy
 msgid "Make Away"
 msgstr "Áö±Ý ¹Ù·Î Àá¼ö"
 
-#: src/prefs.c:1684
+#: src/prefs.c:1295
+#, fuzzy
+msgid "Ignore new conversations when away   "
+msgstr "Àá¼öÁß¿¡´Â »õ·Î¿î ´ëÈ­ ¹«½Ã"
+
+#: src/prefs.c:1306
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1318
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1400
 #, fuzzy
 msgid "Browser Options"
 msgstr "¿É¼Ç"
 
-#: src/prefs.c:1695
+#: src/prefs.c:1412
 msgid "Netscape"
 msgstr "³Ý½ºÄÉÀÌÇÁ"
 
-#: src/prefs.c:1696
+#: src/prefs.c:1413
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1698
+#: src/prefs.c:1415
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1700
-#, fuzzy
-msgid "Internal HTML Widget (Quite likely a bad idea!)"
-msgstr "³»Àå HTML À§Á¬ (ÁÁÀº »ý°¢ÀÌ ¾Æ³Ä!)"
-
-#: src/prefs.c:1701
+#: src/prefs.c:1417
 msgid "Manual"
 msgstr "¼öµ¿"
 
-#: src/prefs.c:1710
+#: src/prefs.c:1426
 msgid "Pop up new window by default"
 msgstr "±âº»À¸·Î »õ â ¿­±â"
 
-#: src/prefs.c:1755
+#: src/prefs.c:1641
+#, fuzzy
+msgid "Privacy Options"
+msgstr "¿É¼Ç"
+
+#: src/prefs.c:1657
+msgid "Set privacy for:"
+msgstr ""
+
+#: src/prefs.c:1677
+msgid "Allow all users to contact me"
+msgstr ""
+
+#: src/prefs.c:1678
+msgid "Allow only the users below"
+msgstr ""
+
+#: src/prefs.c:1680
+msgid "Allow List"
+msgstr ""
+
+#: src/prefs.c:1712
+#, fuzzy
+msgid "Deny all users"
+msgstr "¸î¸í¸¸ °ÅºÎ"
+
+#: src/prefs.c:1713
+msgid "Block the users below"
+msgstr ""
+
+#: src/prefs.c:1715
+#, fuzzy
+msgid "Block List"
+msgstr "Â÷´Ü"
+
+#: src/prefs.c:1791
 msgid "Gaim - Preferences"
 msgstr "Gaim - ¼³Á¤"
 
-#: src/prefs.c:1843
+#: src/prefs.c:1877
 msgid "GAIM debug output window"
 msgstr "GAIM µð¹ö±ë Ãâ·Ââ"
 
-#: src/prefs.c:1998
+#: src/prefs.c:2040
 msgid "General"
 msgstr "ÀϹÝ"
 
-#: src/prefs.c:2011
-msgid "Connection"
-msgstr "¿¬°á"
-
-#: src/prefs.c:2033
-msgid "Applet"
-msgstr "¾ÖÇø´"
-
-#. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:2051
-#, fuzzy
-msgid "Permit/Deny"
-msgstr "¸î¸í¸¸ Çã¿ë"
-
-#: src/prefs.c:2062
+#: src/prefs.c:2064
 #, fuzzy
 msgid "Conversations"
 msgstr "¸ðµç ´ëÈ­¸¦ ·Î±ë"
 
-#: src/prefs.c:2067
+#: src/prefs.c:2069
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2072
+#: src/prefs.c:2074
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2077
+#: src/prefs.c:2079
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:2093
+#: src/prefs.c:2095
 msgid "Sounds"
 msgstr "¼Ò¸®"
 
-#: src/prefs.c:2098
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2120
+#: src/prefs.c:2122
 msgid "Browser"
 msgstr "ºê¶ó¿ìÀú"
 
-#: src/rvous.c:108
+#: src/prefs.c:2133
+msgid "Privacy"
+msgstr ""
+
+#: src/rvous.c:148
 msgid "Gaim - Save As..."
 msgstr "Gaim - »õ À̸§À¸·Î ÀúÀå"
 
-#: src/rvous.c:269
+#: src/rvous.c:317
 #, c-format
 msgid "Receiving %s from %s"
 msgstr "%s ¸¦ %s ¿¡¼­ ¹ÞÀ½"
 
-#: src/rvous.c:285 src/rvous.c:422
-msgid "Gaim - File Transfer"
-msgstr "Gaim - ÆÄÀÏ Àü¼Û"
+#: src/rvous.c:693
+msgid "Accept"
+msgstr "Á¢¼ö"
 
-#: src/rvous.c:406
-#, c-format
-msgid "Sending %s to %s"
-msgstr "%s ¸¦ %s ¿¡°Ô º¸³¿"
-
-#: src/rvous.c:662
+#: src/rvous.c:720
 #, c-format
 msgid "%s requests you to accept the file: %s (%d bytes)"
 msgstr "%s °¡ ´ç½ÅÀÌ ÆÄÀÏÀ» Á¢¼öÇϱ⸦ ¿äûÇÏ¿´½À´Ï´Ù : %s (%d ¹ÙÀÌÆ®)"
 
-#: src/rvous.c:665
+#: src/rvous.c:723
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s °¡ ´ç½Å¿¡°Ô ÆÄÀÏÀ» º¸³»´Þ¶ó°í ¿äûÇÏ¿´½À´Ï´Ù"
 
-#: src/rvous.c:675
+#: src/rvous.c:733
 msgid "Gaim - File Transfer?"
 msgstr "Gaim - ÆÄÀÏÀ» Àü¼ÛÇÒ±î¿ä?"
 
-#~ msgid "Permit some"
+#: src/server.c:581
+msgid "Yes"
+msgstr ""
+
+#: src/server.c:582
+msgid "No"
+msgstr ""
+
+#: src/toc.c:253 src/toc.c:260
+#, fuzzy
+msgid "Connection Closed"
+msgstr "¿¬°á"
+
+#: src/toc.c:295
+msgid "Waiting for reply..."
+msgstr ""
+
+#: src/toc.c:354
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr ""
+
+#: src/toc.c:355
+msgid "TOC Resume"
+msgstr ""
+
+#: src/toc.c:515
+#, fuzzy
+msgid "Password Change Successeful"
+msgstr "Gaim - ¾ÏÈ£ º¯°æ"
+
+#: src/toc.c:518
+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
+msgid "TOC Pause"
+msgstr ""
+
+#: src/toc.c:977
+#, fuzzy
+msgid "Get Dir Info"
+msgstr "µð·ºÅ丮 Á¤º¸"
+
+#~ msgid "You must give your password"
+#~ msgstr "Æнº¿öµå¸¦ ÀÔ·ÂÇϼž߸¸ ÇÕ´Ï´Ù"
+
+#~ msgid "%d/%d Buddies Online"
+#~ msgstr "ÇöÀç Á¢¼ÓµÈ Ä£±¸´Â %d/%d"
+
+#~ msgid "Toggle Logging"
+#~ msgstr "·Î±ë ¼±ÅÃ"
+
+#, fuzzy
+#~ msgid "%sChat"
+#~ msgstr "äÆÃ"
+
+#~ msgid "Message too long, some data truncated."
+#~ msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±æ¾î¼­ ¾à°£ ©·È½À´Ï´Ù."
+
+#~ msgid "Error Resolving Mail Server.\n"
+#~ msgstr "¸ÞÀÏ ¼­¹ö¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù.\n"
+
+#~ msgid "Buddy To Pounce:"
+#~ msgstr "ºÙÀâÀ» Ä£±¸:"
+
+#~ msgid "Message to send:"
+#~ msgstr "º¸³¾ ¸Þ½ÃÁö:"
+
+#, fuzzy
+#~ msgid "Permit / Deny"
 #~ msgstr "¸î¸í¸¸ Çã¿ë"
 
-#~ msgid "Deny some"
-#~ msgstr "¸î¸í¸¸ °ÅºÎ"
+#~ msgid "g001: Error resolving host\n"
+#~ msgstr "g001: È£½ºÆ® ã±â ¿À·ù\n"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s ¸¦ ã¾Æº½"
+
+#, fuzzy
+#~ msgid "Remember password"
+#~ msgstr "¾ÏÈ£ ÀúÀå"
+
+#, fuzzy
+#~ msgid "TOC Options"
+#~ msgstr "¿É¼Ç"
+
+#~ msgid "TOC Host:"
+#~ msgstr "TOC È£½ºÆ®:"
+
+#~ msgid "Port:"
+#~ msgstr "Æ÷Æ®:"
+
+#~ msgid "Login Host:"
+#~ msgstr "·Î±×ÀΠȣ½ºÆ®:"
+
+#~ msgid "No Proxy"
+#~ msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
+
+#~ msgid "HTTP Proxy"
+#~ msgstr "HTTP ÇÁ·Ï½Ã"
+
+#, fuzzy
+#~ msgid "Socks 4 Proxy"
+#~ msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
+
+#, fuzzy
+#~ msgid "Socks 5 Proxy"
+#~ msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
+
+#~ msgid "Proxy Host:"
+#~ msgstr "ÇÁ·Ï½Ã È£½ºÆ®:"
+
+#, fuzzy
+#~ msgid "Oscar Options"
+#~ msgstr "¿É¼Ç"
+
+#, fuzzy
+#~ msgid "Applet Options"
+#~ msgstr "¿É¼Ç"
+
+#, fuzzy
+#~ msgid "Allow Anyone"
+#~ msgstr "´©±¸µçÁö Çã¿ë"
+
+#~ msgid "Sounds go through GNOME"
+#~ msgstr "±×³ðÀ» ÀÌ¿ëÇÏ¿© ¼Ò¸®³»±â"
+
+#, fuzzy
+#~ msgid "Internal HTML Widget (Quite likely a bad idea!)"
+#~ msgstr "³»Àå HTML À§Á¬ (ÁÁÀº »ý°¢ÀÌ ¾Æ³Ä!)"
+
+#~ msgid "Connection"
+#~ msgstr "¿¬°á"
+
+#~ msgid "Applet"
+#~ msgstr "¾ÖÇø´"
+
+#, fuzzy
+#~ msgid "Permit/Deny"
+#~ msgstr "¸î¸í¸¸ Çã¿ë"
+
+#~ msgid "Permit some"
+#~ msgstr "¸î¸í¸¸ Çã¿ë"
 
 #~ msgid "Add buddy to permit/deny"
 #~ msgstr "¸ñ·Ï¿¡ Ä£±¸ ´õÇϱâ"
@@ -1863,9 +2069,6 @@
 #~ msgid "No Idle"
 #~ msgstr "³îÁö ¾Ê±â"
 
-#~ msgid "GAIM Use"
-#~ msgstr "GAIM À» »ç¿ë"
-
 #~ msgid "SOCKS v4 Proxy"
 #~ msgstr "SOCKS v4 ÇÁ·Ï½Ã"
 
--- a/po/zh_CN.po	Mon Dec 04 07:13:31 2000 +0000
+++ b/po/zh_CN.po	Mon Dec 04 07:58:38 2000 +0000
@@ -3,11 +3,11 @@
 # Hashao <hashao@china.com>, 2000.
 # 
 # ÇëËæ±ãÐÞÕý£¬Ìí¼Ó£¬¸üУ¬Á칦¡£ÎÒûÓÐÒãÁ¦³¤ÆÚά»¤¡£¶àл
-#: src/gnome_applet_mgr.c:254
+#: src/gnome_applet_mgr.c:256
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2000-10-09 11:11-0700\n"
+"POT-Creation-Date: 2000-12-03 23:24-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,197 +15,178 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:73
+#: src/about.c:72
 #, c-format
 msgid "About GAIM v%s"
 msgstr "¹ØÓÚ GAIM µÚ %s °æ"
 
-#: src/aim.c:168
+#: src/aim.c:133 src/buddy.c:2100
+msgid "Signoff"
+msgstr "À뿪"
+
+#: src/aim.c:147
 msgid "Please enter your logon"
 msgstr "ÇëÊäÈëÄúµÄµÇ¼Ãû³Æ"
 
-#: src/aim.c:172
-msgid "You must give your password"
-msgstr "ÄãÐèÒªÊäÈëÃÜÂë"
+#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#, fuzzy
+msgid "Signon Error"
+msgstr "怬"
 
-#: src/aim.c:222 src/buddy.c:1873
-msgid "Signoff"
-msgstr "À뿪"
+#: src/aim.c:152
+#, fuzzy
+msgid "Please enter your password"
+msgstr "ÇëÊäÈëÄúµÄµÇ¼Ãû³Æ"
 
-#: src/aim.c:325 src/aim.c:570 src/buddy.c:319
+#: src/aim.c:254 src/multi.c:608
 msgid "Signon"
 msgstr "怬"
 
-#: src/aim.c:326 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:428
-#: src/dialogs.c:747 src/dialogs.c:822 src/dialogs.c:979 src/dialogs.c:1056
-#: src/dialogs.c:1173 src/dialogs.c:1305 src/dialogs.c:1492 src/dialogs.c:1597
-#: src/dialogs.c:1678 src/dialogs.c:1923 src/dialogs.c:2111 src/dialogs.c:2277
-#: src/dialogs.c:2372 src/dialogs.c:3098 src/dialogs.c:3360 src/oscar.c:655
-#: src/rvous.c:279 src/rvous.c:416 src/rvous.c:638
+#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+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:327 src/buddy.c:1870
+#: src/aim.c:259
 msgid "Register"
 msgstr "×¢²á"
 
-#: src/aim.c:328
+#: src/aim.c:260
 msgid "Options"
 msgstr "Ñ¡Ïî"
 
-#: src/aim.c:330 src/aim.c:576 src/buddy.c:1936
+#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
 msgid "Plugins"
 msgstr "²å¼þ"
 
-#: src/aim.c:404
+#. Labels for selectors and text boxes
+#: src/aim.c:338
 msgid "Screen Name: "
 msgstr "ÏÔʾµÄÐÕÃû£º"
 
-#: src/aim.c:407
+#: src/aim.c:341
 msgid "Password: "
 msgstr "ÃÜÂ룺"
 
-#: src/aim.c:410
-msgid "Remember Password"
-msgstr "¼ÇסÃÜÂë"
-
-#: src/aim.c:457
+#: src/aim.c:380
 msgid "Gaim - Login"
 msgstr "Gaim - µÇÈë"
 
-#: src/aim.c:565 src/buddy.c:1933
+#: src/aim.c:599 src/buddy.c:2163
 msgid "Preferences"
 msgstr "ÓÅÏÈÑ¡Ïî"
 
-#: src/away.c:88 src/away.c:203
+#: src/away.c:110 src/away.c:227
 msgid "Back"
 msgstr "·µ»Ø"
 
-#: src/away.c:99
+#: src/away.c:121
 msgid "I'm Back!"
 msgstr "ÎÒºúººÈýÓÖ»ØÀ´ÁË£¡"
 
-#: src/away.c:141
+#: src/away.c:160
 msgid "Gaim - Away!"
 msgstr "Gaim - ÔÝʱÀ뿪"
 
-#: src/away.c:242 src/gnome_applet_mgr.c:198
+#: src/away.c:266 src/gnome_applet_mgr.c:200
 msgid "New Away Message"
 msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
 
-#: src/away.c:260
+#: src/away.c:284
 msgid "Remove Away Message"
 msgstr "ɾ³ýÀ뿪ÐÅÏ¢"
 
-#: src/buddy.c:161
-#, c-format
-msgid "%d/%d Buddies Online"
-msgstr "%d/%d ÅóÓÑÀ´ÁË"
-
 #. Put the buttons in the box
-#: src/buddy.c:260 src/buddy.c:2005 src/buddy_chat.c:816
-#: src/conversation.c:440 src/conversation.c:1658 src/dialogs.c:977
-#: src/dialogs.c:1055 src/dialogs.c:1922 src/dialogs.c:1944 src/dialogs.c:3358
-#: src/prefs.c:667 src/prefs.c:1108 src/prefs.c:1565
+#: 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
 msgid "Add"
 msgstr "Ôö¼Ó"
 
-#: src/buddy.c:261 src/buddy.c:2006 src/dialogs.c:987 src/dialogs.c:1071
+#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
 msgid "Group"
 msgstr "×éȺ"
 
-#: src/buddy.c:262 src/buddy.c:2007 src/buddy_chat.c:818
-#: src/conversation.c:1656 src/dialogs.c:885 src/prefs.c:671 src/prefs.c:1109
-#: src/prefs.c:1577
+#: 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
 msgid "Remove"
 msgstr "ɾ³ý"
 
-#: src/buddy.c:265 src/buddy.c:1777
+#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
 msgid "Chat"
 msgstr "ÁÄÌì"
 
-#: src/buddy.c:266 src/buddy.c:406 src/buddy.c:1775 src/buddy_chat.c:543
+#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
 msgid "IM"
 msgstr "¼´Ê±ÐÅÏ¢"
 
-#: src/buddy.c:267 src/buddy.c:412 src/buddy.c:1776 src/buddy_chat.c:545
-#: src/buddy_chat.c:824 src/conversation.c:1652 src/rvous.c:636
+#: 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
 msgid "Info"
 msgstr "Ïêϸ×ÊÁÏ"
 
-#: src/buddy.c:418 src/dialogs.c:3372
+#. Put the buttons in the box
+#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
 msgid "Alias"
 msgstr ""
 
 #: src/buddy.c:425
-msgid "Dir Info"
-msgstr "ÐÕÃûµØַ¼"
-
-#: src/buddy.c:432
-#, fuzzy
-msgid "Direct IM"
-msgstr "ÐÕÃûµØַ¼"
-
-#: src/buddy.c:438
-msgid "Away Msg"
-msgstr "ÔÝʱÀ뿪ÐÅÏ¢"
-
-#: src/buddy.c:445
-msgid "Toggle Logging"
-msgstr "´ò¿ª£¯¹Ø±Õ¼Ç¼"
-
-#: src/buddy.c:451
 msgid "Add Buddy Pounce"
 msgstr "Ôö¼Ó¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1270
+#: src/buddy.c:1368
 msgid "New Buddy Pounce"
 msgstr "ÐÂÔö¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1288
+#: src/buddy.c:1386
 msgid "Remove Buddy Pounce"
 msgstr "È¡Ïû¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1376
-#, fuzzy, c-format
-msgid "%sBuddy Icon"
+#: src/buddy.c:1675
+#, fuzzy
+msgid "Buddy Icon"
 msgstr "¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1379
-#, c-format
-msgid "%sVoice"
-msgstr ""
-
-#: src/buddy.c:1382
-#, c-format
-msgid "%sIM Image"
+#: src/buddy.c:1678
+msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1385
-#, fuzzy, c-format
-msgid "%sChat"
-msgstr "ÁÄÌì"
-
-#: src/buddy.c:1388
-#, c-format
-msgid "%sGet File"
+#: src/buddy.c:1681
+msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1391
-#, c-format
-msgid "%sSend File"
-msgstr ""
+#: src/buddy.c:1687
+#, fuzzy
+msgid "Get File"
+msgstr "Îļþ"
 
-#: src/buddy.c:1446
+#: src/buddy.c:1690
+#, fuzzy
+msgid "Send File"
+msgstr "Îļþ"
+
+#: src/buddy.c:1749
 msgid "Warnings: %d%%\n"
 msgstr "¾¯¸æ£º%d%%\n"
 
-#: src/buddy.c:1452
+#: src/buddy.c:1754
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1456
+#: src/buddy.c:1758
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -217,790 +198,823 @@
 "µÇÈëµ½£º%s\n"
 "%s%s%s"
 
-#: src/buddy.c:1456
+#: src/buddy.c:1761
 msgid "Idle: "
 msgstr "¿Õתʱ¼ä£º"
 
-#: src/buddy.c:1501
+#: src/buddy.c:1828
 #, 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:1644
+#: src/buddy.c:1878
 #, 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:1802
+#: src/buddy.c:2028
 msgid "Information on selected Buddy"
 msgstr "Ñ¡ÖеÄÅóÓѵÄ×ÊÁÏ"
 
-#: src/buddy.c:1803 src/dialogs.c:738
+#: src/buddy.c:2029 src/dialogs.c:657
 msgid "Send Instant Message"
 msgstr "·¢³ö¼´Ê±ÐÅÏ¢"
 
-#: src/buddy.c:1804
+#: src/buddy.c:2030
 msgid "Start/join a Buddy Chat"
 msgstr "·¢Æ𣯼ÓÈëÒ»¸öÁÄÌìÊÒ"
 
-#: src/buddy.c:1857
+#: src/buddy.c:2088
 msgid "File"
 msgstr "Îļþ"
 
-#: src/buddy.c:1861 src/buddy.c:1862
+#: src/buddy.c:2092 src/buddy.c:2093
 msgid "Add A Buddy"
 msgstr "¼ÓÈëÒ»¸ö¸çÃǶù"
 
-#: src/buddy.c:1863
+#: src/buddy.c:2094
 #, fuzzy
 msgid "Join A Chat"
 msgstr "¼ÓÈëÁÄÌì"
 
-#: src/buddy.c:1865
+#: src/buddy.c:2095
+#, fuzzy
+msgid "New Instant Message"
+msgstr "·¢³ö¼´Ê±ÐÅÏ¢"
+
+#: src/buddy.c:2097
 msgid "Import Buddy List"
 msgstr "µ¼ÈëÅóÓÑÁбí"
 
-#: src/buddy.c:1866
+#: src/buddy.c:2098
 msgid "Export Buddy List"
 msgstr "µ¼³öÅóÓÑÁбí"
 
-#: src/buddy.c:1876
+#: src/buddy.c:2103
 msgid "Quit"
 msgstr "Í˳ö"
 
-#: src/buddy.c:1878 src/buddy_chat.c:537 src/buddy_chat.c:791
-#: src/buddy_chat.c:812 src/conversation.c:1654 src/dialogs.c:505
-#: src/plugins.c:317 src/prefs.c:1810
+#: 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:1883
+#: src/buddy.c:2110
 msgid "Tools"
 msgstr "¹¤¾ß"
 
-#: src/buddy.c:1888 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
 msgid "Away"
 msgstr "ÔÝʱÀ뿪"
 
-#: src/buddy.c:1893
+#: src/buddy.c:2120
 msgid "Buddy Pounce"
 msgstr "¼àÊÓÅóÓÑ"
 
-#: src/buddy.c:1901 src/dialogs.c:2105 src/dialogs.c:2262
+#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
 msgid "Search for Buddy"
 msgstr "ËÑÑ°ÅóÓÑ"
 
-#: src/buddy.c:1904
+#: src/buddy.c:2131
 msgid "by Email"
 msgstr "ʹÓõçÓÊ"
 
-#: src/buddy.c:1908
+#: src/buddy.c:2135
 msgid "by Dir Info"
 msgstr "ʹÓÃÐÕÃûµØַ¼"
 
-#: src/buddy.c:1915 src/buddy.c:1916
+#: src/buddy.c:2142 src/buddy.c:2143
 msgid "Settings"
 msgstr "É趨"
 
-#: src/buddy.c:1919
+#: src/buddy.c:2146
 msgid "User Info"
 msgstr "Óû§Ïêϸ×ÊÁÏ"
 
-#: src/buddy.c:1923 src/dialogs.c:1299
+#: src/buddy.c:2150 src/dialogs.c:1353
 msgid "Directory Info"
 msgstr "ÐÕÃûµØַ¼"
 
-#: src/buddy.c:1927 src/dialogs.c:1486
+#: src/buddy.c:2154 src/dialogs.c:1592
 msgid "Change Password"
 msgstr "¸ü¸ÄÃÜÂë"
 
-#: src/buddy.c:1941
+#: src/buddy.c:2171
 #, fuzzy
 msgid "Perl"
 msgstr "ÔÊÐí"
 
-#: src/buddy.c:1944
+#: src/buddy.c:2174
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1948
+#: src/buddy.c:2178
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1952
+#: src/buddy.c:2182
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1960
+#: src/buddy.c:2190
 msgid "Help"
 msgstr "°ïÖú"
 
-#: src/buddy.c:1965
+#: src/buddy.c:2195
 #, fuzzy
 msgid "About Gaim"
 msgstr "¹ØÓÚ"
 
-#: src/buddy.c:1984 src/prefs.c:2045
+#: src/buddy.c:2214 src/prefs.c:2053
 msgid "Buddy List"
 msgstr "ÅóÓÑÁбí"
 
-#: src/buddy.c:2036
+#: src/buddy.c:2266
 msgid "Add a new Buddy"
 msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
 
-#: src/buddy.c:2037
+#: src/buddy.c:2267
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
 
-#: src/buddy.c:2038
+#: src/buddy.c:2268
 msgid "Remove selected Buddy"
 msgstr "ɾ³ýÑ¡ÖеÄÅóÓÑ"
 
-#: src/buddy.c:2063
+#: src/buddy.c:2293
 msgid "Online"
 msgstr "ÔÚÏß"
 
-#: src/buddy.c:2065
+#: src/buddy.c:2295
 msgid "Edit Buddies"
 msgstr "ÐÞ¸ÄÅóÓѱí"
 
-#: src/buddy.c:2102
+#: src/buddy.c:2332
 msgid "Gaim - Buddy List"
 msgstr "Gaim - ÅóÓÑÁбí"
 
-#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
+#: src/buddy_chat.c:135
+msgid "Join Chat"
+msgstr "¼ÓÈëÁÄÌì"
+
+#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
 msgid "Buddy Chat"
 msgstr "ÅóÓÑÁÄÌì"
 
-#: src/buddy_chat.c:123
-msgid "Join"
-msgstr "¼ÓÈë"
-
-#: src/buddy_chat.c:129
+#: src/buddy_chat.c:151
 msgid "Join what group:"
 msgstr "Òª¼ÓÈëµÄ×飺"
 
-#: src/buddy_chat.c:135
+#: src/buddy_chat.c:167
+#, fuzzy
+msgid "Join Chat As:"
+msgstr "¼ÓÈëÁÄÌì"
+
+#: src/buddy_chat.c:181
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:143
+#: src/buddy_chat.c:189
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:172
-msgid "Join Chat"
-msgstr "¼ÓÈëÁÄÌì"
+#: src/buddy_chat.c:197
+msgid "Join"
+msgstr "¼ÓÈë"
 
-#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
+#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
 msgid "Invite"
 msgstr "ÑûÇë"
 
-#: src/buddy_chat.c:234
+#: src/buddy_chat.c:261
 msgid "Invite who?"
 msgstr "ÏëÇëË­£¿"
 
-#: src/buddy_chat.c:238
+#: src/buddy_chat.c:265
 msgid "With message:"
 msgstr "ÑûÇëÐÅÏ¢£º"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:292
 msgid "Invite to Buddy Chat"
 msgstr "ÇëÈËÁÄÌì"
 
-#: src/buddy_chat.c:424
+#: src/buddy_chat.c:420
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:452
+#: src/buddy_chat.c:459
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:540 src/buddy_chat.c:789
+#: src/buddy_chat.c:559 src/buddy_chat.c:816
 msgid "Whisper"
 msgstr "ÇÄÇÄ»°"
 
-#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
-#: src/conversation.c:1651 src/dialogs.c:1679
+#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
+#: src/conversation.c:1733
 msgid "Send"
 msgstr "Ëͳö"
 
-#: src/buddy_chat.c:544
+#: src/buddy_chat.c:563
 msgid "Ignore"
 msgstr "²»ÀíËû"
 
-#: src/buddy_chat.c:820 src/conversation.c:1659
+#: src/buddy_chat.c:849 src/conversation.c:1741
 msgid "Block"
 msgstr "¿é"
 
-#: src/buddy_chat.c:822 src/conversation.c:1653 src/dialogs.c:424
-#: src/dialogs.c:426 src/rvous.c:637
+#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
+#: src/dialogs.c:345 src/rvous.c:695
 msgid "Warn"
 msgstr "¾¯¸æ"
 
-#: src/conversation.c:171
-#, fuzzy, c-format
-msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
-msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
-
-#: src/conversation.c:178
-#, fuzzy, c-format
-msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
-msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
-
-#: src/conversation.c:435
+#: src/conversation.c:426
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "°Ñ ¡°%s¡±´ÓÅóÓѱíÉÏɾȥ\n"
 
-#: src/conversation.c:688
-msgid "Message too long, some data truncated."
-msgstr "ÐÅϢ̫³¤ÁË£¬ºóÃæµÄ±»¿³µôÁË¡£"
-
-#: src/conversation.c:688 src/dialogs.c:2825 src/dialogs.c:2895
-#: src/rvous.c:221 src/rvous.c:492
-msgid "Error"
-msgstr "´íÎó"
-
-#: src/conversation.c:875
+#: src/conversation.c:902
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Ä¿Ç°ÔÚ %d\n"
 
-#: src/conversation.c:884
+#: src/conversation.c:911
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "°ÑλÖÃÉ趨µ½ %d\n"
 
-#: src/conversation.c:1489
+#: src/conversation.c:1497
 msgid "Bold"
 msgstr "´ÖÌå"
 
-#: src/conversation.c:1489 src/prefs.c:1292
+#: src/conversation.c:1497 src/prefs.c:818
 msgid "Bold Text"
 msgstr "´ÖÌåÎÄ×Ö"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1501 src/conversation.c:1502
 msgid "Italics"
 msgstr "бÌå"
 
-#: src/conversation.c:1493 src/prefs.c:1293
+#: src/conversation.c:1501 src/prefs.c:819
 msgid "Italics Text"
 msgstr "бÌåÎÄ×Ö"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1505 src/conversation.c:1506
 msgid "Underline"
 msgstr "ϼÓÏß"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1505
 msgid "Underline Text"
 msgstr "ϼÓÏßÎÄ×Ö"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1509 src/conversation.c:1510
 msgid "Strike"
 msgstr "»®µô"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1509
 msgid "Strike through Text"
 msgstr "»®µôµÄÎÄ×Ö"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Small"
 msgstr "С"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Decrease font size"
 msgstr "ËõС×ÖÌå"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal"
 msgstr "Õý³£"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal font size"
 msgstr "Õý³£×ÖÌå´óС"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Big"
 msgstr "´ó"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Increase font size"
 msgstr "Ôö´ó×ÖÌå"
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1526 src/conversation.c:1527
 msgid "Font"
 msgstr "×ÖÐÍ"
 
-#: src/conversation.c:1518 src/dialogs.c:2724 src/dialogs.c:2740
+#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
 msgid "Select Font"
 msgstr "Ñ¡Ôñ×ÖÐÍ"
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
+#: src/conversation.c:1535
 msgid "Color"
 msgstr "ÑÕÉ«"
 
-#: src/conversation.c:1522 src/prefs.c:1306
+#: src/conversation.c:1530 src/prefs.c:832
 msgid "Text Color"
 msgstr "ÎÄ×ÖÑÕÉ«"
 
-#: src/conversation.c:1526 src/prefs.c:1323
+#: src/conversation.c:1534 src/prefs.c:849
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1541 src/conversation.c:1542
 msgid "Link"
 msgstr "Á¬½Ó"
 
-#: src/conversation.c:1533 src/dialogs.c:2366
+#: src/conversation.c:1541 src/dialogs.c:2391
 msgid "Insert Link"
 msgstr "²åÈëÁ¬½Ó"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 #, fuzzy
 msgid "Smiley"
 msgstr "Îļþ"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1552 src/conversation.c:1553
 msgid "Logging"
 msgstr "¼Ç¼"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1552
 msgid "Enable logging"
 msgstr "´ò¿ª¼Ç¼"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1556 src/conversation.c:1557
 msgid "Sound"
 msgstr "ÉùÒô"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1556
 msgid "Enable sounds"
 msgstr "´ò¿ªÉùÒô"
 
-#: src/dialogs.c:225
-msgid "Error Resolving Mail Server.\n"
-msgstr "½âÎöµçÓÊ·þÎñÆ÷ʱ³ö´í¡£\n"
+#: src/conversation.c:1768
+#, fuzzy
+msgid "Send message as: "
+msgstr "·¢³öÐÅÏ¢Éù"
 
-#: src/dialogs.c:231
-msgid "Error Connecting to Socket.\n"
-msgstr "Á¬½Ó¶Ë¿Úʱ³ö´í¡£\n"
-
-#: src/dialogs.c:441
+#: src/dialogs.c:360
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "ÄãÕæµÄÏ뾯¸æ%s£¿"
 
-#: src/dialogs.c:445
+#: src/dialogs.c:364
 msgid "Warn anonymously?"
 msgstr "·¢ÄäÃû¾¯¸æ£¿"
 
-#: src/dialogs.c:448
+#: src/dialogs.c:367
 msgid "Anonymous warnings are less harsh."
 msgstr "ÄäÃû¾¯¸æ²»ÄÇôÑÏÀ÷¡£"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:393
 msgid "Gaim - Warn user?"
 msgstr "Gaim - ¾¯¸æÓû§£¿"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:458
 #, c-format
 msgid "Unable to write file %s."
 msgstr "²»ÄÜдÈëÎļþ %s¡£"
 
-#: src/dialogs.c:544
+#: src/dialogs.c:461
 #, c-format
 msgid "Unable to read file %s."
 msgstr "²»ÄܶÁÈëÎļþ %s¡£"
 
-#: src/dialogs.c:547
+#: src/dialogs.c:464
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "ÐÅϢ̫³¤£¬ºóÃæ %s ×ÖÔª±»¿³µôÁË¡£"
 
-#: src/dialogs.c:550
+#: src/dialogs.c:467
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ÏÖÔÚûÓеÇÈë¡£"
 
-#: src/dialogs.c:553
+#: src/dialogs.c:470
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "²»ÔÊÐí¾¯¸æ %s ¡£"
 
-#: src/dialogs.c:556
+#: src/dialogs.c:473
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "È¡ÏûÁËÒ»¸öÐÅÏ¢£¬Ä㳬³öÁË·þÊÌÆ÷µÄËÙ¶ÈÏÞÖÆ¡£"
 
-#: src/dialogs.c:559
+#: src/dialogs.c:476
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "ÔÚ %s ÖÐûÓÐÁÄÌì¡£"
 
-#: src/dialogs.c:562
+#: src/dialogs.c:479
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Äã·¢Ë͸ø %s µÄËÙ¶ÈÌ«¿ìÁË¡£"
 
-#: src/dialogs.c:565
+#: src/dialogs.c:482
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
 
-#: src/dialogs.c:568
+#: src/dialogs.c:485
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅÏ¢·¢Ë͵ÄËÙ¶ÈÌ«¿ì¡£"
 
-#: src/dialogs.c:571
+#: src/dialogs.c:488
 msgid "Failure."
 msgstr "ʧ°ÜÁË¡£"
 
-#: src/dialogs.c:574
+#: src/dialogs.c:491
 msgid "Too many matches."
 msgstr "Æ¥ÅäÌ«¶à¡£"
 
-#: src/dialogs.c:577
+#: src/dialogs.c:494
 msgid "Need more qualifiers."
 msgstr "ÐèÒª¸ü¶àµÄ²ÎÊý¡£"
 
-#: src/dialogs.c:580
+#: src/dialogs.c:497
 msgid "Dir service temporarily unavailable."
 msgstr "ÐÕÃûµØַ¼·þÎñÆ÷ÔÝʱÁ¬²»ÉÏ¡£"
 
-#: src/dialogs.c:583
+#: src/dialogs.c:500
 msgid "Email lookup restricted."
 msgstr "µçÓʲéÕÒÏÞÖÆ¡£"
 
-#: src/dialogs.c:586
+#: src/dialogs.c:503
 msgid "Keyword ignored."
 msgstr "¹Ø¼ü×Ö±»ºöÂÔ¡£"
 
-#: src/dialogs.c:589
+#: src/dialogs.c:506
 msgid "No keywords."
 msgstr "ûÓйؼü×Ö¡£"
 
-#: src/dialogs.c:592
+#: src/dialogs.c:509
 msgid "User has no directory information."
 msgstr "¸ÃÓû§Ã»ÓÐÐÕÃûµØַ¼"
 
-#: src/dialogs.c:596
+#: src/dialogs.c:513
 msgid "Country not supported."
 msgstr "²»Ö§³ÖÕâ¸ö¹ú¼Ò¡£"
 
-#: src/dialogs.c:599
+#: src/dialogs.c:516
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "²»Ã÷´íÎó£º %s ¡£"
 
 #. Incorrect nick/password
-#: src/dialogs.c:602 src/oscar.c:318
+#: src/dialogs.c:519 src/oscar.c:471
 msgid "Incorrect nickname or password."
 msgstr "êÇÃû»òÕßÃÜÂë´íÎó¡£"
 
-#: src/dialogs.c:605
+#: src/dialogs.c:522
 msgid "The service is temporarily unavailable."
 msgstr "ÔÝʱûÓи÷þÎñ¡£"
 
-#: src/dialogs.c:608
+#: src/dialogs.c:525
 msgid "Your warning level is currently too high to log in."
 msgstr "ÄãÄ¿Ç°µÄ¾¯¸æ¼¶±ðÌ«¸ß£¬ÎÞ·¨µÇÈë¡£"
 
-#: src/dialogs.c:611
+#: src/dialogs.c:528
 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:614
+#: src/dialogs.c:531
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "·¢Éú²»Ã÷µÄµÇ¼´íÎó£º %s¡£"
 
-#: src/dialogs.c:617
+#: src/dialogs.c:534
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "²»Ã÷´íÎó %d ·¢ÉúÁË¡£¾ßÌåѶϢ£º %s"
 
-#: src/dialogs.c:620
+#: src/dialogs.c:537
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - ´íÎó %d"
 
 #. Build OK Button
-#: src/dialogs.c:677 src/dialogs.c:742 src/dialogs.c:817 src/dialogs.c:1168
-#: src/dialogs.c:1491 src/dialogs.c:1777 src/dialogs.c:2110 src/dialogs.c:2272
-#: src/dialogs.c:2371
+#: 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
 msgid "OK"
 msgstr "È·ÈÏ"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:671
 #, fuzzy
 msgid "IM who:"
 msgstr "¸øË­¼´Ê±ÐÅÏ¢£º"
 
-#: src/dialogs.c:776
+#: src/dialogs.c:695
 msgid "Gaim - IM user"
 msgstr "Gaim - ¼´Ê±ÐÅÏ¢Óû§"
 
-#: src/dialogs.c:813
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "Óû§Ïêϸ×ÊÁÏ"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:746
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:851
+#: src/dialogs.c:770
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - É趨Óû§×ÊÁÏ"
 
-#: src/dialogs.c:933
+#: src/dialogs.c:845
 msgid "Buddies"
 msgstr "¸çÃǶùÃÇ"
 
-#: src/dialogs.c:985
+#: src/dialogs.c:898
 #, fuzzy
 msgid "Add Group"
 msgstr "×éȺ"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:928
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:1062
-msgid "Add Buddy"
-msgstr "Ôö¼ÓÅóÓÑ"
-
-#: src/dialogs.c:1064 src/dialogs.c:3368
-msgid "Buddy"
-msgstr "ÅóÓÑ"
-
-#: src/dialogs.c:1103
+#: src/dialogs.c:957
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ôö¼ÓÅóÓÑ"
 
-#. Put the buttons in the box
-#: src/dialogs.c:1179
-msgid "Buddy To Pounce:"
-msgstr "±»¼àÊÓµÄÅóÓÑ£º"
+#: src/dialogs.c:967
+msgid "Add Buddy"
+msgstr "Ôö¼ÓÅóÓÑ"
+
+#: src/dialogs.c:979 src/dialogs.c:3443
+msgid "Buddy"
+msgstr "ÅóÓÑ"
+
+#: src/dialogs.c:1109
+#, fuzzy
+msgid "Pounce buddy as:"
+msgstr "ÅóÓѵǼÉù"
+
+#: src/dialogs.c:1181
+#, fuzzy
+msgid "Buddy:"
+msgstr "ÅóÓÑ"
+
+#: src/dialogs.c:1189
+#, fuzzy
+msgid "Message:"
+msgstr "´´×÷ÐÅÏ¢"
 
-#: src/dialogs.c:1184
-msgid "Open IM Window on Buddy Logon"
+#: 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:1187
-msgid "Send IM on Buddy Logon"
+#: src/dialogs.c:1234
+#, fuzzy
+msgid "Send IM on pounce"
 msgstr "ÅóÓѵǼʱ·¢Ëͼ´Ê±ÐÅÏ¢"
 
-#: src/dialogs.c:1195
-msgid "Message to send:"
-msgstr "·¢ËÍÐÅÏ¢£º"
-
-#: src/dialogs.c:1216
+#: src/dialogs.c:1263
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ÐÂÔö¼àÊÓÅóÓÑ"
 
 #. Build Save Button
-#: src/dialogs.c:1303 src/dialogs.c:1596 src/dialogs.c:3093
+#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
 msgid "Save"
 msgstr "´æÅÌ"
 
-#: src/dialogs.c:1321
+#: src/dialogs.c:1376
 msgid "Allow Web Searches To Find Your Info"
 msgstr "ÔÊÐí´ÓÍøÒ³ËÑÑ°ÕÒµ½ÄãµÄ×ÊÁÏ"
 
 #. Line 1
-#: src/dialogs.c:1324 src/dialogs.c:2128
+#: src/dialogs.c:1379 src/dialogs.c:2159
 msgid "First Name"
 msgstr "Ãû"
 
 #. Line 2
-#: src/dialogs.c:1335 src/dialogs.c:2140
+#: src/dialogs.c:1390 src/dialogs.c:2171
 msgid "Middle Name"
 msgstr "×Ö"
 
 #. Line 3
-#: src/dialogs.c:1347 src/dialogs.c:2152
+#: src/dialogs.c:1402 src/dialogs.c:2183
 msgid "Last Name"
 msgstr "ÐÕ"
 
 #. Line 4
-#: src/dialogs.c:1358 src/dialogs.c:2164
+#: src/dialogs.c:1413 src/dialogs.c:2195
 msgid "Maiden Name"
 msgstr "Äï¼ÒÐÕ"
 
 #. Line 5
-#: src/dialogs.c:1369 src/dialogs.c:2176
+#: src/dialogs.c:1424 src/dialogs.c:2207
 msgid "City"
 msgstr "ÊÐ"
 
 #. Line 6
-#: src/dialogs.c:1380 src/dialogs.c:2187
+#: src/dialogs.c:1435 src/dialogs.c:2218
 msgid "State"
 msgstr "Ê¡"
 
 #. Line 7
-#: src/dialogs.c:1391 src/dialogs.c:2198
+#: src/dialogs.c:1446 src/dialogs.c:2229
 msgid "Country"
 msgstr "¹ú"
 
-#: src/dialogs.c:1436
+#: src/dialogs.c:1490
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - É趨ÐÕÃûµØַ¼"
 
-#: src/dialogs.c:1453
+#: src/dialogs.c:1507
 msgid "New Passwords Do Not Match"
 msgstr "ÐÂÃÜÂë²»Ò»ÖÂ"
 
-#: src/dialogs.c:1453 src/dialogs.c:1458
+#: src/dialogs.c:1507 src/dialogs.c:1512
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ¸ü¸ÄÃÜÂë´íÎó"
 
-#: src/dialogs.c:1458
+#: src/dialogs.c:1512
 msgid "Fill out all fields completely"
 msgstr "°ÑËùÓеıí¸ñ¶¼ÌíÁË"
 
-#: src/dialogs.c:1500
+#: src/dialogs.c:1541
+#, fuzzy
+msgid "Change password for:"
+msgstr "¸ü¸ÄÃÜÂë"
+
+#: src/dialogs.c:1580 src/toc.c:515
+msgid "Gaim - Password Change"
+msgstr "Gaim - ¸ü¸ÄÃÜÂë"
+
+#: src/dialogs.c:1612
 msgid "Original Password"
 msgstr "¾ÉÃÜÂë"
 
-#: src/dialogs.c:1516
+#: src/dialogs.c:1626
 msgid "New Password"
 msgstr "ÐÂÃÜÂë"
 
-#: src/dialogs.c:1530
+#: src/dialogs.c:1640
 msgid "New Password (again)"
 msgstr "ÐÂÃÜÂ루ȷ¶¨£©"
 
-#: src/dialogs.c:1567
-msgid "Gaim - Password Change"
-msgstr "Gaim - ¸ü¸ÄÃÜÂë"
+#: src/dialogs.c:1693
+msgid "Set info for:"
+msgstr ""
 
-#: src/dialogs.c:1630
+#: src/dialogs.c:1776
 msgid "Gaim - Set User Info"
 msgstr "Gaim - É趨Óû§×ÊÁÏ"
 
-#: src/dialogs.c:1786
+#: src/dialogs.c:1817
 msgid "Below are the results of your search: "
 msgstr "ÒÔÏÂÊÇÄãËÑË÷µÄ½á¹û£º"
 
-#: src/dialogs.c:1918
-#, fuzzy
-msgid "Permit / Deny"
-msgstr "Ö»ÔÊÐíijЩÈË"
+#: src/dialogs.c:1943 src/dialogs.c:1950
+msgid "Permit"
+msgstr "ÔÊÐí"
 
-#: src/dialogs.c:1929 src/prefs.c:471
+#: src/dialogs.c:1945 src/dialogs.c:1952
 msgid "Deny"
 msgstr "¾Ü¾ø"
 
-#: src/dialogs.c:1934 src/prefs.c:455 src/prefs.c:512
-msgid "Permit"
-msgstr "ÔÊÐí"
-
-#: src/dialogs.c:1975
-msgid "Gaim - Add Permit/Deny"
+#: src/dialogs.c:1993
+#, fuzzy
+msgid "Gaim - Add Permit"
 msgstr "Gaim - Ôö¼Ó ÔÊÐí£¯½ûÖ¹"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:1995
+#, fuzzy
+msgid "Gaim - Add Deny"
+msgstr "Gaim - Ôö¼Ó ÔÊÐí£¯½ûÖ¹"
+
+#: src/dialogs.c:2057
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
 
-#: src/dialogs.c:2235
+#: src/dialogs.c:2266
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - ¸ù¾ÝÓû§×ÊÁϲéÑ°ÅóÓÑ"
 
-#: src/dialogs.c:2282
+#: src/dialogs.c:2315
 msgid "Email"
 msgstr "µçÓÊ"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2328
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ¸ù¾ÝµçÓʲéÑ°ÅóÓÑ"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2410
 msgid "URL"
 msgstr ""
 
-#: src/dialogs.c:2393
+#: src/dialogs.c:2418
 msgid "Description"
 msgstr "ÃèÊö"
 
-#: src/dialogs.c:2419
+#: src/dialogs.c:2444
 msgid "GAIM - Add URL"
 msgstr "GAIM - Ôö¼Ó URL"
 
-#: src/dialogs.c:2562 src/dialogs.c:2575 src/dialogs.c:2612
+#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
 msgid "Select Text Color"
 msgstr "É趨ÎÄ×ÖÑÕÉ«"
 
-#: src/dialogs.c:2599
+#: src/dialogs.c:2624
 #, fuzzy
 msgid "Select Background Color"
 msgstr "É趨ÎÄ×ÖÑÕÉ«"
 
-#: src/dialogs.c:2824 src/rvous.c:220
+#: src/dialogs.c:2847 src/rvous.c:265
 #, c-format
 msgid "Error writing file %s"
 msgstr "дÈëÎļþ %s ·¢Éú´íÎó"
 
-#: src/dialogs.c:2841
+#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
+#: src/rvous.c:548
+msgid "Error"
+msgstr "´íÎó"
+
+#: src/dialogs.c:2901
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - µ¼³öÅóÓÑÁбí"
 
-#: src/dialogs.c:2894 src/rvous.c:491
+#: src/dialogs.c:2967 src/rvous.c:547
 #, c-format
 msgid "Error reading file %s"
 msgstr "¶ÁÈ¡Îļþ %s ·¢Éú´íÎó"
 
-#: src/dialogs.c:2973
+#: src/dialogs.c:3045
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - µ¼ÈëÅóÓÑÁбí"
 
-#: src/dialogs.c:3054
+#: src/dialogs.c:3124
 msgid "Gaim - New away message"
 msgstr "Gaim - ¸üÐÂÔÝʱÀ뿪ÐÅÏ¢"
 
-#. Set up our frame
-#: src/dialogs.c:3061
+#. Put frame and button-box in the toplevel
+#: src/dialogs.c:3136
 #, fuzzy
 msgid "New away message"
 msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
 
-#. Make a label for away entry
-#: src/dialogs.c:3071
+#: src/dialogs.c:3149
 msgid "Away title: "
 msgstr "ÔÝʱÀ뿪±êÌ⣺"
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3121
+#: src/dialogs.c:3193
 #, fuzzy
 msgid "Make Away Now"
 msgstr "Á¢¼´É趨ΪÔÝʱÀ뿪"
 
 #. show everything
-#: src/dialogs.c:3299
+#: src/dialogs.c:3370
 #, fuzzy
 msgid "Smile!"
 msgstr "Îļþ"
 
-#: src/dialogs.c:3366
+#: src/dialogs.c:3441
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ôö¼ÓÅóÓÑ"
 
-#: src/dialogs.c:3404
+#: src/dialogs.c:3478
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Ôö¼ÓÅóÓÑ"
@@ -1010,19 +1024,19 @@
 msgid "file not found: %s\n"
 msgstr "ÕÒ²»µ½Îļþ£º %s\n"
 
-#: src/gnome_applet_mgr.c:122
+#: src/gnome_applet_mgr.c:121
 msgid "Offilne. Click to bring up login box."
 msgstr "ÀëÏß¡£µã»÷ÕâÀïÆô¶¯µÇ¼´°"
 
-#: src/gnome_applet_mgr.c:129
+#: src/gnome_applet_mgr.c:128
 msgid "Attempting to sign on...."
 msgstr "ÕýÔڵǼ¡­¡­"
 
-#: src/gnome_applet_mgr.c:252
+#: src/gnome_applet_mgr.c:254
 msgid "GAIM"
 msgstr ""
 
-#: src/gnome_applet_mgr.c:364
+#: src/gnome_applet_mgr.c:366
 msgid "Can't create GAIM applet!"
 msgstr "ÎÞ·¨½¨Á¢ GAIM applet!"
 
@@ -1030,117 +1044,180 @@
 msgid "Offline"
 msgstr "ÀëÏß"
 
-#: src/gnome_applet_mgr.c:408
+#: src/gnome_applet_mgr.c:411
 msgid "Font does not exist"
 msgstr "×ÖÐͲ»´æÔÚ"
 
-#: src/gnome_applet_mgr.c:424
+#: src/gnome_applet_mgr.c:427
 msgid "About..."
 msgstr "¹ØÓÚ¡­¡­"
 
-#: src/gtkhtml.c:1385
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "³¬Îı¾Á¬½Ó£º"
 
-#: src/gtkhtml.c:1798
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "ÔÚÒÑÓеĴ°¿ÚÄÚ´ò¿ª URL"
 
-#: src/gtkhtml.c:1807
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "н¨´°¿Ú´ò¿ª URL"
 
-#: src/gtkhtml.c:1815
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "°Ñ URL ¼ÓÈëÊéÇ©"
 
-#: src/html.c:120
-msgid "g001: Error resolving host\n"
-msgstr "g001: ½âÎöÖ÷»ú´íÎó\n"
-
-#: src/html.c:122
+#: src/html.c:122 src/html.c:125
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ´ò¿ªÁ¬½Ó´íÎó\n"
 
-#: src/html.c:154
+#: src/html.c:158
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "½ÓÊÕµ½ %d ×ÖÔª£¬À´Ô´£º %s"
 
-#: src/html.c:167
+#: src/html.c:171
 msgid "Getting Data"
 msgstr "½ÓÊÕÊý¾Ý"
 
-#: src/html.c:200
+#: src/html.c:204
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "ÊÕµ½ÁË£º¡°%s¡±\n"
 
-#: src/oscar.c:157 src/oscar.c:184
+#: src/multi.c:367 src/prefs.c:112
+#, fuzzy
+msgid "General Options"
+msgstr "Ñ¡Ïî"
+
+#: src/multi.c:402
+#, fuzzy
+msgid "Screenname:"
+msgstr "ÏÔʾµÄÐÕÃû£º"
+
+#: src/multi.c:414
+#, fuzzy
+msgid "Password:"
+msgstr "ÃÜÂ룺"
+
+#: src/multi.c:429
+msgid "Remember Password"
+msgstr "¼ÇסÃÜÂë"
+
+#: src/multi.c:430
+#, fuzzy
+msgid "Auto-Login"
+msgstr "×Ô¶¯µÇ¼"
+
+#: src/multi.c:431
+msgid "Send KeepAlive packet (6 bytes/second)"
+msgstr ""
+
+#: src/multi.c:473
+#, fuzzy
+msgid "Gaim - Modify Account"
+msgstr "Gaim - µÇÈë"
+
+#: src/multi.c:482
+msgid "Modify Account"
+msgstr ""
+
+#: src/multi.c:576
+#, fuzzy
+msgid "Enter Password"
+msgstr "ÐÂÃÜÂë"
+
+#: src/multi.c:669
+#, fuzzy
+msgid "Gaim - Account Editor"
+msgstr "Gaim - ²å¼þÁбí"
+
+#: src/multi.c:678
+msgid "Account Editor"
+msgstr ""
+
+#: src/multi.c:697
+msgid "Modify"
+msgstr ""
+
+#: src/multi.c:701
+#, fuzzy
+msgid "Sign On/Off"
+msgstr "À뿪"
+
+#: src/multi.c:705
+#, fuzzy
+msgid "Delete"
+msgstr "Ñ¡Ôñ×ÖÐÍ"
+
+#: src/multi.c:851
+#, 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
 msgid "Disconnected."
 msgstr "ÒѶϿª¡£"
 
-#: src/oscar.c:165
+#: src/oscar.c:308
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "Á¬½Ó´íÎó£¡\n"
 
-#: src/oscar.c:182
+#: src/oscar.c:316
 #, fuzzy
 msgid "major connection error\n"
 msgstr "Á¬½Ó´íÎó£¡\n"
 
-#: src/oscar.c:196
+#: src/oscar.c:330 src/toc.c:500
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:197
+#: src/oscar.c:331
 #, fuzzy
 msgid "Chat Error!"
 msgstr "´íÎó"
 
-#: src/oscar.c:220
+#: src/oscar.c:362
 #, c-format
 msgid "Logging in %s\n"
 msgstr "Á¬½Óµ½£º %s\n"
 
-#: src/oscar.c:230
-#, c-format
-msgid "Looking up %s"
-msgstr "Ñ°ÕÒ %s"
-
-#: src/oscar.c:235
+#: src/oscar.c:399
 msgid "internal connection error\n"
 msgstr "ÄÚ²¿Á¬½Ó´íÎó\n"
 
-#: src/oscar.c:240
+#: src/oscar.c:400
 msgid "Unable to login to AIM"
 msgstr "²»ÄܵǼµ½ AIM"
 
-#: src/oscar.c:248
-msgid "couldn't resolve host\n"
+#: src/oscar.c:405
+#, fuzzy
+msgid "couldn't resolve host"
 msgstr "²»ÄܽâÎöÖ÷»ú\n"
 
-#: src/oscar.c:252
-msgid "couldn't connect to host\n"
+#: src/oscar.c:409
+#, fuzzy
+msgid "couldn't connect to host"
 msgstr "²»ÄÜÁ¬½Óµ½Ö÷»ú\n"
 
-#: src/oscar.c:258
+#: src/oscar.c:416
 #, c-format
 msgid "Signon: %s"
 msgstr "µÇ¼£º %s"
 
-#: src/oscar.c:283
+#: src/oscar.c:426
 msgid "Password sent, waiting for response\n"
 msgstr "ÃÜÂëÒÑËͳö£¬µÈºò»ØÓ¦\n"
 
-#: src/oscar.c:299
+#: src/oscar.c:451
 msgid "Signed off.\n"
 msgstr "µÇ³ö¡£\n"
 
 #. connecting too frequently
-#: src/oscar.c:313
+#: src/oscar.c:466
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1148,79 +1225,112 @@
 msgstr ""
 "ÄãÁ¬½Ó£¬¶Ï¿ªµÄƵÂÊÌ«¸ßÁË£¬µÈÊ®·ÖÖÓÔÙÊÔ¡£Èç¹ûÄã·ÇÒª½Ó×ÅÊÔ£¬µÈµÄʱ¼ä»á¸ü³¤¡£"
 
-#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:761
-#: src/oscar.c:766 src/oscar.c:788 src/oscar.c:807 src/oscar.c:831
-#, fuzzy
-msgid "Gaim - Error"
-msgstr "Gaim - ´íÎó %d"
-
 #. client too old
-#: src/oscar.c:323
+#: src/oscar.c:476
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:338
+#: src/oscar.c:480 src/toc.c:303
 msgid "Authentication Failed"
 msgstr "Ñé֤ʧ°Ü"
 
-#: src/oscar.c:362
+#: src/oscar.c:513
 msgid "Internal Error"
 msgstr "ÄÚ²¿´íÎó"
 
-#: src/oscar.c:370
+#: src/oscar.c:520
 msgid "Could Not Connect"
 msgstr "ÎÞ·¨Á¬½Ó"
 
-#: src/oscar.c:401
+#: src/oscar.c:551
 msgid "Connection established, cookie sent"
 msgstr "Á¬½Ó³É¹¦£¬Ëͳö±ý¸É¡£¡£°¡£¡±ý¸É£¿£¡"
 
-#: src/oscar.c:632
-msgid "Accept Direct IM?"
+#: src/oscar.c:787 src/oscar.c:1860
+#, 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:642
-#, c-format
-msgid "%s has requested to directly connect to your computer. Do you accept?"
+#: 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:652 src/rvous.c:635
-msgid "Accept"
-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:760
+#: src/oscar.c:1194
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
 
-#: src/oscar.c:765
+#: 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
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:786
+#: src/oscar.c:1220
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:787 src/oscar.c:806
+#: src/oscar.c:1221 src/oscar.c:1240
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:805
+#: src/oscar.c:1239
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:830
+#: src/oscar.c:1265
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:836
+#: src/oscar.c:1271
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1232,610 +1342,703 @@
 "<BR>Á¬Ïßʱ¿Ì£º <B>%s</B><BR>¿Õתʱ¼ä£¨·ÖÖÓ£©£º <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/oscar.c:869
+#: src/oscar.c:1305
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:870
+#: src/oscar.c:1306
 msgid "AOL error"
 msgstr ""
 
-#: src/plugins.c:103
+#: src/oscar.c:1913
+#, fuzzy, c-format
+msgid "<B>Direct IM with %s closed</B>"
+msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
+
+#: src/oscar.c:1958
+#, 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
+#, fuzzy
+msgid "Get Away Msg"
+msgstr "ÔÝʱÀ뿪ÐÅÏ¢"
+
+#: src/oscar.c:1982
+#, fuzzy
+msgid "Direct IM"
+msgstr "ÐÕÃûµØַ¼"
+
+#. Below is basically stolen from plugins.c
+#: src/perl.c:639
+#, fuzzy
+msgid "Gaim - Select Perl Script"
+msgstr "Gaim - É趨Óû§×ÊÁÏ"
+
+#: src/perl.c:686
+msgid "Perl Scripts"
+msgstr ""
+
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr "Gaim - ²å¼þÁбí"
 
-#: src/plugins.c:155
-#, c-format
-msgid "Already loaded %s, not reloading.\n"
-msgstr ""
-
-#: src/plugins.c:177 src/plugins.c:185 src/plugins.c:217
+#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
 msgid "Plugin Error"
 msgstr "²å¼þ´íÎó"
 
-#: src/plugins.c:265
+#: src/plugins.c:262
 msgid "Gaim - Plugins"
 msgstr "Gaim - ²å¼þ"
 
 #. Build the bottom button bar
-#: src/plugins.c:297
+#: src/plugins.c:294
 msgid "Load Plugin"
 msgstr "ÔØÈë²å¼þ"
 
-#: src/plugins.c:304
+#: src/plugins.c:301
 msgid "Configure Plugin"
 msgstr "É趨²å¼þ"
 
-#: src/plugins.c:310
+#: src/plugins.c:307
 msgid "Unload Plugin"
 msgstr "жÔزå¼þ"
 
-#: src/prefs.c:93
-#, fuzzy
-msgid "General Options"
-msgstr "Ñ¡Ïî"
-
-#: src/prefs.c:100 src/prefs.c:358 src/prefs.c:387 src/prefs.c:414
-#: src/prefs.c:614 src/prefs.c:701 src/prefs.c:810 src/prefs.c:895
-#: src/prefs.c:1288 src/prefs.c:1373 src/prefs.c:1404 src/prefs.c:1691
+#: 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
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:104
-#, fuzzy
-msgid "Remember password"
-msgstr "¼ÇסÃÜÂë"
-
-#: src/prefs.c:106
-msgid "Auto-login"
-msgstr "×Ô¶¯µÇ¼"
-
-#: src/prefs.c:112
+#.
+#. 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
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:113
+#: src/prefs.c:135
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:116
+#: src/prefs.c:138
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:124
+#: 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
 #, fuzzy
-msgid "Report Idle Times"
+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
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "±£´æijЩ´°¿Ú´óСºÍλÖÃ"
+
 #: src/prefs.c:202
 #, fuzzy
-msgid "Connection Options"
-msgstr "Á¬½Ó"
-
-#: src/prefs.c:210
-msgid ""
-"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
-"other is TOC.\n"
-"\n"
-"TOC is a published protocol; AOL allows people to use the TOC protocol in "
-"their clients to connect. It is a simplified version of Oscar; it is capable "
-"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
-"is published, using TOC in gaim tends to be more stable and reliable.\n"
-"\n"
-"Oscar is a proprietary protocol. AOL has not published any information about "
-"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
-"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
-"or implemented all of the functions of Oscar, it is still able to perform "
-"most functions TOC provides as well as several others. However, using Oscar "
-"in gaim tends to be less reliable, though more usable.\n"
-"\n"
-"Changing this option takes effect at signon time."
-msgstr ""
-
-#: src/prefs.c:216
-msgid "Use Oscar Protocol"
-msgstr ""
-
-#: src/prefs.c:222
-msgid "Send Keep-Alive Packet (6 bytes/minute)"
-msgstr ""
-
-#: src/prefs.c:239 src/prefs.c:2016
-#, fuzzy
-msgid "TOC Options"
-msgstr "Ñ¡Ïî"
-
-#: src/prefs.c:251
-msgid "TOC Host:"
-msgstr "TOC Ö÷»ú£º"
+msgid "Automatically show buddy list on sign on"
+msgstr "×Ô¶¯ÏÔʾÅóÓÑÁбí"
 
-#: src/prefs.c:261 src/prefs.c:286 src/prefs.c:320
-msgid "Port:"
-msgstr "¶Ë¿Ú£º"
-
-#: src/prefs.c:276
-msgid "Login Host:"
-msgstr "µÇÈëÖ÷»ú£º"
-
-#: src/prefs.c:297
-msgid "No Proxy"
-msgstr "ûÓдúÀí"
-
-#: src/prefs.c:298
-msgid "HTTP Proxy"
-msgstr "HTTP ´úÀí"
-
-#: src/prefs.c:299
-#, fuzzy
-msgid "Socks 4 Proxy"
-msgstr "ûÓдúÀí"
-
-#: src/prefs.c:300
-#, fuzzy
-msgid "Socks 5 Proxy"
-msgstr "ûÓдúÀí"
-
-#: src/prefs.c:306
-msgid "Proxy Host:"
-msgstr "´úÀíÖ÷»ú£º"
-
-#: src/prefs.c:351 src/prefs.c:2021
-#, fuzzy
-msgid "Oscar Options"
-msgstr "Ñ¡Ïî"
-
-#: src/prefs.c:362
-msgid "No options currently (Isn't that sad)"
-msgstr ""
-
-#: src/prefs.c:380
-#, fuzzy
-msgid "Applet Options"
-msgstr "Ñ¡Ïî"
-
-#: src/prefs.c:391
+#: src/prefs.c:203
 #, fuzzy
 msgid "Display Buddy List near applet"
 msgstr "ÔÚ applet ¸½½üÏÔʾÅóÓÑÁбí"
 
-#: src/prefs.c:407
-#, fuzzy
-msgid "Buddy List Options"
-msgstr "ÅóÓÑÁбí"
-
-#: src/prefs.c:418
-msgid "Show numbers in groups"
-msgstr "ÔÚ×éÀïÏÔʾºÅÂë"
-
-#: src/prefs.c:419
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:420
-msgid "Show idle times"
-msgstr "ÏÔʾ¿Õתʱ¼ä"
-
-#: src/prefs.c:421
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "ÏÔʾÅóÓÑÀà±ðͼÐÎ"
-
-#: src/prefs.c:427
-msgid "Hide IM/Info/Chat buttons"
-msgstr ""
-
-#: src/prefs.c:428
-msgid "Show pictures on buttons"
-msgstr ""
-
-#: src/prefs.c:434
-#, fuzzy
-msgid "Save Window Size/Position"
-msgstr "±£´æijЩ´°¿Ú´óСºÍλÖÃ"
-
-#: src/prefs.c:436
-#, fuzzy
-msgid "Automatically show buddy list on sign on"
-msgstr "×Ô¶¯ÏÔʾÅóÓÑÁбí"
-
-#: src/prefs.c:586
-msgid "Please sign on before editing the permit/deny lists."
-msgstr ""
-
-#: src/prefs.c:587
-msgid "Please sign on"
-msgstr ""
-
-#: src/prefs.c:607
-msgid "Permit/Deny List Options"
-msgstr ""
-
-#: src/prefs.c:622
-msgid ""
-"The permit/deny configuration will change between users,\n"
-"and changes while you are signed off will not be saved."
-msgstr ""
-
-#: src/prefs.c:635
-#, fuzzy
-msgid "Allow Anyone"
-msgstr "ÈκÎÈ˶¼¿ÉÒÔ"
-
-#. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
-#. * and merging the two would be very difficult at best, most likely
-#. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:640
-msgid "Allow only users on Buddy List"
-msgstr ""
-
-#: src/prefs.c:642
-msgid "Allow only the users in \"Permit\""
-msgstr ""
-
-#: src/prefs.c:648
-msgid "Block all users"
-msgstr ""
-
-#: src/prefs.c:649
-msgid "Block the users in \"Deny\""
-msgstr ""
-
-#: src/prefs.c:694
+#: src/prefs.c:219
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:705
+#: src/prefs.c:231
 msgid "Enter sends message"
 msgstr "ÊäÈë·¢ËÍÐÅÏ¢"
 
-#: src/prefs.c:706
+#: src/prefs.c:232
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:707
+#: src/prefs.c:233
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:713
+#: src/prefs.c:239
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "ÏÔʾͼÐÎЦÁ³ £¨ÊÔÑé½×¶Î£©"
 
-#: src/prefs.c:714
+#: src/prefs.c:240
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "ÔÚÐÅÏ¢ÀïÏÔʾʱ¼ä"
 
-#: src/prefs.c:715
+#: src/prefs.c:241
 #, fuzzy
 msgid "Ignore incoming colors"
 msgstr "²»Àí½øÀ´µÄÑÕÉ«"
 
-#: src/prefs.c:716
+#: src/prefs.c:242
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:722
+#: src/prefs.c:248
 #, fuzzy
 msgid "Log all conversations"
 msgstr "¼Ç¼ËùÓжԻ°ÄÚÈÝ"
 
-#: src/prefs.c:723
+#: src/prefs.c:249
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "Çå³ý¼Ç¼ÎļþÄÚµÄ HTML ±ê¼Ç"
 
-#: src/prefs.c:729
+#: src/prefs.c:255
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "×Ô¶¯Í»³öÆ´´íµÄµ¥´Ê"
 
-#: src/prefs.c:730
+#: src/prefs.c:256
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "°Ñ URL ÒÔÁ¬½Ó·½Ê½Ëͳö"
 
-#: src/prefs.c:731
+#: src/prefs.c:257
 msgid "Sending messages removes away status"
 msgstr "·¢³öÐÅϢʱ×Ô¶¯È¡ÏûÔÝʱÀ뿪״̬"
 
-#: src/prefs.c:772 src/prefs.c:857
+#: src/prefs.c:298 src/prefs.c:386
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:777 src/prefs.c:862
+#: src/prefs.c:303 src/prefs.c:391
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:782 src/prefs.c:867
+#: src/prefs.c:308 src/prefs.c:396
 #, fuzzy
 msgid "Text Only"
 msgstr "ÎÄ×ÖÑÕÉ«"
 
-#: src/prefs.c:803
+#: src/prefs.c:331
 #, fuzzy
 msgid "IM Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:814
+#: src/prefs.c:343
 #, fuzzy
 msgid "Show logins in window"
 msgstr "ÔÚ½»Ì¸´°¿ÚÏÔʾµÇ¼£¯µÇ³öÐÅÏ¢"
 
-#: src/prefs.c:820 src/prefs.c:905
+#: src/prefs.c:349 src/prefs.c:435
 #, fuzzy
 msgid "Show buttons as "
 msgstr "ÏÔʾͼÐΰ´Å¥"
 
-#: src/prefs.c:829 src/prefs.c:915
+#: src/prefs.c:358 src/prefs.c:445
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:830 src/prefs.c:916
+#: src/prefs.c:359 src/prefs.c:446
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "ÊÕµ½ÐÅϢʱÉýÆð´°¿Ú"
 
-#: src/prefs.c:831 src/prefs.c:1611
+#: src/prefs.c:360
 msgid "Ignore new conversations when away"
 msgstr "ÔÝʱÀ뿪ʱ£¬ºöÂÔеĶԻ°"
 
-#: src/prefs.c:832
+#: src/prefs.c:361
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "´´×÷ÐÅÏ¢"
 
-#: src/prefs.c:888 src/prefs.c:1090
+#: src/prefs.c:417 src/prefs.c:620
 #, fuzzy
 msgid "Chat Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:899
+#: src/prefs.c:429
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:947 src/prefs.c:949 src/prefs.c:1161 src/prefs.c:1163
+#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
 msgid "Gaim Chat"
 msgstr "Gaim ÁÄÌì"
 
-#: src/prefs.c:1107
+#: src/prefs.c:638
 msgid "Refresh"
 msgstr "Ë¢ÐÂ"
 
-#: src/prefs.c:1135
+#: src/prefs.c:666
 msgid "List of available chats"
 msgstr "ÏÖÓÐÁÄÌìÁбí"
 
-#: src/prefs.c:1149
+#: src/prefs.c:680
 msgid "List of subscribed chats"
 msgstr "¶©ÔĵÄÁÄÌìÁбí"
 
-#: src/prefs.c:1281 src/prefs.c:2082
+#: src/prefs.c:806 src/prefs.c:2084
 #, fuzzy
 msgid "Font Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:1294
+#: src/prefs.c:820
 msgid "Underlined Text"
 msgstr "ϼÓÏßÎÄ×Ö"
 
-#: src/prefs.c:1295
+#: src/prefs.c:821
 msgid "Strike Text"
 msgstr "»®µôµÄÎÄ×Ö"
 
-#: src/prefs.c:1308 src/prefs.c:1325 src/prefs.c:1345
+#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
 #, fuzzy
 msgid "Select"
 msgstr "Ñ¡Ôñ×ÖÐÍ"
 
-#: src/prefs.c:1343
+#: src/prefs.c:869
 msgid "Font Face for Text"
 msgstr "ÎÄ×ÖµÄ×ÖÐÍ"
 
-#: src/prefs.c:1366
+#: src/prefs.c:892
 #, fuzzy
 msgid "Sound Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:1378
-msgid "Sounds go through GNOME"
-msgstr "ÉùÒôͨ¹ý GNOME"
-
-#: src/prefs.c:1380
+#: src/prefs.c:904
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "ÅóÓѵǼÉù"
 
-#: src/prefs.c:1381 src/prefs.c:1612
+#: src/prefs.c:905 src/prefs.c:1296
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1382
+#: src/prefs.c:906
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1397
+#: src/prefs.c:968
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
+
+#: src/prefs.c:1002
+#, fuzzy
+msgid "Reset"
+msgstr "×¢²á"
+
+#: src/prefs.c:1007
+#, fuzzy
+msgid "Choose"
+msgstr "¹Ø±Õ"
+
+#: src/prefs.c:1035
 #, fuzzy
 msgid "Sound Events"
 msgstr "ÉùÒô"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1047
 msgid "Sound when buddy logs in"
 msgstr "ÅóÓѵǼÉù"
 
-#: src/prefs.c:1409
+#: src/prefs.c:1048
 msgid "Sound when buddy logs out"
 msgstr "ÅóÓѵdzöÉù"
 
-#: src/prefs.c:1415
+#: src/prefs.c:1054
 msgid "Sound when message is received"
 msgstr "ÊÕµ½ÐÅÏ¢Éù"
 
-#: src/prefs.c:1416
+#: src/prefs.c:1055
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "ÊÕµ½ÐÅÏ¢Éù"
 
-#: src/prefs.c:1417
+#: src/prefs.c:1056
 msgid "Sound when message is sent"
 msgstr "·¢³öÐÅÏ¢Éù"
 
-#: src/prefs.c:1423
+#: src/prefs.c:1062
 #, fuzzy
-msgid "Sound in chat rooms when people enter/leave"
+msgid "Sound in chat rooms when people enter"
+msgstr "ÁÄÌìÊÒÀÅóÓѽøÈ룯À뿪Éù"
+
+#: src/prefs.c:1063
+#, fuzzy
+msgid "Sound in chat rooms when people leave"
 msgstr "ÁÄÌìÊÒÀÅóÓѽøÈ룯À뿪Éù"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1064
 #, fuzzy
-msgid "Sound in chat rooms when people talk"
+msgid "Sound in chat rooms when you talk"
 msgstr "ÁÄÌìÊÒÓÐÈË˵»°Éù"
 
-#: src/prefs.c:1509 src/prefs.c:2109
+#: src/prefs.c:1065
+#, fuzzy
+msgid "Sound in chat rooms when others talk"
+msgstr "ÁÄÌìÊÒÓÐÈË˵»°Éù"
+
+#: src/prefs.c:1197 src/prefs.c:2111
 #, fuzzy
 msgid "Away Messages"
 msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
 
-#: src/prefs.c:1525
+#: src/prefs.c:1209
 #, fuzzy
 msgid "Title"
 msgstr "Îļþ"
 
-#: src/prefs.c:1529
+#: src/prefs.c:1213
 #, fuzzy
 msgid "Message"
 msgstr "´´×÷ÐÅÏ¢"
 
-#: src/prefs.c:1569
+#: src/prefs.c:1253
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1573
+#: src/prefs.c:1257
 #, fuzzy
 msgid "Make Away"
 msgstr "Á¢¼´É趨ΪÔÝʱÀ뿪"
 
-#: src/prefs.c:1684
+#: src/prefs.c:1295
+#, fuzzy
+msgid "Ignore new conversations when away   "
+msgstr "ÔÝʱÀ뿪ʱ£¬ºöÂÔеĶԻ°"
+
+#: src/prefs.c:1306
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1318
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1400
 #, fuzzy
 msgid "Browser Options"
 msgstr "Ñ¡Ïî"
 
-#: src/prefs.c:1695
+#: src/prefs.c:1412
 msgid "Netscape"
 msgstr ""
 
-#: src/prefs.c:1696
+#: src/prefs.c:1413
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1698
+#: src/prefs.c:1415
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1700
-#, fuzzy
-msgid "Internal HTML Widget (Quite likely a bad idea!)"
-msgstr "ÄÚ²¿³¬Îı¾Îļþ¿Ø¼þ £¨×îºÃ±ðÓã¡£©"
-
-#: src/prefs.c:1701
+#: src/prefs.c:1417
 msgid "Manual"
 msgstr "Óû§ÊÖ²á"
 
-#: src/prefs.c:1710
+#: src/prefs.c:1426
 msgid "Pop up new window by default"
 msgstr "ȱʡµ¯³öд°¿Ú"
 
-#: src/prefs.c:1755
+#: src/prefs.c:1641
+#, fuzzy
+msgid "Privacy Options"
+msgstr "Ñ¡Ïî"
+
+#: src/prefs.c:1657
+msgid "Set privacy for:"
+msgstr ""
+
+#: src/prefs.c:1677
+msgid "Allow all users to contact me"
+msgstr ""
+
+#: src/prefs.c:1678
+msgid "Allow only the users below"
+msgstr ""
+
+#: src/prefs.c:1680
+msgid "Allow List"
+msgstr ""
+
+#: src/prefs.c:1712
+#, fuzzy
+msgid "Deny all users"
+msgstr "¾Ü¾øijЩÈË"
+
+#: src/prefs.c:1713
+msgid "Block the users below"
+msgstr ""
+
+#: src/prefs.c:1715
+#, fuzzy
+msgid "Block List"
+msgstr "¿é"
+
+#: src/prefs.c:1791
 msgid "Gaim - Preferences"
 msgstr "Gaim - ÓÅÏÈÉ趨"
 
-#: src/prefs.c:1843
+#: src/prefs.c:1877
 msgid "GAIM debug output window"
 msgstr "GAIM ³ý³æÊä³ö´°¿Ú"
 
-#: src/prefs.c:1998
+#: src/prefs.c:2040
 msgid "General"
 msgstr "Ò»°ãÉ趨"
 
-#: src/prefs.c:2011
-msgid "Connection"
-msgstr "Á¬½Ó"
-
-#: src/prefs.c:2033
-msgid "Applet"
-msgstr ""
-
-#. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:2051
-#, fuzzy
-msgid "Permit/Deny"
-msgstr "Ö»ÔÊÐíijЩÈË"
-
-#: src/prefs.c:2062
+#: src/prefs.c:2064
 #, fuzzy
 msgid "Conversations"
 msgstr "¼Ç¼ËùÓжԻ°ÄÚÈÝ"
 
-#: src/prefs.c:2067
+#: src/prefs.c:2069
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2072
+#: src/prefs.c:2074
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2077
+#: src/prefs.c:2079
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:2093
+#: src/prefs.c:2095
 msgid "Sounds"
 msgstr "ÉùÒô"
 
-#: src/prefs.c:2098
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2120
+#: src/prefs.c:2122
 msgid "Browser"
 msgstr "ä¯ÀÀÆ÷"
 
-#: src/rvous.c:108
+#: src/prefs.c:2133
+msgid "Privacy"
+msgstr ""
+
+#: src/rvous.c:148
 msgid "Gaim - Save As..."
 msgstr "Gaim - ´æÅÌΪ¡­¡­"
 
-#: src/rvous.c:269
+#: src/rvous.c:317
 #, c-format
 msgid "Receiving %s from %s"
 msgstr "ÊÕµ½ %s £¬À´Ô´£º %s"
 
-#: src/rvous.c:285 src/rvous.c:422
-msgid "Gaim - File Transfer"
-msgstr "Gaim - ´«ÊäÎļþ"
+#: src/rvous.c:693
+msgid "Accept"
+msgstr "½ÓÊÜ"
 
-#: src/rvous.c:406
-#, c-format
-msgid "Sending %s to %s"
-msgstr "ËÍ %s ¸ø %s"
-
-#: src/rvous.c:662
+#: src/rvous.c:720
 #, c-format
 msgid "%s requests you to accept the file: %s (%d bytes)"
 msgstr "%s ÇëÇóÄã½ÓÊÜÎļþ£º %s (%d ×ÖÔª )"
 
-#: src/rvous.c:665
+#: src/rvous.c:723
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ÇëÇóÄã¸øËûÃÇ·¢ËÍÒ»¸öÎļþ"
 
-#: src/rvous.c:675
+#: src/rvous.c:733
 msgid "Gaim - File Transfer?"
 msgstr "Gaim - ´«ËÍÎļþ£¿"
 
-#~ msgid "Permit some"
+#: src/server.c:581
+msgid "Yes"
+msgstr ""
+
+#: src/server.c:582
+msgid "No"
+msgstr ""
+
+#: src/toc.c:253 src/toc.c:260
+#, fuzzy
+msgid "Connection Closed"
+msgstr "Á¬½Ó"
+
+#: src/toc.c:295
+msgid "Waiting for reply..."
+msgstr ""
+
+#: src/toc.c:354
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr ""
+
+#: src/toc.c:355
+msgid "TOC Resume"
+msgstr ""
+
+#: src/toc.c:515
+#, fuzzy
+msgid "Password Change Successeful"
+msgstr "Gaim - ¸ü¸ÄÃÜÂë"
+
+#: src/toc.c:518
+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
+msgid "TOC Pause"
+msgstr ""
+
+#: src/toc.c:977
+#, fuzzy
+msgid "Get Dir Info"
+msgstr "ÐÕÃûµØַ¼"
+
+#~ msgid "You must give your password"
+#~ msgstr "ÄãÐèÒªÊäÈëÃÜÂë"
+
+#~ msgid "%d/%d Buddies Online"
+#~ msgstr "%d/%d ÅóÓÑÀ´ÁË"
+
+#~ msgid "Toggle Logging"
+#~ msgstr "´ò¿ª£¯¹Ø±Õ¼Ç¼"
+
+#, fuzzy
+#~ msgid "%sChat"
+#~ msgstr "ÁÄÌì"
+
+#~ msgid "Message too long, some data truncated."
+#~ msgstr "ÐÅϢ̫³¤ÁË£¬ºóÃæµÄ±»¿³µôÁË¡£"
+
+#~ msgid "Error Resolving Mail Server.\n"
+#~ msgstr "½âÎöµçÓÊ·þÎñÆ÷ʱ³ö´í¡£\n"
+
+#~ msgid "Buddy To Pounce:"
+#~ msgstr "±»¼àÊÓµÄÅóÓÑ£º"
+
+#~ msgid "Message to send:"
+#~ msgstr "·¢ËÍÐÅÏ¢£º"
+
+#, fuzzy
+#~ msgid "Permit / Deny"
 #~ msgstr "Ö»ÔÊÐíijЩÈË"
 
-#~ msgid "Deny some"
-#~ msgstr "¾Ü¾øijЩÈË"
+#~ msgid "g001: Error resolving host\n"
+#~ msgstr "g001: ½âÎöÖ÷»ú´íÎó\n"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Ñ°ÕÒ %s"
+
+#, fuzzy
+#~ msgid "Remember password"
+#~ msgstr "¼ÇסÃÜÂë"
+
+#, fuzzy
+#~ msgid "TOC Options"
+#~ msgstr "Ñ¡Ïî"
+
+#~ msgid "TOC Host:"
+#~ msgstr "TOC Ö÷»ú£º"
+
+#~ msgid "Port:"
+#~ msgstr "¶Ë¿Ú£º"
+
+#~ msgid "Login Host:"
+#~ msgstr "µÇÈëÖ÷»ú£º"
+
+#~ msgid "No Proxy"
+#~ msgstr "ûÓдúÀí"
+
+#~ msgid "HTTP Proxy"
+#~ msgstr "HTTP ´úÀí"
+
+#, fuzzy
+#~ msgid "Socks 4 Proxy"
+#~ msgstr "ûÓдúÀí"
+
+#, fuzzy
+#~ msgid "Socks 5 Proxy"
+#~ msgstr "ûÓдúÀí"
+
+#~ msgid "Proxy Host:"
+#~ msgstr "´úÀíÖ÷»ú£º"
+
+#, fuzzy
+#~ msgid "Oscar Options"
+#~ msgstr "Ñ¡Ïî"
+
+#, fuzzy
+#~ msgid "Applet Options"
+#~ msgstr "Ñ¡Ïî"
+
+#, fuzzy
+#~ msgid "Allow Anyone"
+#~ msgstr "ÈκÎÈ˶¼¿ÉÒÔ"
+
+#~ msgid "Sounds go through GNOME"
+#~ msgstr "ÉùÒôͨ¹ý GNOME"
+
+#, fuzzy
+#~ msgid "Internal HTML Widget (Quite likely a bad idea!)"
+#~ msgstr "ÄÚ²¿³¬Îı¾Îļþ¿Ø¼þ £¨×îºÃ±ðÓã¡£©"
+
+#~ msgid "Connection"
+#~ msgstr "Á¬½Ó"
+
+#, fuzzy
+#~ msgid "Permit/Deny"
+#~ msgstr "Ö»ÔÊÐíijЩÈË"
+
+#~ msgid "Permit some"
+#~ msgstr "Ö»ÔÊÐíijЩÈË"
 
 #~ msgid "Add buddy to permit/deny"
 #~ msgstr "°ÑijÈ˼ÓÈëÔÊÐí£¯¾Ü¾ø±í"
@@ -1861,9 +2064,6 @@
 #~ msgid "No Idle"
 #~ msgstr "ûÓпÕת"
 
-#~ msgid "GAIM Use"
-#~ msgstr "GAIM ʹÓÃ"
-
 #~ msgid "SOCKS v4 Proxy"
 #~ msgstr "SOCKS v4 ´úÀí"
 
--- a/src/util.c	Mon Dec 04 07:13:31 2000 +0000
+++ b/src/util.c	Mon Dec 04 07:58:38 2000 +0000
@@ -1235,7 +1235,7 @@
 
 void strncpy_withhtml(gchar *dest, const gchar *src, size_t destsize)
 {
-	gchar *sp = src, *dp = dest;
+	gchar *sp = g_strdup(src), *dp = dest;
 
 	while (dp < dest+destsize) {
                 if (*sp == '\n' && dp < dest+destsize-4) {
@@ -1244,4 +1244,6 @@
                 }
                 else *dp++ = *sp++;
 	}
+
+	g_free(sp);
 }