[gaim-migrate @ 1680]

Screw it...

12 files changed, 172 insertions, 172 deletions

diff --git a/AUTHORS b/AUTHORS
index 8280c641ad..549fead699 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,7 +3,7 @@ gaim - the Pimpin' Penguin IM Clone that's Good for the Soul
 
 Developers:
 ----------
-Rob Flynn <rflynn@blueridge.net> - Main developer (send patches here)
+Rob Flynn <rob@marko.net> - Main developer (send patches here)
 Eric Warmenhoven <warmenhoven@yahoo.com> - Second in Command(patches here too)
 Syd Logan - Hacker and Designated Driver (lazy bum)
 
diff --git a/README b/README
index c38c479505..ea14e5270a 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 gaim
 ========================
-Rob Flynn <rflynn@blueridge.net> IM: RobFlynn (currnet maintainer)
+Rob Flynn <rob@marko.net> IM: RobFlynn (currnet maintainer)
 Eric Warmenhoven <warmenhoven@yahoo.com> IM: EWarmenhoven (Gnome Boy :))
 Syd Logan - Super Hacker and Resident Designated Driver
 Jim Duchek <jimduchek@ou.edu> IM: Zilding (former maintainer)
diff --git a/doc/FAQ b/doc/FAQ
index 26dc79f120..dd02de4630 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -360,4 +360,4 @@ You could send us one and we could tell you... :)
 
 6.12 I want to contribute to the effort. Where can I send beer to?
 
-IM RobFlynn or email him at rflynn@blueridge.net.
+IM RobFlynn or email him at rob@marko.net.
diff --git a/doc/gaim.1 b/doc/gaim.1
index 2a93c6fddc..dd986c4d35 100644
--- a/doc/gaim.1
+++ b/doc/gaim.1
@@ -149,7 +149,7 @@ Foundation, Inc., 59 Temple PLace, Suite 330, Boston, MA  02111-1307  USA
 .SH AUTHORS
 The authors of \fBgaim\fR are:
 .PP
- Rob Flynn <rflynn@blueridge.net> \- IM: RobFlynn
+ Rob Flynn <rob@marko.net> \- IM: RobFlynn
 .br
  Eric Warmenhoven <warmenhoven@yahoo.com> \- IM: EWarmenhoven
 .br
diff --git a/doc/the_penguin.txt b/doc/the_penguin.txt
index b1540760c7..e776857a84 100644
--- a/doc/the_penguin.txt
+++ b/doc/the_penguin.txt
@@ -2,7 +2,7 @@ The Penguin
 
 by Jeramey Crawford <jacrawf@marko.net>
    and
-   Rob Flynn <rflynn@blueridge.net>
+   Rob Flynn <rob@marko.net>
 
 
 Once upon a term'nal dreary, while I hack'ed, weak and weary,
diff --git a/gaim.spec.in b/gaim.spec.in
index d58d60efc3..1dc0c20884 100644
--- a/gaim.spec.in
+++ b/gaim.spec.in
@@ -15,7 +15,7 @@ Group:		Applications/Internet
 Vendor:		Pimpin' Penguins
 Url:		http://www.marko.net/gaim/
 Source:		%{name}-%{version}.tar.gz
-Packager:	Rob Flynn <rob@tgflinux.com>
+Packager:	Rob Flynn <rob@marko.net>
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 Requires:	gtk+ >= 1.2.3
 
diff --git a/po/de.po b/po/de.po
index 4eda8494f6..2db1e2155c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2001-03-23 15:58-0800\n"
+"POT-Creation-Date: 2001-03-26 16:55-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2249 src/toc.c:917
 #, fuzzy
 msgid "Get Info"
 msgstr "Benutzer-Info"
@@ -24,8 +24,8 @@ msgid "Your message did not get sent."
 msgstr ""
 
 #: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
-#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
-#: src/oscar.c:1390
+#: src/oscar.c:1298 src/oscar.c:1303 src/oscar.c:1339 src/oscar.c:1358
+#: src/oscar.c:1394
 msgid "Gaim - Error"
 msgstr "gAIM - Fehler"
 
@@ -41,7 +41,7 @@ msgstr "gAIM - Buddy hinzufügen"
 
 #: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
 #: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
-#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/conversation.c:2042 src/dialogs.c:432 src/dialogs.c:3780
 #: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
 msgid "Close"
 msgstr "Schließen"
@@ -183,7 +183,7 @@ msgstr ""
 
 #. Put the buttons in the box
 #: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
-#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/conversation.c:1738 src/conversation.c:2056 src/dialogs.c:868
 #: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
 #: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
@@ -194,7 +194,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
-#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/conversation.c:1728 src/conversation.c:2054 src/prefs.c:799
 #: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "Entfernen"
@@ -209,7 +209,7 @@ msgid "IM"
 msgstr "Telegramm"
 
 #: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
-#: src/buddy_chat.c:1025 src/conversation.c:2073
+#: src/buddy_chat.c:1025 src/conversation.c:2074
 msgid "Info"
 msgstr "Info"
 
@@ -534,15 +534,15 @@ msgid "Whisper"
 msgstr "Flüstern"
 
 #: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
-#: src/conversation.c:2084
+#: src/conversation.c:2085
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:1021 src/conversation.c:2061
+#: src/buddy_chat.c:1021 src/conversation.c:2062
 msgid "Block"
 msgstr "Sperren"
 
-#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/buddy_chat.c:1023 src/conversation.c:2068 src/dialogs.c:372
 #: src/dialogs.c:397
 msgid "Warn"
 msgstr "Warnen"
@@ -669,7 +669,7 @@ msgid "Enable logging"
 msgstr "Mitschnitt ein"
 
 #: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
-#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3789
 msgid "Save"
 msgstr "Speichern"
 
@@ -686,12 +686,12 @@ msgstr "Klänge"
 msgid "Enable sounds"
 msgstr "Klänge aktivieren"
 
-#: src/conversation.c:1928
+#: src/conversation.c:1929
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "gAIM - Telegramm-Mitschnitt"
 
-#: src/conversation.c:2003
+#: src/conversation.c:2004
 #, fuzzy
 msgid "Send message as: "
 msgstr "Enter verschickt Nachricht"
@@ -1102,8 +1102,8 @@ msgstr "Textfarbe wählen"
 msgid "Error writing file %s"
 msgstr "Fehler beim Schreiben von %s"
 
-#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
-#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1813
+#: src/oscar.c:2229 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
 #: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "Fehler"
@@ -1187,7 +1187,7 @@ msgstr ""
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3781
+#: src/dialogs.c:3784
 #, fuzzy
 msgid "Clear"
 msgstr "Schließen"
@@ -1391,42 +1391,42 @@ msgstr ""
 msgid "Connection established, cookie sent"
 msgstr ""
 
-#: src/oscar.c:843 src/oscar.c:2100
+#: src/oscar.c:847 src/oscar.c:2113
 #, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr ""
 
 #. message too large
-#: src/oscar.c:1293
+#: src/oscar.c:1297
 #, 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:1298
+#: src/oscar.c:1302
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1333
+#: src/oscar.c:1337
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1334 src/oscar.c:1353
+#: src/oscar.c:1338 src/oscar.c:1357
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1352
+#: src/oscar.c:1356
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1388
+#: src/oscar.c:1392
 #, c-format
 msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1395
+#: src/oscar.c:1399
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1440,25 +1440,25 @@ msgid ""
 "SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1430
+#: src/oscar.c:1437
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1431
+#: src/oscar.c:1438
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:2157
+#: src/oscar.c:2170
 #, c-format
 msgid "<B>Direct IM with %s closed</B>"
 msgstr ""
 
-#: src/oscar.c:2216
+#: src/oscar.c:2229
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "Anmeldung nicht möglich"
 
-#: src/oscar.c:2226
+#: src/oscar.c:2239
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1466,17 +1466,17 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: src/oscar.c:2243
+#: src/oscar.c:2256
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Abwesenht."
 
-#: src/oscar.c:2251
+#: src/oscar.c:2264
 #, fuzzy
 msgid "Direct IM"
 msgstr "Profil"
 
-#: src/oscar.c:2443
+#: src/oscar.c:2456
 msgid ""
 "Unfortunately, currently Oscar only allows new user registration by going to "
 "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
diff --git a/po/es.po b/po/es.po
index 1a4578c24f..dfb8004e19 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-23 15:58-0800\n"
+"POT-Creation-Date: 2001-03-26 16:55-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2249 src/toc.c:917
 #, fuzzy
 msgid "Get Info"
 msgstr "Información de Usuario"
@@ -25,8 +25,8 @@ msgid "Your message did not get sent."
 msgstr "Sonido cuando un mensaje es enviado"
 
 #: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
-#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
-#: src/oscar.c:1390
+#: src/oscar.c:1298 src/oscar.c:1303 src/oscar.c:1339 src/oscar.c:1358
+#: src/oscar.c:1394
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - Error %d"
@@ -43,7 +43,7 @@ msgstr "Gaim - Agregar Amigo"
 
 #: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
 #: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
-#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/conversation.c:2042 src/dialogs.c:432 src/dialogs.c:3780
 #: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
 msgid "Close"
 msgstr "Cerrar"
@@ -185,7 +185,7 @@ msgstr ""
 
 #. Put the buttons in the box
 #: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
-#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/conversation.c:1738 src/conversation.c:2056 src/dialogs.c:868
 #: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
 #: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
@@ -196,7 +196,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
-#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/conversation.c:1728 src/conversation.c:2054 src/prefs.c:799
 #: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "Quitar"
@@ -211,7 +211,7 @@ msgid "IM"
 msgstr "Mensaje"
 
 #: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
-#: src/buddy_chat.c:1025 src/conversation.c:2073
+#: src/buddy_chat.c:1025 src/conversation.c:2074
 msgid "Info"
 msgstr "Información"
 
@@ -537,15 +537,15 @@ msgid "Whisper"
 msgstr "Susurrar"
 
 #: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
-#: src/conversation.c:2084
+#: src/conversation.c:2085
 msgid "Send"
 msgstr "Mandar"
 
-#: src/buddy_chat.c:1021 src/conversation.c:2061
+#: src/buddy_chat.c:1021 src/conversation.c:2062
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/buddy_chat.c:1023 src/conversation.c:2068 src/dialogs.c:372
 #: src/dialogs.c:397
 msgid "Warn"
 msgstr "Advertir"
@@ -672,7 +672,7 @@ msgid "Enable logging"
 msgstr "Usar Diario"
 
 #: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
-#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3789
 msgid "Save"
 msgstr "Guardar"
 
@@ -689,12 +689,12 @@ msgstr "Sonido"
 msgid "Enable sounds"
 msgstr "Usar Sonidos"
 
-#: src/conversation.c:1928
+#: src/conversation.c:1929
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/conversation.c:2003
+#: src/conversation.c:2004
 #, fuzzy
 msgid "Send message as: "
 msgstr "Sonido cuando un mensaje es enviado"
@@ -1104,8 +1104,8 @@ msgstr "Seleccionar color de texto"
 msgid "Error writing file %s"
 msgstr "Error creando el archivo %s"
 
-#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
-#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1813
+#: src/oscar.c:2229 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
 #: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "Error"
@@ -1190,7 +1190,7 @@ msgstr ""
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3781
+#: src/dialogs.c:3784
 #, fuzzy
 msgid "Clear"
 msgstr "Cerrar"
@@ -1392,42 +1392,42 @@ msgstr "No se pudo conectar"
 msgid "Connection established, cookie sent"
 msgstr "Conección establesida, cookie enviado"
 
-#: src/oscar.c:843 src/oscar.c:2100
+#: src/oscar.c:847 src/oscar.c:2113
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
 #. message too large
-#: src/oscar.c:1293
+#: src/oscar.c:1297
 #, 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:1298
+#: src/oscar.c:1302
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1333
+#: src/oscar.c:1337
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1334 src/oscar.c:1353
+#: src/oscar.c:1338 src/oscar.c:1357
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1352
+#: src/oscar.c:1356
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1388
+#: src/oscar.c:1392
 #, c-format
 msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1395
+#: src/oscar.c:1399
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1441,25 +1441,25 @@ msgid ""
 "SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1430
+#: src/oscar.c:1437
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1431
+#: src/oscar.c:1438
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:2157
+#: src/oscar.c:2170
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s closed</B>"
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
-#: src/oscar.c:2216
+#: src/oscar.c:2229
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/oscar.c:2226
+#: src/oscar.c:2239
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1467,17 +1467,17 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: src/oscar.c:2243
+#: src/oscar.c:2256
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Mensaje de ausencia"
 
-#: src/oscar.c:2251
+#: src/oscar.c:2264
 #, fuzzy
 msgid "Direct IM"
 msgstr "Información del Directorio"
 
-#: src/oscar.c:2443
+#: src/oscar.c:2456
 msgid ""
 "Unfortunately, currently Oscar only allows new user registration by going to "
 "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
diff --git a/po/fr.po b/po/fr.po
index 075fde3c8a..572370cba8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2001-03-23 15:58-0800\n"
+"POT-Creation-Date: 2001-03-26 16:55-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"
 
-#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2249 src/toc.c:917
 #, fuzzy
 msgid "Get Info"
 msgstr "Message d'Information"
@@ -24,8 +24,8 @@ msgid "Your message did not get sent."
 msgstr "Son à l'envoi d'un message"
 
 #: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
-#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
-#: src/oscar.c:1390
+#: src/oscar.c:1298 src/oscar.c:1303 src/oscar.c:1339 src/oscar.c:1358
+#: src/oscar.c:1394
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - Erreur %d"
@@ -42,7 +42,7 @@ msgstr "GAIM - Ajouter un Pote"
 
 #: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
 #: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
-#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/conversation.c:2042 src/dialogs.c:432 src/dialogs.c:3780
 #: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
 msgid "Close"
 msgstr "Fermer"
@@ -184,7 +184,7 @@ msgstr ""
 
 #. Put the buttons in the box
 #: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
-#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/conversation.c:1738 src/conversation.c:2056 src/dialogs.c:868
 #: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
 #: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
@@ -195,7 +195,7 @@ msgid "Group"
 msgstr "Groupe"
 
 #: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
-#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/conversation.c:1728 src/conversation.c:2054 src/prefs.c:799
 #: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "Enlever"
@@ -210,7 +210,7 @@ msgid "IM"
 msgstr "IM"
 
 #: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
-#: src/buddy_chat.c:1025 src/conversation.c:2073
+#: src/buddy_chat.c:1025 src/conversation.c:2074
 msgid "Info"
 msgstr "Info"
 
@@ -536,15 +536,15 @@ msgid "Whisper"
 msgstr "Murmurer"
 
 #: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
-#: src/conversation.c:2084
+#: src/conversation.c:2085
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/buddy_chat.c:1021 src/conversation.c:2061
+#: src/buddy_chat.c:1021 src/conversation.c:2062
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/buddy_chat.c:1023 src/conversation.c:2068 src/dialogs.c:372
 #: src/dialogs.c:397
 msgid "Warn"
 msgstr "Donner un Avertissement"
@@ -671,7 +671,7 @@ msgid "Enable logging"
 msgstr "Activer la Connection"
 
 #: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
-#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3789
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -688,12 +688,12 @@ msgstr "Son"
 msgid "Enable sounds"
 msgstr "Activer le son"
 
-#: src/conversation.c:1928
+#: src/conversation.c:1929
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/conversation.c:2003
+#: src/conversation.c:2004
 #, fuzzy
 msgid "Send message as: "
 msgstr "Son à l'envoi d'un message"
@@ -1105,8 +1105,8 @@ msgstr "Selectionner la couleur de texte"
 msgid "Error writing file %s"
 msgstr "Erreur à l'écriture du fichier %s"
 
-#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
-#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1813
+#: src/oscar.c:2229 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
 #: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "Erreur"
@@ -1191,7 +1191,7 @@ msgstr ""
 msgid "Okay"
 msgstr "Ok"
 
-#: src/dialogs.c:3781
+#: src/dialogs.c:3784
 #, fuzzy
 msgid "Clear"
 msgstr "Fermer"
@@ -1394,43 +1394,43 @@ msgstr "Impossible de se Connecter"
 msgid "Connection established, cookie sent"
 msgstr "Connection établie, cookie envoyé"
 
-#: src/oscar.c:843 src/oscar.c:2100
+#: src/oscar.c:847 src/oscar.c:2113
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr "<HR><B>%s s'est connecté%s%s.</B><BR><HR>"
 
 #. message too large
-#: src/oscar.c:1293
+#: src/oscar.c:1297
 #, 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:1298
+#: src/oscar.c:1302
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1333
+#: src/oscar.c:1337
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1334 src/oscar.c:1353
+#: src/oscar.c:1338 src/oscar.c:1357
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1352
+#: src/oscar.c:1356
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1388
+#: src/oscar.c:1392
 #, c-format
 msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1395
+#: src/oscar.c:1399
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1444,25 +1444,25 @@ msgid ""
 "SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1430
+#: src/oscar.c:1437
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1431
+#: src/oscar.c:1438
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:2157
+#: src/oscar.c:2170
 #, 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:2216
+#: src/oscar.c:2229
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "Impossible de se connecter à AIM."
 
-#: src/oscar.c:2226
+#: src/oscar.c:2239
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1470,17 +1470,17 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: src/oscar.c:2243
+#: src/oscar.c:2256
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Message d'absence"
 
-#: src/oscar.c:2251
+#: src/oscar.c:2264
 #, fuzzy
 msgid "Direct IM"
 msgstr "Information Personnelle"
 
-#: src/oscar.c:2443
+#: src/oscar.c:2456
 msgid ""
 "Unfortunately, currently Oscar only allows new user registration by going to "
 "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
diff --git a/po/ko.po b/po/ko.po
index 421aefebe3..f2d6aac929 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-23 15:58-0800\n"
+"POT-Creation-Date: 2001-03-26 16:55-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2249 src/toc.c:917
 #, fuzzy
 msgid "Get Info"
 msgstr "»ç¿ëÀÚ Á¤º¸"
@@ -25,8 +25,8 @@ msgid "Your message did not get sent."
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¶§ ¼Ò¸® ³»±â"
 
 #: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
-#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
-#: src/oscar.c:1390
+#: src/oscar.c:1298 src/oscar.c:1303 src/oscar.c:1339 src/oscar.c:1358
+#: src/oscar.c:1394
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - ¿À·ù %d"
@@ -43,7 +43,7 @@ msgstr "Gaim - Ä£±¸ ´õÇϱâ"
 
 #: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
 #: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
-#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/conversation.c:2042 src/dialogs.c:432 src/dialogs.c:3780
 #: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
 msgid "Close"
 msgstr "´Ý±â"
@@ -185,7 +185,7 @@ msgstr ""
 
 #. Put the buttons in the box
 #: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
-#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/conversation.c:1738 src/conversation.c:2056 src/dialogs.c:868
 #: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
 #: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
@@ -196,7 +196,7 @@ msgid "Group"
 msgstr "±×·ì"
 
 #: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
-#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/conversation.c:1728 src/conversation.c:2054 src/prefs.c:799
 #: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "Á¦°Å"
@@ -211,7 +211,7 @@ msgid "IM"
 msgstr "IM"
 
 #: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
-#: src/buddy_chat.c:1025 src/conversation.c:2073
+#: src/buddy_chat.c:1025 src/conversation.c:2074
 msgid "Info"
 msgstr "Á¤º¸"
 
@@ -537,15 +537,15 @@ msgid "Whisper"
 msgstr "±Ó¼Ó¸»"
 
 #: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
-#: src/conversation.c:2084
+#: src/conversation.c:2085
 msgid "Send"
 msgstr "º¸³»±â"
 
-#: src/buddy_chat.c:1021 src/conversation.c:2061
+#: src/buddy_chat.c:1021 src/conversation.c:2062
 msgid "Block"
 msgstr "Â÷´Ü"
 
-#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/buddy_chat.c:1023 src/conversation.c:2068 src/dialogs.c:372
 #: src/dialogs.c:397
 msgid "Warn"
 msgstr "ÁÖÀÇ"
@@ -672,7 +672,7 @@ msgid "Enable logging"
 msgstr "·Î±ë Çϱâ"
 
 #: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
-#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3789
 msgid "Save"
 msgstr "ÀúÀå"
 
@@ -689,12 +689,12 @@ msgstr "¼Ò¸®"
 msgid "Enable sounds"
 msgstr "¼Ò¸® µé¸®°Ô"
 
-#: src/conversation.c:1928
+#: src/conversation.c:1929
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - ´ëÈ­ ·Î±ë"
 
-#: src/conversation.c:2003
+#: src/conversation.c:2004
 #, fuzzy
 msgid "Send message as: "
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¶§ ¼Ò¸® ³»±â"
@@ -1102,8 +1102,8 @@ msgstr "±Û¾¾ »ö±ò ¼±ÅÃ"
 msgid "Error writing file %s"
 msgstr "%s ÆÄÀÏ¿¡ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
-#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1813
+#: src/oscar.c:2229 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
 #: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "¿À·ù"
@@ -1188,7 +1188,7 @@ msgstr ""
 msgid "Okay"
 msgstr "È®ÀÎ"
 
-#: src/dialogs.c:3781
+#: src/dialogs.c:3784
 #, fuzzy
 msgid "Clear"
 msgstr "´Ý±â"
@@ -1390,42 +1390,42 @@ msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 msgid "Connection established, cookie sent"
 msgstr "¿¬°áÇÏ°í ÄíÅ°¸¦ º¸³Â½À´Ï´Ù"
 
-#: src/oscar.c:843 src/oscar.c:2100
+#: src/oscar.c:847 src/oscar.c:2113
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
 #. message too large
-#: src/oscar.c:1293
+#: src/oscar.c:1297
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "%s ¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« Ä¿¼­ ³õÃƽÀ´Ï´Ù."
 
-#: src/oscar.c:1298
+#: src/oscar.c:1302
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1333
+#: src/oscar.c:1337
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1334 src/oscar.c:1353
+#: src/oscar.c:1338 src/oscar.c:1357
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1352
+#: src/oscar.c:1356
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1388
+#: src/oscar.c:1392
 #, c-format
 msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1395
+#: src/oscar.c:1399
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1439,25 +1439,25 @@ msgid ""
 "SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1430
+#: src/oscar.c:1437
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1431
+#: src/oscar.c:1438
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:2157
+#: src/oscar.c:2170
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s closed</B>"
 msgstr "<HR><B>%s °¡ ·Î±×ÀÎ ÇÏ¿´½À´Ï´Ù %s%s.</B><BR><HR>"
 
-#: src/oscar.c:2216
+#: src/oscar.c:2229
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "AIM ¿¡ ·Î±×ÀÎÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/oscar.c:2226
+#: src/oscar.c:2239
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1465,17 +1465,17 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: src/oscar.c:2243
+#: src/oscar.c:2256
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "Àá¼ö ¸Þ½ÃÁö"
 
-#: src/oscar.c:2251
+#: src/oscar.c:2264
 #, fuzzy
 msgid "Direct IM"
 msgstr "µð·ºÅ丮 Á¤º¸"
 
-#: src/oscar.c:2443
+#: src/oscar.c:2456
 msgid ""
 "Unfortunately, currently Oscar only allows new user registration by going to "
 "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c9c6431132..c820926653 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2001-03-23 15:58-0800\n"
+"POT-Creation-Date: 2001-03-26 16:55-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2249 src/toc.c:917
 #, fuzzy
 msgid "Get Info"
 msgstr "Óû§Ïêϸ×ÊÁÏ"
@@ -25,8 +25,8 @@ msgid "Your message did not get sent."
 msgstr "·¢³öÐÅÏ¢Éù"
 
 #: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
-#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
-#: src/oscar.c:1390
+#: src/oscar.c:1298 src/oscar.c:1303 src/oscar.c:1339 src/oscar.c:1358
+#: src/oscar.c:1394
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - ´íÎó %d"
@@ -43,7 +43,7 @@ msgstr "Gaim - Ôö¼ÓÅóÓÑ"
 
 #: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
 #: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
-#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/conversation.c:2042 src/dialogs.c:432 src/dialogs.c:3780
 #: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
 msgid "Close"
 msgstr "¹Ø±Õ"
@@ -185,7 +185,7 @@ msgstr ""
 
 #. Put the buttons in the box
 #: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
-#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/conversation.c:1738 src/conversation.c:2056 src/dialogs.c:868
 #: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
 #: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
@@ -196,7 +196,7 @@ msgid "Group"
 msgstr "×éȺ"
 
 #: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
-#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/conversation.c:1728 src/conversation.c:2054 src/prefs.c:799
 #: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "ɾ³ý"
@@ -211,7 +211,7 @@ msgid "IM"
 msgstr "¼´Ê±ÐÅÏ¢"
 
 #: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
-#: src/buddy_chat.c:1025 src/conversation.c:2073
+#: src/buddy_chat.c:1025 src/conversation.c:2074
 msgid "Info"
 msgstr "Ïêϸ×ÊÁÏ"
 
@@ -537,15 +537,15 @@ msgid "Whisper"
 msgstr "ÇÄÇÄ»°"
 
 #: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
-#: src/conversation.c:2084
+#: src/conversation.c:2085
 msgid "Send"
 msgstr "Ëͳö"
 
-#: src/buddy_chat.c:1021 src/conversation.c:2061
+#: src/buddy_chat.c:1021 src/conversation.c:2062
 msgid "Block"
 msgstr "¿é"
 
-#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/buddy_chat.c:1023 src/conversation.c:2068 src/dialogs.c:372
 #: src/dialogs.c:397
 msgid "Warn"
 msgstr "¾¯¸æ"
@@ -672,7 +672,7 @@ msgid "Enable logging"
 msgstr "´ò¿ª¼Ç¼"
 
 #: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
-#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3789
 msgid "Save"
 msgstr "´æÅÌ"
 
@@ -689,12 +689,12 @@ msgstr "ÉùÒô"
 msgid "Enable sounds"
 msgstr "´ò¿ªÉùÒô"
 
-#: src/conversation.c:1928
+#: src/conversation.c:1929
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
 
-#: src/conversation.c:2003
+#: src/conversation.c:2004
 #, fuzzy
 msgid "Send message as: "
 msgstr "·¢³öÐÅÏ¢Éù"
@@ -1101,8 +1101,8 @@ msgstr "É趨ÎÄ×ÖÑÕÉ«"
 msgid "Error writing file %s"
 msgstr "дÈëÎļþ %s ·¢Éú´íÎó"
 
-#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
-#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1813
+#: src/oscar.c:2229 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
 #: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "´íÎó"
@@ -1187,7 +1187,7 @@ msgstr ""
 msgid "Okay"
 msgstr "È·¶¨"
 
-#: src/dialogs.c:3781
+#: src/dialogs.c:3784
 #, fuzzy
 msgid "Clear"
 msgstr "¹Ø±Õ"
@@ -1388,42 +1388,42 @@ msgstr "ÎÞ·¨Á¬½Ó"
 msgid "Connection established, cookie sent"
 msgstr "Á¬½Ó³É¹¦£¬Ëͳö±ý¸É¡£¡£°¡£¡±ý¸É£¿£¡"
 
-#: src/oscar.c:843 src/oscar.c:2100
+#: src/oscar.c:847 src/oscar.c:2113
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
 
 #. message too large
-#: src/oscar.c:1293
+#: src/oscar.c:1297
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
 
-#: src/oscar.c:1298
+#: src/oscar.c:1302
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1333
+#: src/oscar.c:1337
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1334 src/oscar.c:1353
+#: src/oscar.c:1338 src/oscar.c:1357
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1352
+#: src/oscar.c:1356
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1388
+#: src/oscar.c:1392
 #, c-format
 msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1395
+#: src/oscar.c:1399
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -1437,25 +1437,25 @@ msgid ""
 "SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
 
-#: src/oscar.c:1430
+#: src/oscar.c:1437
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1431
+#: src/oscar.c:1438
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:2157
+#: src/oscar.c:2170
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s closed</B>"
 msgstr "<HR><B>%s µÇÈëµ½ %s%s¡£</B><BR><HR>"
 
-#: src/oscar.c:2216
+#: src/oscar.c:2229
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "²»ÄܵǼµ½ AIM"
 
-#: src/oscar.c:2226
+#: src/oscar.c:2239
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1463,17 +1463,17 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: src/oscar.c:2243
+#: src/oscar.c:2256
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "ÔÝʱÀ뿪ÐÅÏ¢"
 
-#: src/oscar.c:2251
+#: src/oscar.c:2264
 #, fuzzy
 msgid "Direct IM"
 msgstr "ÐÕÃûµØַ¼"
 
-#: src/oscar.c:2443
+#: src/oscar.c:2456
 msgid ""
 "Unfortunately, currently Oscar only allows new user registration by going to "
 "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
diff --git a/src/about.c b/src/about.c
index a8121e88d5..4812902d2e 100644
--- a/src/about.c
+++ b/src/about.c
@@ -122,7 +122,7 @@ void show_about(GtkWidget *w, void *null)
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 		gtk_table_attach_defaults(GTK_TABLE(a_table), label, 0, 1, 2, 3);
 
-		label = gtk_label_new("rob@tgflinux.com");
+		label = gtk_label_new("rob@marko.net");
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 		gtk_table_attach_defaults(GTK_TABLE(a_table), label, 1, 2, 2, 3);